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

Refactor

Browse Source
This commit is contained in:
syuilo
2018-11-02 13:47:44 +09:00
parent ddc3c5ba68
commit 174f8022eb
131 changed files with 512 additions and 917 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/server/api/endpoints/messaging/history.ts
View File

@@ -2,8 +2,7 @@ import $ from 'cafy';
import History from '../../../../models/messaging-history';
import Mute from '../../../../models/mute';
import { pack } from '../../../../models/messaging-message';
import { ILocalUser } from '../../../../models/user';
import getParams from '../../get-params';
import define from '../../define';
export const meta = {
desc: {
@@ -23,10 +22,7 @@ export const meta = {
}
};
export default (params: any, user: ILocalUser) => new Promise(async (res, rej) => {
const [ps, psErr] = getParams(meta, params);
if (psErr) return rej(psErr);
export default define(meta, (ps, user) => new Promise(async (res, rej) => {
const mute = await Mute.find({
muterId: user._id,
deletedAt: { $exists: false }
@@ -47,4 +43,4 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) =
});
res(await Promise.all(history.map(h => pack(h.messageId, user))));
});
}));

11
src/server/api/endpoints/messaging/messages.ts
View File

@@ -1,9 +1,9 @@
import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id';
import Message from '../../../../models/messaging-message';
import User, { ILocalUser } from '../../../../models/user';
import User from '../../../../models/user';
import { pack } from '../../../../models/messaging-message';
import read from '../../common/read-messaging-message';
import getParams from '../../get-params';
import define from '../../define';
export const meta = {
desc: {
@@ -43,10 +43,7 @@ export const meta = {
}
};
export default (params: any, user: ILocalUser) => new Promise(async (res, rej) => {
const [ps, psErr] = getParams(meta, params);
if (psErr) return rej(psErr);
export default define(meta, (ps, user) => new Promise(async (res, rej) => {
// Check if both of sinceId and untilId is specified
if (ps.sinceId && ps.untilId) {
return rej('cannot set sinceId and untilId');
@@ -108,4 +105,4 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) =
if (ps.markAsRead) {
read(user._id, recipient._id, messages);
}
});
}));

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

@@ -2,14 +2,14 @@ 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';
import User, { ILocalUser } from '../../../../../models/user';
import User from '../../../../../models/user';
import Mute from '../../../../../models/mute';
import DriveFile from '../../../../../models/drive-file';
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';
import define from '../../../define';
export const meta = {
desc: {
@@ -38,10 +38,7 @@ export const meta = {
}
};
export default (params: any, user: ILocalUser) => new Promise(async (res, rej) => {
const [ps, psErr] = getParams(meta, params);
if (psErr) return rej(psErr);
export default define(meta, (ps, user) => new Promise(async (res, rej) => {
// Myself
if (ps.userId.equals(user._id)) {
return rej('cannot send message to myself');
@@ -155,4 +152,4 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) =
}, {
upsert: true
});
});
}));

10
src/server/api/endpoints/messaging/messages/read.ts
View File

@@ -1,8 +1,7 @@
import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id';
import Message from '../../../../../models/messaging-message';
import { ILocalUser } from '../../../../../models/user';
import read from '../../../common/read-messaging-message';
import getParams from '../../../get-params';
import define from '../../../define';
export const meta = {
desc: {
@@ -26,10 +25,7 @@ export const meta = {
}
};
export default (params: any, user: ILocalUser) => new Promise(async (res, rej) => {
const [ps, psErr] = getParams(meta, params);
if (psErr) return rej(psErr);
export default define(meta, (ps, user) => new Promise(async (res, rej) => {
const message = await Message.findOne({
_id: ps.messageId,
recipientId: user._id
@@ -42,4 +38,4 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) =
read(user._id, message.userId, message);
res();
});
}));