From 4fb3dc0363956a1a61613e90e9a4e7e945a7f714 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 10 Jan 2025 04:02:48 -0500
Subject: [PATCH] Extract `CSS_COLORS` constant for `UserRole` regex validation
 (#33532)

---
 app/models/user_role.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/models/user_role.rb b/app/models/user_role.rb
index 24cd5983f32..d567bf5eca5 100644
--- a/app/models/user_role.rb
+++ b/app/models/user_role.rb
@@ -42,6 +42,7 @@ class UserRole < ApplicationRecord
   NOBODY_POSITION = -1
 
   POSITION_LIMIT = (2**31) - 1
+  CSS_COLORS = /\A#?(?:[A-F0-9]{3}){1,2}\z/i # CSS-style hex colors
 
   module Flags
     NONE = 0
@@ -90,7 +91,7 @@ class UserRole < ApplicationRecord
   attr_writer :current_account
 
   validates :name, presence: true, unless: :everyone?
-  validates :color, format: { with: /\A#?(?:[A-F0-9]{3}){1,2}\z/i }, unless: -> { color.blank? }
+  validates :color, format: { with: CSS_COLORS }, if: :color?
   validates :position, numericality: { in: (-POSITION_LIMIT..POSITION_LIMIT) }
 
   validate :validate_permissions_elevation