Merge branch 'develop' into merge/2025-03-24
# Conflicts: # packages/backend/src/server/api/StreamingApiServerService.ts # packages/backend/src/server/api/stream/Connection.ts
This commit is contained in:
commit
e7632c83dc
7 changed files with 284 additions and 114 deletions
|
|
@ -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');
|
||||
}));
|
||||
}));
|
||||
}));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue