diff options
| author | MeiMei <30769358+mei23@users.noreply.github.com> | 2018-11-13 19:34:09 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2018-11-13 19:34:09 +0900 |
| commit | 9f0b8ba2f89fd303c49f9edeccdaa8ea4ad4146b (patch) | |
| tree | 6dd1feb43952007144a32c67462bb721aba09c52 /src/server | |
| parent | 10.49.1 (diff) | |
| download | sharkey-9f0b8ba2f89fd303c49f9edeccdaa8ea4ad4146b.tar.gz sharkey-9f0b8ba2f89fd303c49f9edeccdaa8ea4ad4146b.tar.bz2 sharkey-9f0b8ba2f89fd303c49f9edeccdaa8ea4ad4146b.zip | |
Fix: notes/create hangs when rejected (#3221)
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/api/call.ts | 2 | ||||
| -rw-r--r-- | src/server/api/endpoints/notes/create.ts | 18 |
2 files changed, 11 insertions, 9 deletions
diff --git a/src/server/api/call.ts b/src/server/api/call.ts index 900b77e680..6252537c0e 100644 --- a/src/server/api/call.ts +++ b/src/server/api/call.ts @@ -56,7 +56,7 @@ export default (endpoint: string, user: IUser, app: IApp, data: any, file?: any) console.warn(`SLOW API CALL DETECTED: ${ep.name} (${time}ms)`); } } catch (e) { - if (e.name == 'INVALID_PARAM') { + if (e && e.name == 'INVALID_PARAM') { rej({ code: e.name, param: e.param, diff --git a/src/server/api/endpoints/notes/create.ts b/src/server/api/endpoints/notes/create.ts index 4f031aa43d..a7050e2ec2 100644 --- a/src/server/api/endpoints/notes/create.ts +++ b/src/server/api/endpoints/notes/create.ts @@ -216,7 +216,7 @@ export default define(meta, (ps, user, app) => new Promise(async (res, rej) => { } // 投稿を作成 - const note = await create(user, { + create(user, { createdAt: new Date(), files: files, poll: ps.poll, @@ -229,12 +229,14 @@ export default define(meta, (ps, user, app) => new Promise(async (res, rej) => { visibility: ps.visibility, visibleUsers, geo: ps.geo - }); - - const noteObj = await pack(note, user); - - // Reponse - res({ - createdNote: noteObj + }) + .then(note => pack(note, user)) + .then(noteObj => { + res({ + createdNote: noteObj + }); + }) + .catch(e => { + rej(e); }); })); |