From 2756f553c68082342a784ef716c62da6cea6f3ca Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 22 Feb 2019 11:46:58 +0900 Subject: 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 --- src/server/api/endpoints/admin/federation/remove-all-following.ts | 6 +++--- src/server/api/endpoints/admin/federation/update-instance.ts | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/server/api/endpoints/admin/federation') diff --git a/src/server/api/endpoints/admin/federation/remove-all-following.ts b/src/server/api/endpoints/admin/federation/remove-all-following.ts index 8daff139b2..1a272aeb05 100644 --- a/src/server/api/endpoints/admin/federation/remove-all-following.ts +++ b/src/server/api/endpoints/admin/federation/remove-all-following.ts @@ -15,7 +15,7 @@ export const meta = { } }; -export default define(meta, (ps, me) => new Promise(async (res, rej) => { +export default define(meta, async (ps, me) => { const followings = await Following.find({ '_follower.host': ps.host }); @@ -29,5 +29,5 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => { deleteFollowing(pair[0], pair[1]); } - res(); -})); + return; +}); diff --git a/src/server/api/endpoints/admin/federation/update-instance.ts b/src/server/api/endpoints/admin/federation/update-instance.ts index 579b437aa1..50eb4ba135 100644 --- a/src/server/api/endpoints/admin/federation/update-instance.ts +++ b/src/server/api/endpoints/admin/federation/update-instance.ts @@ -21,11 +21,11 @@ export const meta = { } }; -export default define(meta, (ps, me) => new Promise(async (res, rej) => { +export default define(meta, async (ps, me) => { const instance = await Instance.findOne({ host: ps.host }); if (instance == null) { - return rej('instance not found'); + throw new Error('instance not found'); } Instance.update({ host: ps.host }, { @@ -35,5 +35,5 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => { } }); - res(); -})); + return; +}); -- cgit v1.2.3-freya