github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-23 22:51:06 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Extract theme resolution to a helper (#27426)

Browse Source 
This ensures that the theme id is resolved as early as possible in the
request cycle. This is necessary for the custom homepage to skip
preloading the wrong data.
This commit is contained in:
Penar Musaraj
2024-06-20 11:33:46 -04:00
committed by GitHub
parent d29160131d
commit 33de5abb6e
7 changed files with 51 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/controllers/application_controller.rb
View File

@ -9,6 +9,7 @@ class ApplicationController < ActionController::Base
include GlobalPath
include Hijack
include ReadOnlyMixin
include ThemeResolver
include VaryHeader
attr_reader :theme_id
@ -478,34 +479,7 @@ class ApplicationController < ActionController::Base
resolve_safe_mode
return if request.env[NO_THEMES]
theme_id = nil
if (preview_theme_id = request[:preview_theme_id]&.to_i) &&
guardian.allow_themes?([preview_theme_id], include_preview: true)
theme_id = preview_theme_id
end
user_option = current_user&.user_option
if theme_id.blank?
ids, seq = cookies[:theme_ids]&.split("|")
id = ids&.split(",")&.map(&:to_i)&.first
if id.present? && seq && seq.to_i == user_option&.theme_key_seq.to_i
theme_id = id if guardian.allow_themes?([id])
end
end
if theme_id.blank?
ids = user_option&.theme_ids || []
theme_id = ids.first if guardian.allow_themes?(ids)
end
if theme_id.blank? && SiteSetting.default_theme_id != -1 &&
guardian.allow_themes?([SiteSetting.default_theme_id])
theme_id = SiteSetting.default_theme_id
end
@theme_id = request.env[:resolved_theme_id] = theme_id
@theme_id ||= ThemeResolver.resolve_theme_id(request, guardian, current_user)
end
def guardian
@ -518,7 +492,7 @@ class ApplicationController < ActionController::Base
end
def current_homepage
current_user&.user_option&.homepage || HomepageHelper.resolve(request, current_user)
current_user&.user_option&.homepage || HomepageHelper.resolve(@theme_id, current_user)
end
def serialize_data(obj, serializer, opts = nil)