Merge branch 'main' into feature/diva

schemas/patch-schema/18-timer-toggle.sql

@@ -0,0 +1,5 @@
+BEGIN;
+
+ALTER TABLE users ADD COLUMN IF NOT EXISTS timer bool;
+
+END;

schemas/patch-schema/19-festa-submissions.sql

@@ -0,0 +1,15 @@
+BEGIN;
+
+CREATE TABLE festa_submissions (
+    character_id int NOT NULL,
+    guild_id int NOT NULL,
+    trial_type int NOT NULL,
+    souls int NOT NULL,
+    timestamp timestamp with time zone NOT NULL
+);
+
+ALTER TABLE guild_characters DROP COLUMN souls;
+
+ALTER TYPE festival_colour RENAME TO festival_color;
+
+END;