From 3e368288ec5fd4cb227684f1ede1c65575df73ae Mon Sep 17 00:00:00 2001 From: Fire Demon Date: Sun, 11 Oct 2020 11:31:58 -0500 Subject: Exclude silenced accounts from feed when unfollowed --- app/lib/feed_manager.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app') diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb index 892af9655..2ba991b64 100644 --- a/app/lib/feed_manager.rb +++ b/app/lib/feed_manager.rb @@ -434,7 +434,7 @@ class FeedManager return !!should_filter elsif status.reblog? # ...it's a boost and... # ...you don't follow the OP and they're non-local or they're silenced... - should_filter = followed_only && !crutches[:following][status.reblog.account_id] + should_filter = (followed_only || status.reblog.account.silenced?) && !crutches[:following][status.reblog.account_id] # ..or you're hiding boosts from them... should_filter ||= crutches[:hiding_reblogs][status.account_id] -- cgit