Improve error handling of API (#4345)

* 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

View file

@ -5,6 +5,7 @@ import User, { pack } from '../../../../models/user';
import define from '../../define';
import { maximum } from '../../../../prelude/array';
import { getHideUserIds } from '../../common/get-hide-users';
import { ApiError } from '../../error';
export const meta = {
requireCredential: false,
@ -23,10 +24,18 @@ export const meta = {
validator: $.optional.num.range(1, 100),
default: 10
},
},
errors: {
noSuchUser: {
message: 'No such user.',
code: 'NO_SUCH_USER',
id: 'e6965129-7b2a-40a4-bae2-cd84cd434822'
}
}
};
export default define(meta, (ps, me) => new Promise(async (res, rej) => {
export default define(meta, async (ps, me) => {
// Lookup user
const user = await User.findOne({
_id: ps.userId
@ -37,7 +46,7 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
});
if (user === null) {
return rej('user not found');
throw new ApiError(meta.errors.noSuchUser);
}
// Fetch recent notes
@ -60,7 +69,7 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
// 投稿が少なかったら中断
if (recentNotes.length === 0) {
return res([]);
return [];
}
const hideUserIds = await getHideUserIds(me);
@ -106,5 +115,5 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
weight: repliedUsers[user] / peak
})));
res(repliesObj);
}));
return repliesObj;
});