sim1222/nca10.net
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Hide suspended users (#4075)

Browse Source
This commit is contained in:
MeiMei
2019-02-01 09:57:51 +09:00
committed by syuilo
parent 9bf9519b8f
commit c7ebf6f990
12 changed files with 94 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/server/api/endpoints/users/recommendation.ts
View File

@ -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: {