sendnrw/misskey
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use cafy

Browse Source
This commit is contained in:
syuilo
2017-03-05 12:00:39 +09:00
parent f210260826
commit 17a23c3eb5
67 changed files with 202 additions and 801 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/endpoints/messaging/history.ts
View File

@@ -1,7 +1,7 @@
/**
* Module dependencies
*/
import it from '../../it';
import it from 'cafy';
import History from '../../models/messaging-history';
import serialize from '../../serializers/messaging-message';
@@ -14,7 +14,7 @@ import serialize from '../../serializers/messaging-message';
*/
module.exports = (params, user) => new Promise(async (res, rej) => {
// Get 'limit' parameter
const [limit, limitErr] = it(params.limit).expect.number().range(1, 100).default(10).qed();
const [limit = 10, limitErr] = it(params.limit).expect.number().range(1, 100).get();
if (limitErr) return rej('invalid limit param');
// Get history

12
src/api/endpoints/messaging/messages.ts
View File

@@ -1,7 +1,7 @@
/**
* Module dependencies
*/
import it from '../../it';
import it from 'cafy';
import Message from '../../models/messaging-message';
import User from '../../models/user';
import serialize from '../../serializers/messaging-message';
@@ -17,7 +17,7 @@ import { publishMessagingStream } from '../../event';
*/
module.exports = (params, user) => new Promise(async (res, rej) => {
// Get 'user_id' parameter
const [recipientId, recipientIdErr] = it(params.user_id).expect.id().required().qed();
const [recipientId, recipientIdErr] = it(params.user_id).expect.id().required().get();
if (recipientIdErr) return rej('invalid user_id param');
// Fetch recipient
@@ -34,19 +34,19 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
}
// Get 'mark_as_read' parameter
const [markAsRead, markAsReadErr] = it(params.mark_as_read).expect.boolean().default(true).qed();
const [markAsRead = true, markAsReadErr] = it(params.mark_as_read).expect.boolean().get();
if (markAsReadErr) return rej('invalid mark_as_read param');
// Get 'limit' parameter
const [limit, limitErr] = it(params.limit).expect.number().range(1, 100).default(10).qed();
const [limit = 10, limitErr] = it(params.limit).expect.number().range(1, 100).get();
if (limitErr) return rej('invalid limit param');
// Get 'since_id' parameter
const [sinceId, sinceIdErr] = it(params.since_id).expect.id().qed();
const [sinceId, sinceIdErr] = it(params.since_id).expect.id().get();
if (sinceIdErr) return rej('invalid since_id param');
// Get 'max_id' parameter
const [maxId, maxIdErr] = it(params.max_id).expect.id().qed();
const [maxId, maxIdErr] = it(params.max_id).expect.id().get();
if (maxIdErr) return rej('invalid max_id param');
// Check if both of since_id and max_id is specified

8
src/api/endpoints/messaging/messages/create.ts
View File

@@ -1,7 +1,7 @@
/**
* Module dependencies
*/
import it from '../../../it';
import it from 'cafy';
import Message from '../../../models/messaging-message';
import { isValidText } from '../../../models/messaging-message';
import History from '../../../models/messaging-history';
@@ -21,7 +21,7 @@ import config from '../../../../conf';
*/
module.exports = (params, user) => new Promise(async (res, rej) => {
// Get 'user_id' parameter
const [recipientId, recipientIdErr] = it(params.user_id).expect.id().required().qed();
const [recipientId, recipientIdErr] = it(params.user_id).expect.id().required().get();
if (recipientIdErr) return rej('invalid user_id param');
// Myself
@@ -43,11 +43,11 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
}
// Get 'text' parameter
const [text, textErr] = it(params.text).expect.string().validate(isValidText).qed();
const [text, textErr] = it(params.text).expect.string().validate(isValidText).get();
if (textErr) return rej('invalid text');
// Get 'file_id' parameter
const [fileId, fileIdErr] = it(params.file_id).expect.id().qed();
const [fileId, fileIdErr] = it(params.file_id).expect.id().get();
if (fileIdErr) return rej('invalid file_id param');
let file = null;