From dd42984a85f58ce159a53868bf9aeafa2a79e8be Mon Sep 17 00:00:00 2001
From: Kalle <38327916+Sendouc@users.noreply.github.com>
Date: Sat, 31 May 2025 12:35:50 +0300
Subject: [PATCH] Fix crash on submitting a new scrim post

---
 app/features/scrims/actions/scrims.new.server.ts | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/features/scrims/actions/scrims.new.server.ts b/app/features/scrims/actions/scrims.new.server.ts
index 465e63a69..6ad14659a 100644
--- a/app/features/scrims/actions/scrims.new.server.ts
+++ b/app/features/scrims/actions/scrims.new.server.ts
@@ -100,9 +100,17 @@ export const usersListForPost = async ({
 	);
 	errorToastIfFalsy(team, "User is not a member of this team");
 
-	return team.members
-		.filter((member) => !ROLES_TO_EXCLUDE.includes(member.role))
-		.map((member) => member.id);
+	const filteredMembers = team.members.filter(
+		(member) => !ROLES_TO_EXCLUDE.includes(member.role),
+	);
+
+	// handle case when all users are from excluded roles
+	const result = (
+		filteredMembers.length > 0 ? filteredMembers : team.members
+	).map((member) => member.id);
+
+	// ensure author is included in the list even if they match the ignore condition
+	return result.includes(authorId) ? result : [authorId, ...result];
 };
 
 async function validatePickup(userIds: number[], authorId: number) {