diff options
| author | tamaina <tamaina@hotmail.co.jp> | 2018-04-15 18:12:11 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-15 18:12:11 +0900 |
| commit | f982f5e850d1096d54014396b3ee9d337e305bcb (patch) | |
| tree | 0dae4116aa5d7c3fe6c5eba54af6f9f15a271761 /src/server/api/endpoints/users | |
| parent | Merge pull request #4 from syuilo/master (diff) | |
| parent | nanka iroiro (diff) | |
| download | misskey-f982f5e850d1096d54014396b3ee9d337e305bcb.tar.gz misskey-f982f5e850d1096d54014396b3ee9d337e305bcb.tar.bz2 misskey-f982f5e850d1096d54014396b3ee9d337e305bcb.zip | |
Merge pull request #5 from syuilo/master
追従
Diffstat (limited to 'src/server/api/endpoints/users')
| -rw-r--r-- | src/server/api/endpoints/users/notes.ts | 2 | ||||
| -rw-r--r-- | src/server/api/endpoints/users/recommendation.ts | 14 |
2 files changed, 7 insertions, 9 deletions
diff --git a/src/server/api/endpoints/users/notes.ts b/src/server/api/endpoints/users/notes.ts index e91b75e1d3..bd4247c79c 100644 --- a/src/server/api/endpoints/users/notes.ts +++ b/src/server/api/endpoints/users/notes.ts @@ -65,7 +65,7 @@ module.exports = (params, me) => new Promise(async (res, rej) => { const q = userId !== undefined ? { _id: userId } - : { usernameLower: username.toLowerCase(), hostLower: getHostLower(host) } ; + : { usernameLower: username.toLowerCase(), host: getHostLower(host) } ; // Lookup user const user = await User.findOne(q, { diff --git a/src/server/api/endpoints/users/recommendation.ts b/src/server/api/endpoints/users/recommendation.ts index 2de22da13e..e367e65a6c 100644 --- a/src/server/api/endpoints/users/recommendation.ts +++ b/src/server/api/endpoints/users/recommendation.ts @@ -30,15 +30,13 @@ module.exports = (params, me) => new Promise(async (res, rej) => { _id: { $nin: followingIds }, - $or: [ - { - 'lastUsedAt': { - $gte: new Date(Date.now() - ms('7days')) - } - }, { - host: { $ne: null } + $or: [{ + 'lastUsedAt': { + $gte: new Date(Date.now() - ms('7days')) } - ] + }, { + host: null + }] }, { limit: limit, skip: offset, |