mirror of
https://github.com/funamitech/mastodon
synced 2024-12-11 21:29:17 +09:00
1cc44cba81
UserTrackingConcern is circumvented by SessionsController#create because it calls warden, which calls the User#update_tracked_fields! method directly. Move returning user logic to that method.
23 lines
487 B
Ruby
23 lines
487 B
Ruby
# frozen_string_literal: true
|
|
|
|
module UserTrackingConcern
|
|
extend ActiveSupport::Concern
|
|
|
|
UPDATE_SIGN_IN_HOURS = 24
|
|
|
|
included do
|
|
before_action :set_user_activity
|
|
end
|
|
|
|
private
|
|
|
|
def set_user_activity
|
|
return unless user_needs_sign_in_update?
|
|
current_user.update_tracked_fields!(request)
|
|
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)
|
|
end
|
|
end
|