diff options
author | JantsoP <jantso.porali@gmail.com> | 2017-04-04 08:41:46 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-04 08:41:46 +0200 |
commit | db4a41cf58f6b15e380ff1fdbc8f392e31e4235b (patch) | |
tree | a68429f1bade4869fccc4af5bcef8afbe570e1e1 /app/controllers/application_controller.rb | |
parent | dc89fc17cc35f8e1deaffb30ae581ac453a7a9fc (diff) | |
parent | eb023beb4975a019d6a3b3091483c91c2c837bbd (diff) |
Merge branch 'master' into master
Diffstat (limited to 'app/controllers/application_controller.rb')
-rw-r--r-- | app/controllers/application_controller.rb | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index ef9364897..c06142fd4 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -39,7 +39,14 @@ class ApplicationController < ActionController::Base end def set_user_activity - current_user.touch(:current_sign_in_at) if !current_user.nil? && (current_user.current_sign_in_at.nil? || current_user.current_sign_in_at < 24.hours.ago) + 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 + return end def check_suspension |