From c7ebf6f990660b5c8b2a6bb53dbd9ef6ff058531 Mon Sep 17 00:00:00 2001 From: MeiMei <30769358+mei23@users.noreply.github.com> Date: Fri, 1 Feb 2019 09:57:51 +0900 Subject: Hide suspended users (#4075) --- src/server/api/endpoints/notes/polls/recommendation.ts | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/server/api/endpoints/notes/polls') diff --git a/src/server/api/endpoints/notes/polls/recommendation.ts b/src/server/api/endpoints/notes/polls/recommendation.ts index ddb0892791..2fe0a78970 100644 --- a/src/server/api/endpoints/notes/polls/recommendation.ts +++ b/src/server/api/endpoints/notes/polls/recommendation.ts @@ -2,7 +2,7 @@ import $ from 'cafy'; import Vote from '../../../../../models/poll-vote'; import Note, { pack } from '../../../../../models/note'; import define from '../../../define'; -import Mute from '../../../../../models/mute'; +import { getHideUserIds } from '../../../common/get-hide-users'; export const meta = { desc: { @@ -38,10 +38,8 @@ export default define(meta, (ps, user) => new Promise(async (res, rej) => { const nin = votes && votes.length != 0 ? votes.map(v => v.noteId) : []; - // ミュートしているユーザーを取得 - const mutedUserIds = await Mute.find({ - muterId: user._id - }).then(ms => ms.map(m => m.muteeId)); + // 隠すユーザーを取得 + const hideUserIds = await getHideUserIds(user); const notes = await Note .find({ @@ -51,7 +49,7 @@ export default define(meta, (ps, user) => new Promise(async (res, rej) => { }, userId: { $ne: user._id, - $nin: mutedUserIds + $nin: hideUserIds }, poll: { $exists: true, -- cgit v1.2.3-freya