summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoranatawa12 <anatawa12@icloud.com>2023-08-08 13:23:25 +0900
committerGitHub <noreply@github.com>2023-08-08 13:23:25 +0900
commitb26e4dc5059dedd879ed08e303e5bd6f2f4e3f1d (patch)
treeb4c519bf3fb207d749cc4b329f36a8cd02d78e30
parentfix(frontend): webkit-text-size-adjustを100%に固定する (#11487) (diff)
downloadsharkey-b26e4dc5059dedd879ed08e303e5bd6f2f4e3f1d.tar.gz
sharkey-b26e4dc5059dedd879ed08e303e5bd6f2f4e3f1d.tar.bz2
sharkey-b26e4dc5059dedd879ed08e303e5bd6f2f4e3f1d.zip
fix: muteがapiからのuser list timeline取得で機能しない (#11480)
-rw-r--r--CHANGELOG.md1
-rw-r--r--packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts4
2 files changed, 5 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e2c7136646..763b577494 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,7 @@
### Server
- cacheRemoteFilesの初期値はfalseになりました
+- fix: muteがapiからのuser list timeline取得で機能しない問題を修正
## 13.14.2
diff --git a/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts b/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts
index 5b6191ca24..d4ec328721 100644
--- a/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts
@@ -96,6 +96,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
.andWhere('userListJoining.userListId = :userListId', { userListId: list.id });
this.queryService.generateVisibilityQuery(query, me);
+ this.queryService.generateMutedUserQuery(query, me);
+ this.queryService.generateMutedNoteQuery(query, me);
+ this.queryService.generateBlockedUserQuery(query, me);
+ this.queryService.generateMutedUserRenotesQueryForNotes(query, me);
if (ps.includeMyRenotes === false) {
query.andWhere(new Brackets(qb => {