monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #858 from krainboltgreene/patch-6 

Use active record shorthand
This commit is contained in:
Eugen 2017-04-05 02:53:39 +02:00 committed by GitHub
parent feea517046 731e650681
commit 2edeb3fe1c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/lib/feed_manager.rb
View File

@ -118,7 +118,7 @@ class FeedManager
def filter_from_mentions?(status, receiver_id) def filter_from_mentions?(status, receiver_id)
check_for_blocks = [status.account_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? 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 should_filter = receiver_id == status.account_id # Filter if I'm mentioning myself