summaryrefslogtreecommitdiff
path: root/src/server/api
diff options
context:
space:
mode:
authorMeiMei <30769358+mei23@users.noreply.github.com>2019-01-31 23:14:45 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2019-01-31 23:14:45 +0900
commitc34a27853376efe38e1596558f300c836e724359 (patch)
treebd9ac4e7d402468c319d81f374ee92516f62b73d /src/server/api
parent[Client] Add information (diff)
downloadsharkey-c34a27853376efe38e1596558f300c836e724359.tar.gz
sharkey-c34a27853376efe38e1596558f300c836e724359.tar.bz2
sharkey-c34a27853376efe38e1596558f300c836e724359.zip
おすすめのアンケートでミュートユーザーのものは表示しない (#4067)
Diffstat (limited to 'src/server/api')
-rw-r--r--src/server/api/endpoints/notes/polls/recommendation.ts9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/server/api/endpoints/notes/polls/recommendation.ts b/src/server/api/endpoints/notes/polls/recommendation.ts
index 2bc1a4f913..ddb0892791 100644
--- a/src/server/api/endpoints/notes/polls/recommendation.ts
+++ b/src/server/api/endpoints/notes/polls/recommendation.ts
@@ -2,6 +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';
export const meta = {
desc: {
@@ -37,6 +38,11 @@ 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 notes = await Note
.find({
'_user.host': null,
@@ -44,7 +50,8 @@ export default define(meta, (ps, user) => new Promise(async (res, rej) => {
$nin: nin
},
userId: {
- $ne: user._id
+ $ne: user._id,
+ $nin: mutedUserIds
},
poll: {
$exists: true,