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/controllers/concerns | |
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/controllers/concerns')
-rw-r--r-- | app/controllers/concerns/user_tracking_concern.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/controllers/concerns/user_tracking_concern.rb b/app/controllers/concerns/user_tracking_concern.rb index 8a63af95d..8663c3086 100644 --- a/app/controllers/concerns/user_tracking_concern.rb +++ b/app/controllers/concerns/user_tracking_concern.rb @@ -7,12 +7,14 @@ module UserTrackingConcern UPDATE_SIGN_IN_HOURS = 24 included do - before_action :set_user_activity, if: %i(user_signed_in? user_needs_sign_in_update?) + before_action :set_user_activity end private def set_user_activity + return unless user_needs_sign_in_update? + # Mark as signed-in today current_user.update_tracked_fields!(request) @@ -21,7 +23,7 @@ module UserTrackingConcern end def user_needs_sign_in_update? - current_user.current_sign_in_at.nil? || current_user.current_sign_in_at < UPDATE_SIGN_IN_HOURS.hours.ago + user_signed_in? && (current_user.current_sign_in_at.nil? || current_user.current_sign_in_at < UPDATE_SIGN_IN_HOURS.hours.ago) end def user_needs_feed_update? |