feat: improve error handling

discord-tickets · Jun 25, 2023 · e8b95a2 · e8b95a2
1 parent 47fc7bd
commit e8b95a2
Show file tree

Hide file tree

Showing 10 changed files with 165 additions and 23 deletions.
diff --git a/package.json b/package.json
@@ -52,7 +52,7 @@
 		"@fastify/cookie": "^6.0.0",
 		"@fastify/jwt": "^5.0.1",
 		"@fastify/oauth2": "^5.1.0",
-		"@prisma/client": "^4.14.1",
+		"@prisma/client": "^4.16.1",
 		"boxen": "^7.1.0",
 		"cryptr": "^6.2.0",
 		"discord.js": "^14.11.0",
@@ -68,8 +68,9 @@
 		"node-dir": "^0.1.17",
 		"node-emoji": "^1.11.0",
 		"object-diffy": "^1.0.4",
-		"prisma": "^4.14.1",
+		"prisma": "^4.16.1",
 		"semver": "^7.5.1",
+		"short-unique-id": "^4.4.4",
 		"spacetime": "^7.4.4",
 		"terminal-link": "^2.1.1",
 		"yaml": "^1.10.2"

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/buttons/edit.js b/src/buttons/edit.js
@@ -108,4 +108,4 @@ module.exports = class EditButton extends Button {
 			);
 		}
 	}
-};
+};
diff --git a/src/lib/logging.js b/src/lib/logging.js
@@ -3,6 +3,11 @@ const {
 	EmbedBuilder,
 } = require('discord.js');
 const { diff: getDiff } = require('object-diffy');
+const ShortUniqueId = require('short-unique-id');
+
+const uid = new ShortUniqueId();
+
+const getSUID = () => uid.stamp(10);
 
 const uuidRegex = /[0-9a-fA-F]{8}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{12}/g;
 
@@ -235,6 +240,7 @@ async function logMessageEvent(client, {
 
 module.exports = {
 	getLogChannel,
+	getSUID,
 	logAdminEvent,
 	logMessageEvent,
 	logTicketEvent,

diff --git a/src/lib/tickets/manager.js b/src/lib/tickets/manager.js
@@ -28,6 +28,7 @@ const {
 	decrypt,
 	encrypt,
 } = new Cryptr(process.env.ENCRYPTION_KEY);
+const { getSUID } = require('../logging');
 
 /**
  * @typedef {import('@prisma/client').Category &
@@ -682,7 +683,7 @@ module.exports = class TicketManager {
 				userId: interaction.user.id,
 			});
 		} catch (error) {
-			const ref = require('crypto').randomUUID();
+			const ref = getSUID();
 			this.client.log.warn.tickets('An error occurred whilst creating ticket', channel.id);
 			this.client.log.error.tickets(ref);
 			this.client.log.error.tickets(error);

diff --git a/src/listeners/autocomplete/error.js b/src/listeners/autocomplete/error.js
@@ -0,0 +1,22 @@
+const { Listener } = require('@eartharoid/dbf');
+
+module.exports = class extends Listener {
+	constructor(client, options) {
+		super(client, {
+			...options,
+			emitter: client.autocomplete,
+			event: 'error',
+		});
+	}
+
+	async run({
+		completer,
+		error,
+		interaction,
+	}) {
+		this.client.log.error.autocomplete(`"${completer.id}" autocomplete execution error:`, {
+			error,
+			interaction,
+		});
+	}
+};
diff --git a/src/listeners/buttons/error.js b/src/listeners/buttons/error.js
@@ -3,6 +3,7 @@ const {
 	EmbedBuilder,
 	codeBlock,
 } = require('discord.js');
+const { getSUID } = require('../../lib/logging');
 
 module.exports = class extends Listener {
 	constructor(client, options) {
@@ -18,7 +19,7 @@ module.exports = class extends Listener {
 		error,
 		interaction,
 	}) {
-		const ref = require('crypto').randomUUID();
+		const ref = getSUID();
 		this.client.log.error.buttons(ref);
 		this.client.log.error.buttons(`"${button.id}" button execution error:`, error);
 		let locale = null;
@@ -39,7 +40,7 @@ module.exports = class extends Listener {
 					.addFields([
 						{
 							name: getMessage('misc.error.fields.identifier'),
-							value: codeBlock(ref),
+							value: codeBlock('             ' + ref + '             '),
 						},
 					]),
 			],

diff --git a/src/listeners/commands/error.js b/src/listeners/commands/error.js
@@ -3,6 +3,7 @@ const {
 	EmbedBuilder,
 	codeBlock,
 } = require('discord.js');
+const { getSUID } = require('../../lib/logging');
 
 module.exports = class extends Listener {
 	constructor(client, options) {
@@ -18,7 +19,7 @@ module.exports = class extends Listener {
 		error,
 		interaction,
 	}) {
-		const ref = require('crypto').randomUUID();
+		const ref = getSUID();
 		this.client.log.error.commands(ref);
 		this.client.log.error.commands(`"${command.name}" command execution error:`, error);
 		let locale = null;
@@ -39,7 +40,7 @@ module.exports = class extends Listener {
 					.addFields([
 						{
 							name: getMessage('misc.error.fields.identifier'),
-							value: codeBlock(ref),
+							value: codeBlock('             ' + ref + '             '),
 						},
 					]),
 			],

diff --git a/src/listeners/menus/error.js b/src/listeners/menus/error.js
@@ -0,0 +1,51 @@
+const { Listener } = require('@eartharoid/dbf');
+const {
+	EmbedBuilder,
+	codeBlock,
+} = require('discord.js');
+const { getSUID } = require('../../lib/logging');
+
+module.exports = class extends Listener {
+	constructor(client, options) {
+		super(client, {
+			...options,
+			emitter: client.menus,
+			event: 'error',
+		});
+	}
+
+	async run({
+		menu,
+		error,
+		interaction,
+	}) {
+		const ref = getSUID();
+		this.client.log.error.menus(ref);
+		this.client.log.error.menus(`"${menu.id}" menu execution error:`, error);
+		let locale = null;
+		if (interaction.guild) {
+			locale = (await this.client.prisma.guild.findUnique({
+				select: { locale: true },
+				where: { id: interaction.guild.id },
+			})).locale;
+		}
+		const getMessage = this.client.i18n.getLocale(locale);
+		const data = {
+			components: [],
+			embeds: [
+				new EmbedBuilder()
+					.setColor('Orange')
+					.setTitle(getMessage('misc.error.title'))
+					.setDescription(getMessage('misc.error.description'))
+					.addFields([
+						{
+							name: getMessage('misc.error.fields.identifier'),
+							value: codeBlock('             ' + ref + '             '),
+						},
+					]),
+			],
+		};
+
+		interaction.reply(data).catch(() => interaction.editReply(data));
+	}
+};
diff --git a/src/listeners/modals/error.js b/src/listeners/modals/error.js
@@ -0,0 +1,51 @@
+const { Listener } = require('@eartharoid/dbf');
+const {
+	EmbedBuilder,
+	codeBlock,
+} = require('discord.js');
+const { getSUID } = require('../../lib/logging');
+
+module.exports = class extends Listener {
+	constructor(client, options) {
+		super(client, {
+			...options,
+			emitter: client.modals,
+			event: 'error',
+		});
+	}
+
+	async run({
+		modal,
+		error,
+		interaction,
+	}) {
+		const ref = getSUID();
+		this.client.log.error.modals(ref);
+		this.client.log.error.modals(`"${modal.id}" modal execution error:`, error);
+		let locale = null;
+		if (interaction.guild) {
+			locale = (await this.client.prisma.guild.findUnique({
+				select: { locale: true },
+				where: { id: interaction.guild.id },
+			})).locale;
+		}
+		const getMessage = this.client.i18n.getLocale(locale);
+		const data = {
+			components: [],
+			embeds: [
+				new EmbedBuilder()
+					.setColor('Orange')
+					.setTitle(getMessage('misc.error.title'))
+					.setDescription(getMessage('misc.error.description'))
+					.addFields([
+						{
+							name: getMessage('misc.error.fields.identifier'),
+							value: codeBlock('             ' + ref + '             '),
+						},
+					]),
+			],
+		};
+
+		interaction.reply(data).catch(() => interaction.editReply(data));
+	}
+};