techhub/mastodon
2
0
Fork 0
Code Activity

Improve RuboCop rules (compatibility to Code Climate) (#3636)

Browse Source 
08f8de84eb/Gemfile.lock (L38)
Code Climate is using RuboCop v0.46.0.

Change several rules to maintain compatibility.
This commit is contained in:
Yamagishi Kazutoshi
2017-06-08 20:24:28 +09:00
committed by Eugen Rochko
parent 7d2b4186c3
commit 0a0b9a271a
12 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/lib/feed_manager.rb
View File

@@ -109,8 +109,8 @@ class FeedManager
if status.reply? && !status.in_reply_to_account_id.nil? # Filter out if it's a reply
should_filter = !Follow.where(account_id: receiver_id, target_account_id: status.in_reply_to_account_id).exists? # and I'm not following the person it's a reply to
should_filter &&= !(receiver_id == status.in_reply_to_account_id) # and it's not a reply to me
should_filter &&= !(status.account_id == status.in_reply_to_account_id) # and it's not a self-reply
should_filter &&= receiver_id != status.in_reply_to_account_id # and it's not a reply to me
should_filter &&= status.account_id != status.in_reply_to_account_id # and it's not a self-reply
return should_filter
elsif status.reblog? # Filter out a reblog
should_filter = Block.where(account_id: status.reblog.account_id, target_account_id: receiver_id).exists? # or if the author of the reblogged status is blocking me