logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 2edeb3fe1c6212380a1c053f124fbaed1c47a261
parent: feea517046aa5ac50cf6e339a5dd7a33432f2ae6
Author: Eugen <eugen@zeonfederated.com>
Date:   Wed,  5 Apr 2017 02:53:39 +0200

Merge pull request #858 from krainboltgreene/patch-6

Use active record shorthand

Diffstat:

Mapp/lib/feed_manager.rb2+-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb @@ -118,7 +118,7 @@ class FeedManager def filter_from_mentions?(status, receiver_id) check_for_blocks = [status.account_id] - check_for_blocks.concat(status.mentions.select('account_id').map(&:account_id)) + check_for_blocks.concat(status.mentions.pluck(:account_id)) check_for_blocks.concat([status.in_reply_to_account]) if status.reply? && !status.in_reply_to_account_id.nil? should_filter = receiver_id == status.account_id # Filter if I'm mentioning myself