From 5e6d1d4bbf8024b1192d013f17679774bb4ffb0a Mon Sep 17 00:00:00 2001
From: Kalle <38327916+Sendouc@users.noreply.github.com>
Date: Sat, 4 Oct 2025 13:04:14 +0300
Subject: [PATCH] Ensure supporters have CALENDAR_EVENT_ADDER

This was already handled in the loader but not action
---
 app/features/calendar/loaders/calendar.new.server.ts | 4 +---
 app/modules/permissions/mapper.server.ts             | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/features/calendar/loaders/calendar.new.server.ts b/app/features/calendar/loaders/calendar.new.server.ts
index 17d7374d3..cf8a32124 100644
--- a/app/features/calendar/loaders/calendar.new.server.ts
+++ b/app/features/calendar/loaders/calendar.new.server.ts
@@ -11,9 +11,7 @@ import { canEditCalendarEvent } from "../calendar-utils";
 
 export const loader = async ({ request }: LoaderFunctionArgs) => {
 	const user = await requireUser(request);
-	if (!user.roles.includes("SUPPORTER")) {
-		requireRole(user, "CALENDAR_EVENT_ADDER");
-	}
+	requireRole(user, "CALENDAR_EVENT_ADDER");
 
 	const url = new URL(request.url);
 
diff --git a/app/modules/permissions/mapper.server.ts b/app/modules/permissions/mapper.server.ts
index 08508eee8..e4411d65f 100644
--- a/app/modules/permissions/mapper.server.ts
+++ b/app/modules/permissions/mapper.server.ts
@@ -49,7 +49,7 @@ export function userRoles(
 		result.push("TOURNAMENT_ADDER");
 	}
 
-	if (userDiscordIdIsAged(user)) {
+	if (userDiscordIdIsAged(user) || isSupporter(user)) {
 		result.push("CALENDAR_EVENT_ADDER");
 	}