diff options
Diffstat (limited to 'src/server/api/endpoints/notes/timeline.ts')
| -rw-r--r-- | src/server/api/endpoints/notes/timeline.ts | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/server/api/endpoints/notes/timeline.ts b/src/server/api/endpoints/notes/timeline.ts index ead57e2d56..6c3142b091 100644 --- a/src/server/api/endpoints/notes/timeline.ts +++ b/src/server/api/endpoints/notes/timeline.ts @@ -1,11 +1,11 @@ import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id'; import Note from '../../../../models/note'; -import Mute from '../../../../models/mute'; import { getFriends } from '../../common/get-friends'; import { packMany } from '../../../../models/note'; import define from '../../define'; import { countIf } from '../../../../prelude/array'; import activeUsersChart from '../../../../chart/active-users'; +import { getHideUserIds } from '../../common/get-hide-users'; export const meta = { desc: { @@ -101,15 +101,13 @@ export default define(meta, (ps, user) => new Promise(async (res, rej) => { return; } - const [followings, mutedUserIds] = await Promise.all([ + const [followings, hideUserIds] = await Promise.all([ // フォローを取得 // Fetch following getFriends(user._id), - // ミュートしているユーザーを取得 - Mute.find({ - muterId: user._id - }).then(ms => ms.map(m => m.muteeId)) + // 隠すユーザーを取得 + getHideUserIds(user) ]); //#region Construct query @@ -164,13 +162,13 @@ export default define(meta, (ps, user) => new Promise(async (res, rej) => { // mute userId: { - $nin: mutedUserIds + $nin: hideUserIds }, '_reply.userId': { - $nin: mutedUserIds + $nin: hideUserIds }, '_renote.userId': { - $nin: mutedUserIds + $nin: hideUserIds }, }] } as any; |