diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2019-02-22 11:46:58 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-22 11:46:58 +0900 |
| commit | 2756f553c68082342a784ef716c62da6cea6f3ca (patch) | |
| tree | 1e0364ca9ddc1fd88e311f0687746f44e007effd /src/server/api/endpoints/notes/user-list-timeline.ts | |
| parent | Update CHANGELOG.md (diff) | |
| download | misskey-2756f553c68082342a784ef716c62da6cea6f3ca.tar.gz misskey-2756f553c68082342a784ef716c62da6cea6f3ca.tar.bz2 misskey-2756f553c68082342a784ef716c62da6cea6f3ca.zip | |
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
* :v:
* Fix
Diffstat (limited to 'src/server/api/endpoints/notes/user-list-timeline.ts')
| -rw-r--r-- | src/server/api/endpoints/notes/user-list-timeline.ts | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/src/server/api/endpoints/notes/user-list-timeline.ts b/src/server/api/endpoints/notes/user-list-timeline.ts index eaaa80c3a7..1969b924ad 100644 --- a/src/server/api/endpoints/notes/user-list-timeline.ts +++ b/src/server/api/endpoints/notes/user-list-timeline.ts @@ -6,6 +6,7 @@ import UserList from '../../../../models/user-list'; import define from '../../define'; import { getFriends } from '../../common/get-friends'; import { getHideUserIds } from '../../common/get-hide-users'; +import { ApiError } from '../../error'; export const meta = { desc: { @@ -99,10 +100,18 @@ export const meta = { 'ja-JP': 'true にすると、ファイルが添付された投稿だけ取得します (このパラメータは廃止予定です。代わりに withFiles を使ってください。)' } }, + }, + + errors: { + noSuchList: { + message: 'No such list.', + code: 'NO_SUCH_LIST', + id: '8fb1fbd5-e476-4c37-9fb0-43d55b63a2ff' + } } }; -export default define(meta, (ps, user) => new Promise(async (res, rej) => { +export default define(meta, async (ps, user) => { const [list, followings, hideUserIds] = await Promise.all([ // リストを取得 // Fetch the list @@ -120,13 +129,11 @@ export default define(meta, (ps, user) => new Promise(async (res, rej) => { ]); if (list == null) { - rej('list not found'); - return; + throw new ApiError(meta.errors.noSuchList); } if (list.userIds.length == 0) { - res([]); - return; + return []; } //#region Construct query @@ -274,13 +281,10 @@ export default define(meta, (ps, user) => new Promise(async (res, rej) => { } //#endregion - // Issue query - const timeline = await Note - .find(query, { - limit: ps.limit, - sort: sort - }); + const timeline = await Note.find(query, { + limit: ps.limit, + sort: sort + }); - // Serialize - res(await packMany(timeline, user)); -})); + return await packMany(timeline, user); +}); |