Remove "old verified" for everyone verifying

datasektionen · Sep 22, 2024 · bb43b74 · bb43b74
1 parent 3c00a44
commit bb43b74
Showing 1 changed file with 10 additions and 11 deletions.
diff --git a/src/commands/verify/subcommands/util.ts b/src/commands/verify/subcommands/util.ts
@@ -32,17 +32,16 @@ export const verifyUser = async (
 	const { year, yearRole } = await extractYearFromUser(kthId);
 	const userHasYearRole = await hasAnyYearRole(user, guild);
 
-	if ((yearRole && year) || userHasYearRole) {
-		if (yearRole && year) {
-			await setYearRoles(user, yearRole, guild);
-			const alias = mapYearToAlias(year);
-			if (alias)
-				await handleChannelAlias(guild, user, alias, joinChannel);
-		}
-
-		if (await hasRole(user, "old verified", guild))
-			await removeRole(user, "old verified", guild);
-	} else setExternRole(user, guild);
+	if (yearRole && year) {
+		await setYearRoles(user, yearRole, guild);
+		const alias = mapYearToAlias(year);
+		if (alias)
+			await handleChannelAlias(guild, user, alias, joinChannel);
+	} else if (!userHasYearRole)
+		setExternRole(user, guild);
 
 	await setPingRoles(user, guild);
+
+	if (await hasRole(user, "old verified", guild))
+		await removeRole(user, "old verified", guild);
 };