diff options
author | Starfall <us@starfall.systems> | 2022-02-07 14:27:36 -0600 |
---|---|---|
committer | Starfall <us@starfall.systems> | 2022-02-07 14:27:36 -0600 |
commit | 75f9c15f555104f04f4230b2f426550e0953de5b (patch) | |
tree | efd043cece164e31fcbd45eec286202bddd35ce6 /app/controllers/concerns | |
parent | 2daee3d28bba6da5dbaf277eca350cc94e5ade13 (diff) | |
parent | b1983623aec8e0b066d115736d2151e0c74407fa (diff) |
Merge remote-tracking branch 'glitch/main'
Diffstat (limited to 'app/controllers/concerns')
-rw-r--r-- | app/controllers/concerns/theming_concern.rb | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/app/controllers/concerns/theming_concern.rb b/app/controllers/concerns/theming_concern.rb index 1ee3256c0..425554072 100644 --- a/app/controllers/concerns/theming_concern.rb +++ b/app/controllers/concerns/theming_concern.rb @@ -10,6 +10,15 @@ module ThemingConcern private + def current_flavour + [current_user&.setting_flavour, Setting.flavour, 'glitch', 'vanilla'].find { |flavour| Themes.instance.flavours.include?(flavour) } + end + + def current_skin + skins = Themes.instance.skins_for(current_flavour) + [current_user&.setting_skin, Setting.skin, 'default'].find { |skin| skins.include?(skin) } + end + def valid_pack_data?(data, pack_name) data['pack'].is_a?(Hash) && [String, Hash].any? { |c| data['pack'][pack_name].is_a?(c) } end |