about summary refs log tree commit diff
path: root/app/lib
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-11-08 02:08:32 +0100
committerEugen Rochko <eugen@zeonfederated.com>2016-11-08 02:08:32 +0100
commitbb4d1eb2e86ec6227c18df29ce0f0f25ae2f6ee3 (patch)
treee0230cf6dc1913631aa333cc1b0724dfcc9863aa /app/lib
parent096bfbad966e7dbd0ea2d71b12d1f411daabdb72 (diff)
Improve feed regeneration
Diffstat (limited to 'app/lib')
-rw-r--r--app/lib/feed_manager.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb
index 6a4f0edd6..af7b2380e 100644
--- a/app/lib/feed_manager.rb
+++ b/app/lib/feed_manager.rb
@@ -76,8 +76,8 @@ class FeedManager
   end
 
   def filter_from_mentions?(status, receiver)
-    should_filter = false
-    should_filter = receiver.blocking?(status.account) # Filter if it's from someone I blocked
+    should_filter = receiver.id == status.account_id                    # Filter if I'm mentioning myself
+    should_filter = should_filter || receiver.blocking?(status.account) # or it's from someone I blocked
     should_filter
   end
 end