summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Hall <email@jacobhall.net>2025-02-21 13:33:36 -0500
committerJacob Hall <email@jacobhall.net>2025-02-21 13:33:36 -0500
commit21eff6df663806752362f8fd3dc43917191c945d (patch)
tree43493374388751048c31a881baf2bfd65b33f580
parentdo not notify mentioned users if a DM is not visible to them (diff)
downloadsharkey-21eff6df663806752362f8fd3dc43917191c945d.tar.gz
sharkey-21eff6df663806752362f8fd3dc43917191c945d.tar.bz2
sharkey-21eff6df663806752362f8fd3dc43917191c945d.zip
do not make a DM visible if user is mentioned but not a recipient
-rw-r--r--packages/backend/src/core/QueryService.ts4
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/backend/src/core/QueryService.ts b/packages/backend/src/core/QueryService.ts
index c4feeaf971..3ca13bf4aa 100644
--- a/packages/backend/src/core/QueryService.ts
+++ b/packages/backend/src/core/QueryService.ts
@@ -213,7 +213,6 @@ export class QueryService {
.orWhere('note.userId = :meId')
// または 自分宛て
.orWhere(':meIdAsList <@ note.visibleUserIds')
- .orWhere(':meIdAsList <@ note.mentions')
.orWhere(new Brackets(qb => {
qb
// または フォロワー宛ての投稿であり、
@@ -223,7 +222,8 @@ export class QueryService {
// 自分がフォロワーである
.where(`note.userId IN (${ followingQuery.getQuery() })`)
// または 自分の投稿へのリプライ
- .orWhere('note.replyUserId = :meId');
+ .orWhere('note.replyUserId = :meId')
+ .orWhere(':meIdAsList <@ note.mentions');
}));
}));
}));