summaryrefslogtreecommitdiff
path: root/src/server/api/endpoints/users.ts
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2019-02-20 22:34:52 +0900
committersyuilo <syuilotan@yahoo.co.jp>2019-02-20 22:34:52 +0900
commit91ef328b6baab4d241668bc04548ccbcf106a628 (patch)
treee0dbdee0ee158af1960faabf49a53d731a90acad /src/server/api/endpoints/users.ts
parentFix indent (diff)
downloadsharkey-91ef328b6baab4d241668bc04548ccbcf106a628.tar.gz
sharkey-91ef328b6baab4d241668bc04548ccbcf106a628.tar.bz2
sharkey-91ef328b6baab4d241668bc04548ccbcf106a628.zip
「みつける」でミュートしているユーザーが含まれる問題を修正
Diffstat (limited to 'src/server/api/endpoints/users.ts')
-rw-r--r--src/server/api/endpoints/users.ts6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/server/api/endpoints/users.ts b/src/server/api/endpoints/users.ts
index 8e83dca350..fd8cc6413e 100644
--- a/src/server/api/endpoints/users.ts
+++ b/src/server/api/endpoints/users.ts
@@ -2,6 +2,7 @@ import $ from 'cafy';
import User, { pack } from '../../../models/user';
import define from '../define';
import { fallback } from '../../../prelude/symbol';
+import { getHideUserIds } from '../common/get-hide-users';
const nonnull = { $ne: null as any };
@@ -86,12 +87,15 @@ const sort: any = { // < https://github.com/Microsoft/TypeScript/issues/1863
};
export default define(meta, (ps, me) => new Promise(async (res, rej) => {
+ const hideUserIds = await getHideUserIds(me);
+
const users = await User
.find({
$and: [
state[ps.state] || state[fallback],
origin[ps.origin] || origin[fallback]
- ]
+ ],
+ ...(hideUserIds && hideUserIds.length > 0 ? { _id: { $nin: hideUserIds } } : {})
}, {
limit: ps.limit,
sort: sort[ps.sort] || sort[fallback],