about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorFire Demon <firedemon@creature.cafe>2020-10-11 11:31:58 -0500
committerFire Demon <firedemon@creature.cafe>2020-10-11 11:31:58 -0500
commit3e368288ec5fd4cb227684f1ede1c65575df73ae (patch)
tree6d1f4bcde7ff156ec6d9bd19b49d2eee54c9bdbb /app
parentca8e77f3dc06bc758c606d316d68ba6a2c1b4a20 (diff)
Exclude silenced accounts from feed when unfollowed
Diffstat (limited to 'app')
-rw-r--r--app/lib/feed_manager.rb2
1 files changed, 1 insertions, 1 deletions
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]