From acf9595d711e2667ab0e8eb28360660cd759ae17 Mon Sep 17 00:00:00 2001 From: Andreas Nedbal Date: Mon, 11 Dec 2023 01:33:27 +0100 Subject: [PATCH] Fix rubocop nits --- app/controllers/application_controller.rb | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index a461e1c1..35eda9f9 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -30,16 +30,15 @@ class ApplicationController < ActionController::Base # obligatory '2001: A Space Odyssey' reference flash[:notice] = t("user.sessions.create.banned", name:) current_ban = current_user.bans.current.first - unless current_ban&.reason.empty? - flash[:notice] += "\n#{t('user.sessions.create.reason', reason: current_ban.reason)}" - end + flash[:notice] += "\n#{t('user.sessions.create.reason', reason: current_ban.reason)}" unless current_ban&.reason&.empty? + + flash[:notice] += if current_ban&.permanent? + "\n#{t('user.sessions.create.permanent')}" + else + # TODO: format banned_until + "\n#{t('user.sessions.create.until', time: current_ban.expires_at)}" + end - if current_ban&.permanent? - flash[:notice] += "\n#{t('user.sessions.create.permanent')}" - else - # TODO format banned_until - flash[:notice] += "\n#{t('user.sessions.create.until', time: current_ban.expires_at)}" - end sign_out current_user redirect_to new_user_session_path end