summaryrefslogtreecommitdiff
path: root/src/server/api/endpoints/users
diff options
context:
space:
mode:
authorMeiMei <30769358+mei23@users.noreply.github.com>2019-02-01 09:57:51 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2019-02-01 09:57:51 +0900
commitc7ebf6f990660b5c8b2a6bb53dbd9ef6ff058531 (patch)
tree1539c8f06508dc7cb7206420e40bf91811948d39 /src/server/api/endpoints/users
parentFix path (diff)
downloadsharkey-c7ebf6f990660b5c8b2a6bb53dbd9ef6ff058531.tar.gz
sharkey-c7ebf6f990660b5c8b2a6bb53dbd9ef6ff058531.tar.bz2
sharkey-c7ebf6f990660b5c8b2a6bb53dbd9ef6ff058531.zip
Hide suspended users (#4075)
Diffstat (limited to 'src/server/api/endpoints/users')
-rw-r--r--src/server/api/endpoints/users/recommendation.ts10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/server/api/endpoints/users/recommendation.ts b/src/server/api/endpoints/users/recommendation.ts
index bacace6a6a..8320c2bd01 100644
--- a/src/server/api/endpoints/users/recommendation.ts
+++ b/src/server/api/endpoints/users/recommendation.ts
@@ -2,12 +2,12 @@ const ms = require('ms');
import $ from 'cafy';
import User, { pack, ILocalUser } from '../../../../models/user';
import { getFriendIds } from '../../common/get-friends';
-import Mute from '../../../../models/mute';
import * as request from 'request-promise-native';
import config from '../../../../config';
import define from '../../define';
import fetchMeta from '../../../../misc/fetch-meta';
import resolveUser from '../../../../remote/resolve-user';
+import { getHideUserIds } from '../../common/get-hide-users';
export const meta = {
desc: {
@@ -62,15 +62,13 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
// ID list of the user itself and other users who the user follows
const followingIds = await getFriendIds(me._id);
- // ミュートしているユーザーを取得
- const mutedUserIds = (await Mute.find({
- muterId: me._id
- })).map(m => m.muteeId);
+ // 隠すユーザーを取得
+ const hideUserIds = await getHideUserIds(me);
const users = await User
.find({
_id: {
- $nin: followingIds.concat(mutedUserIds)
+ $nin: followingIds.concat(hideUserIds)
},
isLocked: { $ne: true },
updatedAt: {