fix: add returns after interaction replies and error handling

datasektionen · Aug 27, 2022 · 0faf87a · 0faf87a
1 parent c4e0093
commit 0faf87a
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 28 deletions.
diff --git a/src/commands/add/add.handler.ts b/src/commands/add/add.handler.ts
@@ -1,4 +1,4 @@
-import { ChatInputCommandInteraction } from "discord.js";
+import { ChatInputCommandInteraction, InteractionResponse } from "discord.js";
 
 export const handleAdd = async (interaction: ChatInputCommandInteraction) => {
 	const { options } = interaction;
@@ -9,4 +9,5 @@ export const handleAdd = async (interaction: ChatInputCommandInteraction) => {
 		content: `The sum of the two numbers is: ${num1 + num2}`,
 		ephemeral: true,
 	});
+	return;
 };
diff --git a/src/commands/ping/ping.handler.ts b/src/commands/ping/ping.handler.ts
@@ -1,8 +1,9 @@
-import { CommandInteraction } from "discord.js";
+import { ChatInputCommandInteraction, InteractionResponse } from "discord.js";
 
-export const handlePing = async (interaction: CommandInteraction) => {
+export const handlePing = async (interaction: ChatInputCommandInteraction) => {
 	await interaction.reply({
 		content: "pong",
 		ephemeral: true,
 	});
+	return;
 };
diff --git a/src/commands/register-commands.ts b/src/commands/register-commands.ts
@@ -8,20 +8,29 @@ import { handleVerify } from "./verify/verify.handler";
 
 export const registerCommands = async () => {
 	const guild = await getGuild();
-	commands.forEach((command) => guild.commands.create(command));
+	Promise.all(commands.map((command) => guild.commands.create(command)));
 
 	discordClient.on("interactionCreate", async (interaction) => {
 		if (!interaction.isChatInputCommand()) {
 			return;
 		}
 
-		switch (interaction.commandName) {
-			case CommandNames.PING:
-				return await handlePing(interaction);
-			case CommandNames.ADD:
-				return await handleAdd(interaction);
-			case CommandNames.VERIFY:
-				return await handleVerify(interaction);
+		try {
+			switch (interaction.commandName) {
+				case CommandNames.PING:
+					await handlePing(interaction);
+					return;
+				case CommandNames.ADD:
+					await handleAdd(interaction);
+					return;
+				case CommandNames.VERIFY:
+					await handleVerify(interaction);
+					return;
+				default:
+					throw new Error(`Command name not found ${interaction.commandName}`);
+			}
+		} catch (error) {
+			console.error(error);
 		}
 	});
 };
diff --git a/src/commands/verify/subcommands/verify-begin.handler.ts b/src/commands/verify/subcommands/verify-begin.handler.ts
@@ -1,4 +1,4 @@
-import { ChatInputCommandInteraction, CommandInteraction } from "discord.js";
+import { ChatInputCommandInteraction, InteractionResponse } from "discord.js";
 import { tokenDiscord, tokenEmail } from "../../../database-config";
 import { generateToken } from "../../../utils/generate-token";
 import { sendMail } from "../../../utils/mail";
@@ -25,15 +25,17 @@ export const handleVerifyBegin = async (
 	try {
 		const result = await sendMail(messageText, token);
 		console.log(`Email sent, received response: ${JSON.stringify(result)}`);
+		await interaction.reply({
+			content: `Verification email sent, check ${messageText} for your verification code.`,
+			ephemeral: true,
+		});
+		return;
 	} catch (error) {
 		console.error(error);
 		await interaction.reply({
 			content: "Something went wrong, please try again.",
 			ephemeral: true,
 		});
+		return;
 	}
-	await interaction.reply({
-		content: `Verification email sent, check ${messageText} for your verification code.`,
-		ephemeral: true,
-	});
 };
diff --git a/src/commands/verify/subcommands/verify-submit.handler.ts b/src/commands/verify/subcommands/verify-submit.handler.ts
@@ -4,7 +4,7 @@ import {
 	tokenEmail,
 	verifiedUsers,
 } from "../../../database-config";
-import { setN0llanRole, setRoleVerified } from "../../../utils/roles";
+import { setRoleVerified } from "../../../utils/roles";
 import { messageIsToken } from "./util";
 
 export enum VariableNames {
@@ -14,7 +14,7 @@ export enum VariableNames {
 export const handleVerifySubmit = async (
 	interaction: ChatInputCommandInteraction
 ) => {
-	const { member, user, options } = interaction;
+	const { user, options } = interaction;
 	const messageText = options.getString(VariableNames.VERIFICATION_CODE, true);
 
 	if (!messageIsToken(messageText)) {
@@ -46,13 +46,14 @@ export const handleVerifySubmit = async (
 			content: `Du är nu verifierad. Dubbelkolla att du har blivit tilldelad @**${process.env.DISCORD_VERIFIED_ROLE}** rollen!`,
 			ephemeral: true,
 		});
+		return;
 		// setN0llanRole(user, emailAddress.split("@")[0]);
 	} catch (error) {
 		console.error(error);
 		await interaction.reply({
 			content: "Something went wrong, please try again.",
 			ephemeral: true,
 		});
+		return;
 	}
-	return;
 };
diff --git a/src/commands/verify/verify.handler.ts b/src/commands/verify/verify.handler.ts
@@ -1,7 +1,7 @@
-import { ChatInputCommandInteraction, CommandInteraction } from "discord.js";
+import { ChatInputCommandInteraction, InteractionResponse } from "discord.js";
 import { handleVerifyBegin } from "./subcommands/verify-begin.handler";
-import { VerifySubcommandNames } from "./verify-subcommands-names.enum";
 import { handleVerifySubmit } from "./subcommands/verify-submit.handler";
+import { VerifySubcommandNames } from "./verify-subcommands-names.enum";
 
 export const handleVerify = async (
 	interaction: ChatInputCommandInteraction
@@ -10,10 +10,10 @@ export const handleVerify = async (
 
 	switch (subCommandName) {
 		case VerifySubcommandNames.BEGIN:
-			await handleVerifyBegin(interaction);
-			break;
+			return await handleVerifyBegin(interaction);
 		case VerifySubcommandNames.SUBMIT:
-			await handleVerifySubmit(interaction);
-			break;
+			return await handleVerifySubmit(interaction);
+		default:
+			throw new Error(`Command name not found ${interaction.commandName}`);
 	}
 };
diff --git a/src/utils/guild.ts b/src/utils/guild.ts
@@ -1,4 +1,4 @@
-import { Guild, User } from "discord.js";
+import { Guild, GuildMember, User } from "discord.js";
 import { discordClient } from "..";
 
 export async function getGuild(): Promise<Guild> {
@@ -7,7 +7,7 @@ export async function getGuild(): Promise<Guild> {
 	);
 }
 
-export async function getGuildMember(user: User) {
+export async function getGuildMember(user: User): Promise<GuildMember> {
 	const guild = await getGuild();
 	return await guild.members.fetch(user);
 }
diff --git a/src/utils/roles.ts b/src/utils/roles.ts
@@ -37,7 +37,7 @@ export async function setRoleVerified(user: User): Promise<void> {
 	await setRole(user, process.env.DISCORD_VERIFIED_ROLE as string);
 }
 
-export async function setN0llanRole(user: User, kthId: string) {
+export async function setN0llanRole(user: User, kthId: string): Promise<void> {
 	const hodisUser = await getHodisUser(kthId);
 	if (hodisUser.tag.split(",").includes("D22")) {
 		await setRole(user, "n0llan");