diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-01-16 18:11:20 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2022-01-16 18:11:20 +0100 |
commit | b61c3ddff8338432fdc287f6bebbf76a12859c17 (patch) | |
tree | 702e67a92f3a6e84feed3c06126b14a7e4ecab35 /app/controllers/concerns | |
parent | 07cb948f39464b11959fc506b673a90d9524e519 (diff) | |
parent | 462bc65112276f4cbfbeb1efd8cd452fda7d0f23 (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `README.md`: Upstream added some text, but our README is completely different. Kept our README unchanged.
Diffstat (limited to 'app/controllers/concerns')
-rw-r--r-- | app/controllers/concerns/user_tracking_concern.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/concerns/user_tracking_concern.rb b/app/controllers/concerns/user_tracking_concern.rb index efda37fae..45f3aab0d 100644 --- a/app/controllers/concerns/user_tracking_concern.rb +++ b/app/controllers/concerns/user_tracking_concern.rb @@ -3,7 +3,7 @@ module UserTrackingConcern extend ActiveSupport::Concern - UPDATE_SIGN_IN_HOURS = 24 + UPDATE_SIGN_IN_FREQUENCY = 24.hours.freeze included do before_action :update_user_sign_in @@ -12,10 +12,10 @@ module UserTrackingConcern private def update_user_sign_in - current_user.update_sign_in!(request) if user_needs_sign_in_update? + current_user.update_sign_in! if user_needs_sign_in_update? end def user_needs_sign_in_update? - user_signed_in? && (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_FREQUENCY.ago) end end |