summaryrefslogtreecommitdiff
path: root/packages/backend/src/server/api/stream/channels/global-timeline.ts
diff options
context:
space:
mode:
authorMarie <Marie@kaifa.ch>2023-12-21 22:42:06 +0100
committerMarie <Marie@kaifa.ch>2023-12-21 22:42:06 +0100
commit9c6a7aed98a1d37f4f1fca1898f8ca9a2a6b0ced (patch)
treeba11c2af72b0dbd19af8b788dce826d150625dc8 /packages/backend/src/server/api/stream/channels/global-timeline.ts
parentfix: clicking on reaction icon not triggering toggle (diff)
downloadsharkey-9c6a7aed98a1d37f4f1fca1898f8ca9a2a6b0ced.tar.gz
sharkey-9c6a7aed98a1d37f4f1fca1898f8ca9a2a6b0ced.tar.bz2
sharkey-9c6a7aed98a1d37f4f1fca1898f8ca9a2a6b0ced.zip
fix: websocket for timelines not checking following for muted instance users
Closes #233
Diffstat (limited to 'packages/backend/src/server/api/stream/channels/global-timeline.ts')
-rw-r--r--packages/backend/src/server/api/stream/channels/global-timeline.ts2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/backend/src/server/api/stream/channels/global-timeline.ts b/packages/backend/src/server/api/stream/channels/global-timeline.ts
index fa0493854b..f64a13bcc5 100644
--- a/packages/backend/src/server/api/stream/channels/global-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/global-timeline.ts
@@ -67,7 +67,7 @@ class GlobalTimelineChannel extends Channel {
if (note.renote && note.text == null && (note.fileIds == null || note.fileIds.length === 0) && !this.withRenotes) return;
// Ignore notes from instances the user has muted
- if (isInstanceMuted(note, new Set<string>(this.userProfile?.mutedInstances ?? []))) return;
+ if (isInstanceMuted(note, new Set<string>(this.userProfile?.mutedInstances ?? [])) && !this.following[note.userId]) return;
// 流れてきたNoteがミュートしているユーザーが関わるものだったら無視する
if (isUserRelated(note, this.userIdsWhoMeMuting)) return;