sim1222/nca10.net
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refactoring, Clean up and bug fixes

Browse Source
This commit is contained in:
syuilo
2018-11-02 03:32:24 +09:00
parent b4b9e76c8d
commit 931bdc6aac
108 changed files with 1722 additions and 1539 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/server/api/endpoints/messaging/messages/create.ts
View File

@ -1,4 +1,4 @@
import $ from 'cafy'; import ID from '../../../../../misc/cafy-id';
import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id';
import Message from '../../../../../models/messaging-message';
import { isValidText } from '../../../../../models/messaging-message';
import History from '../../../../../models/messaging-history';
@ -9,6 +9,7 @@ import { pack } from '../../../../../models/messaging-message';
import { publishMainStream } from '../../../../../stream';
import { publishMessagingStream, publishMessagingIndexStream } from '../../../../../stream';
import pushSw from '../../../../../push-sw';
import getParams from '../../../get-params';
export const meta = {
desc: {
@ -18,22 +19,37 @@ export const meta = {
requireCredential: true,
kind: 'messaging-write'
kind: 'messaging-write',
params: {
userId: {
validator: $.type(ID),
transform: transform,
},
text: {
validator: $.str.optional.pipe(isValidText)
},
fileId: {
validator: $.type(ID).optional,
transform: transform,
}
}
};
export default (params: any, user: ILocalUser) => new Promise(async (res, rej) => {
// Get 'userId' parameter
const [recipientId, recipientIdErr] = $.type(ID).get(params.userId);
if (recipientIdErr) return rej('invalid userId param');
const [ps, psErr] = getParams(meta, params);
if (psErr) return rej(psErr);
// Myself
if (recipientId.equals(user._id)) {
if (ps.userId.equals(user._id)) {
return rej('cannot send message to myself');
}
// Fetch recipient
const recipient = await User.findOne({
_id: recipientId
_id: ps.userId
}, {
fields: {
_id: true
@ -44,18 +60,10 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) =
return rej('user not found');
}
// Get 'text' parameter
const [text, textErr] = $.str.optional.pipe(isValidText).get(params.text);
if (textErr) return rej('invalid text');
// Get 'fileId' parameter
const [fileId, fileIdErr] = $.type(ID).optional.get(params.fileId);
if (fileIdErr) return rej('invalid fileId param');
let file = null;
if (fileId !== undefined) {
if (ps.fileId != null) {
file = await DriveFile.findOne({
_id: fileId,
_id: ps.fileId,
'metadata.userId': user._id
});
@ -65,7 +73,7 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) =
}
// テキストが無いかつ添付ファイルも無かったらエラー
if (text === undefined && file === null) {
if (ps.text == null && file == null) {
return rej('text or file is required');
}
@ -74,7 +82,7 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) =
createdAt: new Date(),
fileId: file ? file._id : undefined,
recipientId: recipient._id,
text: text ? text.trim() : undefined,
text: ps.text ? ps.text.trim() : undefined,
userId: user._id,
isRead: false
});