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/watching | |
| parent | Update CHANGELOG.md (diff) | |
| download | sharkey-2756f553c68082342a784ef716c62da6cea6f3ca.tar.gz sharkey-2756f553c68082342a784ef716c62da6cea6f3ca.tar.bz2 sharkey-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/watching')
| -rw-r--r-- | src/server/api/endpoints/notes/watching/create.ts | 28 | ||||
| -rw-r--r-- | src/server/api/endpoints/notes/watching/delete.ts | 28 |
2 files changed, 30 insertions, 26 deletions
diff --git a/src/server/api/endpoints/notes/watching/create.ts b/src/server/api/endpoints/notes/watching/create.ts index 5efe69a3b4..ebba211fc0 100644 --- a/src/server/api/endpoints/notes/watching/create.ts +++ b/src/server/api/endpoints/notes/watching/create.ts @@ -1,8 +1,9 @@ import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id'; -import Note from '../../../../../models/note'; import define from '../../../define'; import watch from '../../../../../services/note/watch'; +import { getValiedNote } from '../../../common/getters'; +import { ApiError } from '../../../error'; export const meta = { stability: 'stable', @@ -25,21 +26,22 @@ export const meta = { 'en-US': 'Target note ID.' } } + }, + + errors: { + noSuchNote: { + message: 'No such note.', + code: 'NO_SUCH_NOTE', + id: 'ea0e37a6-90a3-4f58-ba6b-c328ca206fc7' + } } }; -export default define(meta, (ps, user) => new Promise(async (res, rej) => { - // Get note - const note = await Note.findOne({ - _id: ps.noteId +export default define(meta, async (ps, user) => { + const note = await getValiedNote(ps.noteId).catch(e => { + if (e.id === '9725d0ce-ba28-4dde-95a7-2cbb2c15de24') throw new ApiError(meta.errors.noSuchNote); + throw e; }); - if (note === null) { - return rej('note not found'); - } - await watch(user._id, note); - - // Send response - res(); -})); +}); diff --git a/src/server/api/endpoints/notes/watching/delete.ts b/src/server/api/endpoints/notes/watching/delete.ts index 2d99cc8254..63354d4ab2 100644 --- a/src/server/api/endpoints/notes/watching/delete.ts +++ b/src/server/api/endpoints/notes/watching/delete.ts @@ -1,8 +1,9 @@ import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id'; -import Note from '../../../../../models/note'; import define from '../../../define'; import unwatch from '../../../../../services/note/unwatch'; +import { getValiedNote } from '../../../common/getters'; +import { ApiError } from '../../../error'; export const meta = { stability: 'stable', @@ -25,21 +26,22 @@ export const meta = { 'en-US': 'Target note ID.' } } + }, + + errors: { + noSuchNote: { + message: 'No such note.', + code: 'NO_SUCH_NOTE', + id: '09b3695c-f72c-4731-a428-7cff825fc82e' + } } }; -export default define(meta, (ps, user) => new Promise(async (res, rej) => { - // Get note - const note = await Note.findOne({ - _id: ps.noteId +export default define(meta, async (ps, user) => { + const note = await getValiedNote(ps.noteId).catch(e => { + if (e.id === '9725d0ce-ba28-4dde-95a7-2cbb2c15de24') throw new ApiError(meta.errors.noSuchNote); + throw e; }); - if (note === null) { - return rej('note not found'); - } - await unwatch(user._id, note); - - // Send response - res(); -})); +}); |