diff options
| author | こぴなたみぽ <Syuilotan@yahoo.co.jp> | 2017-11-06 19:13:36 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-06 19:13:36 +0900 |
| commit | ee99afd5a1d67e3d72a582062a92a234a094651a (patch) | |
| tree | dfe5c593103097b3675477ed81eb4e669b8102cb /src/api/endpoints/aggregation/users | |
| parent | chore(package): update @types/gulp-util to version 3.0.33 (diff) | |
| parent | Merge pull request #842 from syuilo/greenkeeper/gulp-typescript-3.2.3 (diff) | |
| download | misskey-ee99afd5a1d67e3d72a582062a92a234a094651a.tar.gz misskey-ee99afd5a1d67e3d72a582062a92a234a094651a.tar.bz2 misskey-ee99afd5a1d67e3d72a582062a92a234a094651a.zip | |
Merge branch 'master' into greenkeeper/@types/gulp-util-3.0.33
Diffstat (limited to 'src/api/endpoints/aggregation/users')
| -rw-r--r-- | src/api/endpoints/aggregation/users/activity.ts | 4 | ||||
| -rw-r--r-- | src/api/endpoints/aggregation/users/post.ts | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/api/endpoints/aggregation/users/activity.ts b/src/api/endpoints/aggregation/users/activity.ts index 5a3e78c441..102a71d7cb 100644 --- a/src/api/endpoints/aggregation/users/activity.ts +++ b/src/api/endpoints/aggregation/users/activity.ts @@ -40,7 +40,7 @@ module.exports = (params) => new Promise(async (res, rej) => { { $match: { user_id: user._id } }, { $project: { repost_id: '$repost_id', - reply_to_id: '$reply_to_id', + reply_id: '$reply_id', created_at: { $add: ['$created_at', 9 * 60 * 60 * 1000] } // Convert into JST }}, { $project: { @@ -55,7 +55,7 @@ module.exports = (params) => new Promise(async (res, rej) => { then: 'repost', else: { $cond: { - if: { $ne: ['$reply_to_id', null] }, + if: { $ne: ['$reply_id', null] }, then: 'reply', else: 'post' } diff --git a/src/api/endpoints/aggregation/users/post.ts b/src/api/endpoints/aggregation/users/post.ts index c964815a0c..c6a75eee39 100644 --- a/src/api/endpoints/aggregation/users/post.ts +++ b/src/api/endpoints/aggregation/users/post.ts @@ -34,7 +34,7 @@ module.exports = (params) => new Promise(async (res, rej) => { { $match: { user_id: user._id } }, { $project: { repost_id: '$repost_id', - reply_to_id: '$reply_to_id', + reply_id: '$reply_id', created_at: { $add: ['$created_at', 9 * 60 * 60 * 1000] } // Convert into JST }}, { $project: { @@ -49,7 +49,7 @@ module.exports = (params) => new Promise(async (res, rej) => { then: 'repost', else: { $cond: { - if: { $ne: ['$reply_to_id', null] }, + if: { $ne: ['$reply_id', null] }, then: 'reply', else: 'post' } |