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

Improve error handling of API (#4345)

Browse source 
* wip

* wip

* wip

* Update attached_notes.ts

* wip

* Refactor

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* Update call.ts

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* ✌️

* Fix
This commit is contained in:
syuilo 2019-02-22 11:46:58 +09:00 • committed by GitHub
parent fc52e95ad0
commit 2756f553c6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
181 changed files with 2010 additions and 1322 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5,6 +5,7 @@ import User from '../../../../models/user';
import { pack } from '../../../../models/messaging-message';
import read from '../../common/read-messaging-message';
import define from '../../define';
import { ApiError } from '../../error';
export const meta = {
desc: {
@ -45,15 +46,18 @@ export const meta = {
validator: $.optional.bool,
default: true
}
},
errors: {
noSuchUser: {
message: 'No such user.',
code: 'NO_SUCH_USER',
id: '11795c64-40ea-4198-b06e-3c873ed9039d'
},
}
};
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');
}
export default define(meta, async (ps, user) => {
// Fetch recipient
const recipient = await User.findOne({
_id: ps.userId
@ -64,7 +68,7 @@ export default define(meta, (ps, user) => new Promise(async (res, rej) => {
});
if (recipient === null) {
return rej('user not found');
throw new ApiError(meta.errors.noSuchUser);
}
const query = {
@ -98,16 +102,12 @@ export default define(meta, (ps, user) => new Promise(async (res, rej) => {
sort: sort
});
res(await Promise.all(messages.map(message => pack(message, user, {
populateRecipient: false
}))));
if (messages.length === 0) {
return;
}
// Mark all as read
if (ps.markAsRead) {
read(user._id, recipient._id, messages);
}
}));
return await Promise.all(messages.map(message => pack(message, user, {
populateRecipient: false
})));
});