From 1933aaac7f6999fb29d11778257dd2c6a407e206 Mon Sep 17 00:00:00 2001 From: Andreas Nedbal Date: Sat, 22 Jan 2022 21:32:45 +0100 Subject: [PATCH] Fix codestyle in `ScreenNameValidator` --- app/validators/screen_name_validator.rb | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/app/validators/screen_name_validator.rb b/app/validators/screen_name_validator.rb index d854512c..8d462e2a 100644 --- a/app/validators/screen_name_validator.rb +++ b/app/validators/screen_name_validator.rb @@ -1,16 +1,14 @@ +# frozen_string_literal: true + class ScreenNameValidator < ActiveModel::EachValidator - FORBIDDEN_SCREEN_NAMES = %w(justask_admin retrospring_admin admin justask retrospring about public + FORBIDDEN_SCREEN_NAMES = %w[justask_admin retrospring_admin admin justask retrospring about public notifications inbox sign_in sign_up sidekiq moderation moderator mod administrator - siteadmin site_admin help retro_spring retroospring retrosprlng niisding nllsding - pixeidesu plxeldesu plxeidesu terms privacy linkfilter feedback) - FORBIDDEN_SCREEN_NAME_REGEXPS = [/wreciap\z/i] + siteadmin site_admin help retro_spring retroospring retrosprlng niisding nllsding + pixeidesu plxeldesu plxeidesu terms privacy linkfilter feedback].freeze + FORBIDDEN_SCREEN_NAME_REGEXPS = [/wreciap\z/i].freeze def validate_each(record, attribute, value) - if FORBIDDEN_SCREEN_NAMES.include? value.downcase - record.errors[attribute] << "Thou shalt not use this username! Please choose another one." - end - if FORBIDDEN_SCREEN_NAME_REGEXPS.any? { |regexp| value.downcase =~ regexp } - record.errors[attribute] << "Registration is tempoarily disabled for new users." - end + record.errors[attribute] << "Thou shalt not use this username! Please choose another one." if FORBIDDEN_SCREEN_NAMES.include? value.downcase + record.errors[attribute] << "Registration is tempoarily disabled for new users." if FORBIDDEN_SCREEN_NAME_REGEXPS.any? { |regexp| value.downcase =~ regexp } end end