diff options
| author | Yamagishi Kazutoshi <ykzts@desire.sh> | 2017-06-08 20:24:28 +0900 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-06-08 13:24:28 +0200 |
| commit | 0a0b9a271a8de84272ff2dafc96ef53db224bb21 (patch) | |
| tree | 39a325adf00bb3f57d65510029d9b85d1d4b5de1 /app/lib | |
| parent | 7d2b4186c37ec81ae896eb57168cb0374de2c656 (diff) | |
Improve RuboCop rules (compatibility to Code Climate) (#3636)
https://github.com/codeclimate/codeclimate-rubocop/blob/08f8de84ebfb39caa96391e23816877278f6441c/Gemfile.lock#L38 Code Climate is using RuboCop v0.46.0. Change several rules to maintain compatibility.
Diffstat (limited to 'app/lib')
| -rw-r--r-- | app/lib/feed_manager.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb index 86928fa36..90a1441f2 100644 --- a/app/lib/feed_manager.rb +++ b/app/lib/feed_manager.rb @@ -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 |