diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 13c6caca6..c75bfebdd 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -5,7 +5,6 @@ class ApplicationController < ActionController::Base before_action :set_current_user after_action :reset_current_user before_action :normalize_search - before_action :set_started_at_session before_action :api_check before_action :set_variant before_action :track_only_param @@ -171,12 +170,6 @@ class ApplicationController < ActionController::Base CurrentUser.root_url = root_url.chomp("/") end - def set_started_at_session - if session[:started_at].blank? - session[:started_at] = Time.now - end - end - def set_variant request.variant = params[:variant].try(:to_sym) end diff --git a/app/logical/session_loader.rb b/app/logical/session_loader.rb index 3b724d4f0..d3867d88f 100644 --- a/app/logical/session_loader.rb +++ b/app/logical/session_loader.rb @@ -27,6 +27,7 @@ class SessionLoader update_last_ip_addr set_time_zone set_safe_mode + set_started_at_session CurrentUser.user.unban! if CurrentUser.user.ban_expired? DanbooruLogger.initialize(request, session, CurrentUser.user) end @@ -110,4 +111,10 @@ private safe_mode = request.host.match?(/safebooru/i) || params[:safe_mode].to_s.truthy? || CurrentUser.user.enable_safe_mode? CurrentUser.safe_mode = safe_mode end + + def set_started_at_session + if session[:started_at].blank? + session[:started_at] = Time.now + end + end end