From 76a4ebae8a9ce2a973e94216dcd26b119c5278d0 Mon Sep 17 00:00:00 2001 From: dakkar Date: Thu, 25 Apr 2024 11:31:46 +0100 Subject: [PATCH] re-instate "followed users from muted instances are not muted" --- packages/backend/src/server/api/stream/channel.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/backend/src/server/api/stream/channel.ts b/packages/backend/src/server/api/stream/channel.ts index a267d27fba..49b0ae1d5b 100644 --- a/packages/backend/src/server/api/stream/channel.ts +++ b/packages/backend/src/server/api/stream/channel.ts @@ -63,7 +63,7 @@ export default abstract class Channel { */ protected isNoteMutedOrBlocked(note: Packed<'Note'>): boolean { // 流れてきたNoteがインスタンスミュートしたインスタンスが関わる - if (isInstanceMuted(note, new Set(this.userProfile?.mutedInstances ?? []))) return true; + if (isInstanceMuted(note, new Set(this.userProfile?.mutedInstances ?? [])) && !this.following[note.userId]) return true; // 流れてきたNoteがミュートしているユーザーが関わる if (isUserRelated(note, this.userIdsWhoMeMuting)) return true;