fixed colour validation

Author: Mole1424

events/ui.py

@@ -46,7 +46,8 @@ def create(error: str | None = None) -> str | Response:  # noqa: PLR0911
         flash(colour, "error")
         return redirect(url_for("events_ui.create"))
 
-    colour = color_colour if color_colour else text_colour
+    # prefer text_colour if both are provided (in case these colours change)
+    colour = text_colour if text_colour else color_colour
 
     # parse dates and duration
     start_time = get_datetime_from_string(request.form["start_time"])

schema.py

@@ -181,7 +181,7 @@ def validate(self) -> str | None:
         # check if colour is valid
         colour_regex = re.compile(r"^#[0-9a-fA-F]{6}$")
         if self.colour and (
-            not colour_regex.match(self.colour) or self.colour not in colours
+            not colour_regex.match(self.colour) and self.colour not in colours
         ):
             return "Colour must be a valid hex code or one of: " + ", ".join(colours)