diff options
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 27cd0f4f9..8ffc31bb4 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -25,7 +25,7 @@ class ApplicationController < ActionController::Base rescue_from Mastodon::NotPermittedError, with: :forbidden before_action :store_current_location, except: :raise_not_found, unless: :devise_controller? - before_action :check_suspension, if: :user_signed_in? + before_action :check_user_permissions, if: :user_signed_in? def raise_not_found raise ActionController::RoutingError, "No route matches #{params[:unmatched_route]}" @@ -49,8 +49,8 @@ class ApplicationController < ActionController::Base forbidden unless current_user&.staff? end - def check_suspension - forbidden if current_user.account.suspended? + def check_user_permissions + forbidden if current_user.disabled? || current_user.account.suspended? end def after_sign_out_path_for(_resource_or_scope) @@ -165,12 +165,12 @@ class ApplicationController < ActionController::Base end def current_flavour - return Setting.default_settings['flavour'] unless Themes.instance.flavours.include? current_user&.setting_flavour + return Setting.flavour unless Themes.instance.flavours.include? current_user&.setting_flavour current_user.setting_flavour end def current_skin - return 'default' unless Themes.instance.skins_for(current_flavour).include? current_user&.setting_skin + return Setting.skin unless Themes.instance.skins_for(current_flavour).include? current_user&.setting_skin current_user.setting_skin end |