graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-27 08:43:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix #1510

Browse source
This commit is contained in:
syuilo 2018-04-18 18:46:38 +09:00
parent c580493d20
commit ea9c4de45b
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5,6 +5,7 @@ const ms = require('ms');
import $ from 'cafy'; import $ from 'cafy';
import User, { pack } from '../../../../models/user'; import User, { pack } from '../../../../models/user';
import getFriends from '../../common/get-friends'; import getFriends from '../../common/get-friends';
import Mute from '../../../../models/mute';
/** /**
* Get recommended users * Get recommended users
@ -25,13 +26,18 @@ module.exports = (params, me) => new Promise(async (res, rej) => {
// ID list of the user itself and other users who the user follows // ID list of the user itself and other users who the user follows
const followingIds = await getFriends(me._id); const followingIds = await getFriends(me._id);
// ミュートしているユーザーを取得
const mutedUserIds = (await Mute.find({
muterId: me._id
})).map(m => m.muteeId);
const users = await User const users = await User
.find({ .find({
_id: { _id: {
$nin: followingIds $nin: followingIds.concat(mutedUserIds)
}, },
$or: [{ $or: [{
'lastUsedAt': { lastUsedAt: {
$gte: new Date(Date.now() - ms('7days')) $gte: new Date(Date.now() - ms('7days'))
} }
}, { }, {