about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFire Demon <firedemon@creature.cafe>2020-10-22 19:36:17 -0500
committerFire Demon <firedemon@creature.cafe>2020-10-22 19:36:17 -0500
commiteb9e1d9473c7ab6af884bde9991f7eac0ba938bf (patch)
tree00bc8c57bd727bddfd0759c7dcd3916ead340351
parent36aacb3fd2837981d5cfc8354105b7dcb325065e (diff)
Use mentioned account IDs rather than the mention IDs themselves!
-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 f3b07c3e0..3a26ec483 100644
--- a/app/lib/feed_manager.rb
+++ b/app/lib/feed_manager.rb
@@ -424,7 +424,7 @@ class FeedManager
     # Filter if...
     if status.reply? # ...it's a reply and...
       # ...you're not following the participants...
-      should_filter   = (status.mention_ids - crutches[:following].keys).present?
+      should_filter   = (status.mentions.pluck(:account_id) - crutches[:following].keys).present?
       # ...and the author isn't replying to you...
       should_filter &&= receiver_id != status.in_reply_to_account_id
 
@@ -443,7 +443,7 @@ class FeedManager
       # ...or it's a reply...
       if !(should_filter || status.reblog.in_reply_to_account_id.nil?) && status.reblog.reply?
         # ...and you don't follow the participants...
-        should_filter ||= (status.reblog.mention_ids - crutches[:following].keys).present?
+        should_filter ||= (status.reblog.mentions.pluck(:account_ids) - crutches[:following].keys).present?
         # ...and the author isn't replying to you...
         should_filter &&= receiver_id != status.in_reply_to_account_id
       end