diff options
| author | dakkar <dakkar@thenautilus.net> | 2024-04-25 11:31:46 +0100 |
|---|---|---|
| committer | dakkar <dakkar@thenautilus.net> | 2024-04-25 11:44:24 +0100 |
| commit | 76a4ebae8a9ce2a973e94216dcd26b119c5278d0 (patch) | |
| tree | f3dcfb9fe35799c39db9fcdf7f9776cc8613c23a /packages/backend/src/server/api/stream | |
| parent | Merge remote-tracking branch 'misskey/develop' into future-2024-04-25 (diff) | |
| download | sharkey-76a4ebae8a9ce2a973e94216dcd26b119c5278d0.tar.gz sharkey-76a4ebae8a9ce2a973e94216dcd26b119c5278d0.tar.bz2 sharkey-76a4ebae8a9ce2a973e94216dcd26b119c5278d0.zip | |
re-instate "followed users from muted instances are not muted"
Diffstat (limited to 'packages/backend/src/server/api/stream')
| -rw-r--r-- | packages/backend/src/server/api/stream/channel.ts | 2 |
1 files changed, 1 insertions, 1 deletions
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<string>(this.userProfile?.mutedInstances ?? []))) return true; + if (isInstanceMuted(note, new Set<string>(this.userProfile?.mutedInstances ?? [])) && !this.following[note.userId]) return true; // 流れてきたNoteがミュートしているユーザーが関わる if (isUserRelated(note, this.userIdsWhoMeMuting)) return true; |