From eb9e1d9473c7ab6af884bde9991f7eac0ba938bf Mon Sep 17 00:00:00 2001 From: Fire Demon Date: Thu, 22 Oct 2020 19:36:17 -0500 Subject: Use mentioned account IDs rather than the mention IDs themselves! --- app/lib/feed_manager.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/lib') 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 -- cgit