diff options
| author | Hazelnoot <acomputerdog@gmail.com> | 2025-03-31 15:02:52 -0400 |
|---|---|---|
| committer | Hazelnoot <acomputerdog@gmail.com> | 2025-03-31 15:02:52 -0400 |
| commit | e7632c83dc5fde6ac8e7b30ef782947e6717e89a (patch) | |
| tree | d3d3a7aee7a7aa6ba8a11db82c43de5669674595 /packages/backend/src/core/QueryService.ts | |
| parent | copy sharkey settings into new frontend preferences model (diff) | |
| parent | merge: Prevent streaming API denial-of-service (resolves #1019) (!951) (diff) | |
| download | sharkey-e7632c83dc5fde6ac8e7b30ef782947e6717e89a.tar.gz sharkey-e7632c83dc5fde6ac8e7b30ef782947e6717e89a.tar.bz2 sharkey-e7632c83dc5fde6ac8e7b30ef782947e6717e89a.zip | |
Merge branch 'develop' into merge/2025-03-24
# Conflicts:
# packages/backend/src/server/api/StreamingApiServerService.ts
# packages/backend/src/server/api/stream/Connection.ts
Diffstat (limited to 'packages/backend/src/core/QueryService.ts')
| -rw-r--r-- | packages/backend/src/core/QueryService.ts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/backend/src/core/QueryService.ts b/packages/backend/src/core/QueryService.ts index 412ab33b3f..c611fe5f1e 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'); })); })); })); |