summaryrefslogtreecommitdiff
path: root/packages/backend/src/server/api/endpoints/channels
diff options
context:
space:
mode:
authorHazelnoot <acomputerdog@gmail.com>2025-03-30 01:58:17 -0400
committerHazelnoot <acomputerdog@gmail.com>2025-03-30 01:58:17 -0400
commit4ae26e6e185e52ac186ac10ccd4eda7718bf6e26 (patch)
tree8d556072f3876f0bfbab9d24e7cd209ca6bd091a /packages/backend/src/server/api/endpoints/channels
parentrestore following feed deck UI (diff)
parentNew Crowdin updates (#15721) (diff)
downloadsharkey-4ae26e6e185e52ac186ac10ccd4eda7718bf6e26.tar.gz
sharkey-4ae26e6e185e52ac186ac10ccd4eda7718bf6e26.tar.bz2
sharkey-4ae26e6e185e52ac186ac10ccd4eda7718bf6e26.zip
Merge branch 'misskey-develop' into merge/2025-03-24
Diffstat (limited to 'packages/backend/src/server/api/endpoints/channels')
-rw-r--r--packages/backend/src/server/api/endpoints/channels/timeline.ts4
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/backend/src/server/api/endpoints/channels/timeline.ts b/packages/backend/src/server/api/endpoints/channels/timeline.ts
index 0bd01d712c..5fc0ae00b2 100644
--- a/packages/backend/src/server/api/endpoints/channels/timeline.ts
+++ b/packages/backend/src/server/api/endpoints/channels/timeline.ts
@@ -138,8 +138,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
.leftJoinAndSelect('note.channel', 'channel');
if (me) {
- this.queryService.generateMutedUserQuery(query, me);
- this.queryService.generateBlockedUserQuery(query, me);
+ this.queryService.generateMutedUserQueryForNotes(query, me);
+ this.queryService.generateBlockedUserQueryForNotes(query, me);
}
if (ps.withRenotes === false) {