diff options
| author | MeiMei <30769358+mei23@users.noreply.github.com> | 2019-01-25 00:06:20 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2019-01-25 00:06:20 +0900 |
| commit | 5eca0a31f78493f2cff0fd5f097ee9d007991a87 (patch) | |
| tree | 01cc481c16418086b276d1879a85902e4dc34d23 /src/server/api/endpoints/notes/mentions.ts | |
| parent | Update CONTRIBUTING.md (diff) | |
| download | sharkey-5eca0a31f78493f2cff0fd5f097ee9d007991a87.tar.gz sharkey-5eca0a31f78493f2cff0fd5f097ee9d007991a87.tar.bz2 sharkey-5eca0a31f78493f2cff0fd5f097ee9d007991a87.zip | |
Filter hidden replies / mentions (#3981)
* Fix: 非公開投稿が返信一覧に出てくる
* Fix: 非公開投稿がメンション一覧に出てくる
* 非公開投稿は通知/メンション通知しない
* repliesにフォロワー限定がかからなかったのを修正
* Fix: ホームにフォロワー限定投稿が表示されない
* 認証必須エンドポイントで user == null にはならない
* mentionsにフォロワー限定がかからなかったのを修正
Diffstat (limited to 'src/server/api/endpoints/notes/mentions.ts')
| -rw-r--r-- | src/server/api/endpoints/notes/mentions.ts | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/src/server/api/endpoints/notes/mentions.ts b/src/server/api/endpoints/notes/mentions.ts index 4c7c397c77..8747590606 100644 --- a/src/server/api/endpoints/notes/mentions.ts +++ b/src/server/api/endpoints/notes/mentions.ts @@ -1,6 +1,6 @@ import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id'; import Note from '../../../../models/note'; -import { getFriendIds } from '../../common/get-friends'; +import { getFriendIds, getFriends } from '../../common/get-friends'; import { packMany } from '../../../../models/note'; import define from '../../define'; import read from '../../../../services/note/read'; @@ -47,8 +47,28 @@ export default define(meta, (ps, user) => new Promise(async (res, rej) => { return rej('cannot set sinceId and untilId'); } + // フォローを取得 + const followings = await getFriends(user._id); + + const visibleQuery = [{ + visibility: { $in: [ 'public', 'home' ] } + }, { + // myself (for specified/private) + userId: user._id + }, { + // to me (for specified) + visibleUserIds: { $in: [ user._id ] } + }, { + visibility: 'followers', + userId: { $in: followings.map(f => f.id) } + }]; + const query = { - deletedAt: null, + $and: [{ + deletedAt: null, + }, { + $or: visibleQuery, + }], $or: [{ mentions: user._id |