jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

app controller: move session[:started_at] init to SessionLoader.

Browse Source
This commit is contained in:
evazion
2019-08-24 22:55:36 -05:00
parent 1a964f7a10
commit a6ed7ca936
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/controllers/application_controller.rb
View File

@@ -5,7 +5,6 @@ class ApplicationController < ActionController::Base
before_action :set_current_user before_action :set_current_user
after_action :reset_current_user after_action :reset_current_user
before_action :normalize_search before_action :normalize_search
before_action :set_started_at_session
before_action :api_check before_action :api_check
before_action :set_variant before_action :set_variant
before_action :track_only_param before_action :track_only_param
@@ -171,12 +170,6 @@ class ApplicationController < ActionController::Base
CurrentUser.root_url = root_url.chomp("/") CurrentUser.root_url = root_url.chomp("/")
end end
def set_started_at_session
if session[:started_at].blank?
session[:started_at] = Time.now
end
end
def set_variant def set_variant
request.variant = params[:variant].try(:to_sym) request.variant = params[:variant].try(:to_sym)
end end

7
app/logical/session_loader.rb
View File

@@ -27,6 +27,7 @@ class SessionLoader
update_last_ip_addr update_last_ip_addr
set_time_zone set_time_zone
set_safe_mode set_safe_mode
set_started_at_session
CurrentUser.user.unban! if CurrentUser.user.ban_expired? CurrentUser.user.unban! if CurrentUser.user.ban_expired?
DanbooruLogger.initialize(request, session, CurrentUser.user) DanbooruLogger.initialize(request, session, CurrentUser.user)
end end
@@ -110,4 +111,10 @@ private
safe_mode = request.host.match?(/safebooru/i) || params[:safe_mode].to_s.truthy? || CurrentUser.user.enable_safe_mode? safe_mode = request.host.match?(/safebooru/i) || params[:safe_mode].to_s.truthy? || CurrentUser.user.enable_safe_mode?
CurrentUser.safe_mode = safe_mode CurrentUser.safe_mode = safe_mode
end end
def set_started_at_session
if session[:started_at].blank?
session[:started_at] = Time.now
end
end
end end