diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2018-08-23 15:42:14 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-23 15:42:14 +0900 |
| commit | 91f1c3a10a5f81bfc2a926225af0273aec13e14b (patch) | |
| tree | 47f8035925cadc4b123b8af9a6f3f0b07bae15ee /src/server/api/endpoints | |
| parent | Merge pull request #2372 from syuilo/greenkeeper/vue-js-modal-1.3.18 (diff) | |
| parent | 1時間単位での集計を追加 (diff) | |
| download | sharkey-91f1c3a10a5f81bfc2a926225af0273aec13e14b.tar.gz sharkey-91f1c3a10a5f81bfc2a926225af0273aec13e14b.tar.bz2 sharkey-91f1c3a10a5f81bfc2a926225af0273aec13e14b.zip | |
Merge pull request #2423 from syuilo/develop
8.0.0
Diffstat (limited to 'src/server/api/endpoints')
| -rw-r--r-- | src/server/api/endpoints/admin/chart.ts | 2 | ||||
| -rw-r--r-- | src/server/api/endpoints/following/requests/cancel.ts | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/server/api/endpoints/admin/chart.ts b/src/server/api/endpoints/admin/chart.ts index a0566b11f5..c351c7167d 100644 --- a/src/server/api/endpoints/admin/chart.ts +++ b/src/server/api/endpoints/admin/chart.ts @@ -14,6 +14,7 @@ export default (params: any) => new Promise(async (res, rej) => { const d = now.getDate(); const stats = await Stats.find({ + span: 'day', date: { $gt: new Date(y - 1, m, d) } @@ -44,6 +45,7 @@ export default (params: any) => new Promise(async (res, rej) => { } else { chart.unshift({ date: day, + span: 'day', users: { local: { total: 0, diff --git a/src/server/api/endpoints/following/requests/cancel.ts b/src/server/api/endpoints/following/requests/cancel.ts index 9bfc40ce65..c46b948d29 100644 --- a/src/server/api/endpoints/following/requests/cancel.ts +++ b/src/server/api/endpoints/following/requests/cancel.ts @@ -27,7 +27,11 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) = return rej('followee not found'); } - await cancelFollowRequest(followee, user); + try { + await cancelFollowRequest(followee, user); + } catch (e) { + return rej(e); + } // Send response res(await pack(followee._id, user)); |