Merge pull request #1850 from codidact/0valt/1813/logout-visibility

Sign out button visibility & suspension check fix

Author: Oaphi

app/controllers/admin_controller.rb

@@ -6,6 +6,8 @@ class AdminController < ApplicationController
   before_action :verify_developer, only: [:change_users, :impersonate]
   before_action :set_user, only: [:change_users, :hellban, :impersonate]
 
+  skip_before_action :check_if_warning_or_suspension_pending, only: [:change_back, :verify_elevation]
+
   def index; end
 
   def error_reports

app/controllers/application_controller.rb

@@ -8,7 +8,7 @@ class ApplicationController < ActionController::Base
   before_action :configure_permitted_parameters, if: :devise_controller?
   before_action :set_globals
   before_action :enforce_signed_in, unless: :devise_controller?
-  before_action :check_if_warning_or_suspension_pending
+  before_action :check_if_warning_or_suspension_pending, if: [:user_signed_in?], unless: [:devise_controller?]
   before_action :distinguish_fake_community
   before_action :stop_the_awful_troll
 
@@ -272,13 +272,7 @@ def pull_categories
   end
 
   def check_if_warning_or_suspension_pending
-    return if current_user.nil?
-
-    warning = ModWarning.to(current_user).active.any?
-    return unless warning
-
-    # Ignore devise and warning routes
-    return if devise_controller? || ['custom_sessions', 'mod_warning', 'errors'].include?(controller_name)
+    return unless ModWarning.to(current_user).active.any?
 
     flash.clear
 

app/controllers/errors_controller.rb

@@ -3,6 +3,7 @@
 # Note that it requires +consider_all_requests_local+ to be +false+ (see environment config files for details)
 class ErrorsController < ApplicationController
   protect_from_forgery with: :exception, except: [:error], store: :cookie
+  skip_before_action :check_if_warning_or_suspension_pending, only: [:error]
 
   def error
     @exception = request.env['action_dispatch.exception']

app/controllers/mod_warning_controller.rb

@@ -1,9 +1,10 @@
 class ModWarningController < ApplicationController
   before_action :verify_moderator, only: [:log, :new, :create, :lift]
-
   before_action :set_warning, only: [:current, :approve]
   before_action :set_user, only: [:log, :new, :create, :lift]
 
+  skip_before_action :check_if_warning_or_suspension_pending, only: [:current, :approve]
+
   def current
     render layout: 'without_sidebar'
   end