From 2756f553c68082342a784ef716c62da6cea6f3ca Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
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/ap/show.ts | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

(limited to 'src/server/api/endpoints/ap')

diff --git a/src/server/api/endpoints/ap/show.ts b/src/server/api/endpoints/ap/show.ts
index 3b4021e0a7..8dd9f96f90 100644
--- a/src/server/api/endpoints/ap/show.ts
+++ b/src/server/api/endpoints/ap/show.ts
@@ -7,6 +7,7 @@ import { createPerson } from '../../../../remote/activitypub/models/person';
 import Note, { pack as packNote, INote } from '../../../../models/note';
 import { createNote } from '../../../../remote/activitypub/models/note';
 import Resolver from '../../../../remote/activitypub/resolver';
+import { ApiError } from '../../error';
 
 export const meta = {
 	desc: {
@@ -23,13 +24,24 @@ export const meta = {
 			}
 		},
 	},
+
+	errors: {
+		noSuchObject: {
+			message: 'No such object.',
+			code: 'NO_SUCH_OBJECT',
+			id: 'dc94d745-1262-4e63-a17d-fecaa57efc82'
+		}
+	}
 };
 
-export default define(meta, (ps) => new Promise((res, rej) => {
-	fetchAny(ps.uri)
-		.then(object => object != null ? res(object) : rej('object not found'))
-		.catch(e => rej(e));
-}));
+export default define(meta, async (ps) => {
+	const object = await fetchAny(ps.uri);
+	if (object) {
+		return object;
+	} else {
+		throw new ApiError(meta.errors.noSuchObject);
+	}
+});
 
 /***
  * URIからUserかNoteを解決する
-- 
cgit v1.2.3-freya