Don't add extern role if user has a year role when verifying

src/commands/verify/subcommands/util.ts

@@ -1,5 +1,6 @@
 import { Guild, User } from "discord.js";
 import {
+	hasAnyYearRole,
 	hasRole,
 	removeRole,
 	setExternRole,
@@ -29,14 +30,16 @@ export const verifyUser = async (
 
 	await setRoleVerified(user, guild);
 	const { year, yearRole } = await extractYearFromUser(kthId);
+	const userHasYearRole = await hasAnyYearRole(user, guild);
+
 	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);
+	} else if (!userHasYearRole) setExternRole(user, guild);
 
 	await setPingRoles(user, guild);
+
+	if (await hasRole(user, "old verified", guild))
+		await removeRole(user, "old verified", guild);
 };

src/shared/utils/roles.ts

@@ -145,3 +145,16 @@ export async function getRoles(user: User, guild: Guild): Promise<string[]> {
 	const guildMember = await guild.members.fetch(user);
 	return guildMember.roles.cache.map((role) => role.name);
 }
+
+export async function hasAnyYearRole(
+	user: User,
+	guild: Guild
+): Promise<boolean> {
+	const member = await guild.members.fetch(user.id);
+	return (
+		!!member &&
+		member.roles.cache.some((role) =>
+			new RegExp("^D-[0-9]{2}$").test(role.name)
+		)
+	);
+}