diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-10-13 16:44:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-13 16:44:29 +0200 |
| commit | b8db386e056fe236ed3f41e563a824e30733c4ce (patch) | |
| tree | 1753b0b08768582120309e788c30590b51e998d9 /app/lib | |
| parent | 48f7a587999740709f234e1ee004994de0059ab3 (diff) | |
Fix UserTrackingConcern firing on every request, optimize some queries (#5368)
- For some reason, :if option on before_action did not work. It got executed every time, returned false, and the action run anyway, which led to the current_sign_in_at and sign_in_count being updated on every request - Return "do not filter" early in FeedManager#filter_from_home? if the status is authored by receiver. Usually this method is not called for own statuses at all, but it is called when Feed#get uses the database - Return early if #reload_stale_associations! has nothing to load to save a database query with WHERE 1=0
Diffstat (limited to 'app/lib')
| -rw-r--r-- | app/lib/feed_manager.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb index 100f6c8f8..89aeaadcd 100644 --- a/app/lib/feed_manager.rb +++ b/app/lib/feed_manager.rb @@ -115,7 +115,8 @@ class FeedManager end def filter_from_home?(status, receiver_id) - return true if status.reply? && (status.in_reply_to_id.nil? || status.in_reply_to_account_id.nil?) + return false if receiver_id == status.account_id + return true if status.reply? && (status.in_reply_to_id.nil? || status.in_reply_to_account_id.nil?) check_for_mutes = [status.account_id] check_for_mutes.concat([status.reblog.account_id]) if status.reblog? |