oscar-surf/misskey
oscar-surf/misskey
0
0
Fork 0
Code Issues Activity

Refactor

Browse source
This commit is contained in:
syuilo 2019-02-22 14:02:56 +09:00
parent e8d2959717
commit be3298639d
No known key found for this signature in database
GPG key ID: BDC4C49D06AB9D69
27 changed files with 98 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/server/api/endpoints/messaging/messages.ts
View file

@ -6,6 +6,7 @@ import { pack } from '../../../../models/messaging-message';
import read from '../../common/read-messaging-message';
import define from '../../define';
import { ApiError } from '../../error';
import { getUser } from '../../common/getters';
export const meta = {
desc: {
@ -59,17 +60,10 @@ export const meta = {
export default define(meta, async (ps, user) => {
// Fetch recipient
const recipient = await User.findOne({
_id: ps.userId
}, {
fields: {
_id: true
}
});
if (recipient === null) {
throw new ApiError(meta.errors.noSuchUser);
}
const recipient = await getUser(ps.userId).catch(e => {
if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
throw e;
});
const query = {
$or: [{