diff options
author | Matt Jankowski <mjankowski@thoughtbot.com> | 2017-04-29 18:28:16 -0400 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-04-30 00:28:16 +0200 |
commit | fdcf884cf719b682e413ee047542861b5a5cf3b7 (patch) | |
tree | 26234ef9661c33c7935f1a3857c76cd9c57da7dd /app/controllers/application_controller.rb | |
parent | 964035b1186a4dd66be0e0fb6cf56959e21c10e4 (diff) |
Extract user tracking into concern (#2600)
Diffstat (limited to 'app/controllers/application_controller.rb')
-rw-r--r-- | app/controllers/application_controller.rb | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 0c324762d..8456095fb 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -8,6 +8,7 @@ class ApplicationController < ActionController::Base force_ssl if: :https_enabled? include Localized + include UserTrackingConcern helper_method :current_account helper_method :single_user_mode? @@ -17,7 +18,6 @@ class ApplicationController < ActionController::Base rescue_from ActionController::InvalidAuthenticityToken, with: :unprocessable_entity before_action :store_current_location, except: :raise_not_found, unless: :devise_controller? - before_action :set_user_activity before_action :check_suspension, if: :user_signed_in? def raise_not_found @@ -38,16 +38,6 @@ class ApplicationController < ActionController::Base redirect_to root_path unless current_user&.admin? end - def set_user_activity - return unless !current_user.nil? && (current_user.current_sign_in_at.nil? || current_user.current_sign_in_at < 24.hours.ago) - - # Mark user as signed-in today - current_user.update_tracked_fields(request) - - # If the sign in is after a two week break, we need to regenerate their feed - RegenerationWorker.perform_async(current_user.account_id) if current_user.last_sign_in_at < 14.days.ago - end - def check_suspension head 403 if current_user.account.suspended? end |