cleaned up

2 files changed, 28 insertions, 16 deletions

diff --git a/src/listeners/other/consoleListener.ts b/src/listeners/other/consoleListener.ts
index 98f44e2..b3d30ad 100644
--- a/src/listeners/other/consoleListener.ts
+++ b/src/listeners/other/consoleListener.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { BushListener } from '../../lib/extensions/discord-akairo/BushListener';
 
@@ -10,26 +11,37 @@ export default class ConsoleListener extends BushListener {
 	}
 
 	public async exec(line: string): Promise<void> {
-		const bot = this.client;
-		if (line.startsWith('eval ')) {
+		if (line.startsWith('eval ') || line.startsWith('ev ')) {
+			const bot = this.client,
+				config = this.client.config,
+				client = this.client,
+				{ Ban, Global, Guild, Level, ModLog, StickyRole } = await import('../../lib/models/index.js'),
+				{
+					ButtonInteraction,
+					Collector,
+					CommandInteraction,
+					Interaction,
+					Message,
+					MessageActionRow,
+					MessageAttachment,
+					MessageButton,
+					MessageCollector,
+					MessageComponentInteractionCollector,
+					MessageEmbed,
+					MessageSelectMenu,
+					ReactionCollector,
+					Util
+				} = require('discord.js');
 			try {
-				const input = line.replace('eval ', '');
+				const input = line.replace('eval ', '').replace('ev ', '');
 				let output = eval(input);
 				output = await output;
 				console.log(output);
 			} catch (e) {
-				console.error(e);
-			}
-		}
-		if (line.startsWith('ev ')) {
-			try {
-				const input = line.replace('ev ', '');
-				let output = eval(input);
-				output = await output;
-				console.log(output);
-			} catch (e) {
-				console.error(e);
+				console.error(e?.stack || e);
 			}
+		} else if (line.startsWith('stop')) {
+			process.exit(0);
 		}
 	}
 }
diff --git a/src/listeners/other/promiseRejection.ts b/src/listeners/other/promiseRejection.ts
index 06a8e1e..228c65d 100644
--- a/src/listeners/other/promiseRejection.ts
+++ b/src/listeners/other/promiseRejection.ts
@@ -9,12 +9,12 @@ export default class PromiseRejectionListener extends BushListener {
 	}
 
 	public async exec(error: Error): Promise<void> {
-		this.client.console.error('PromiseRejection', 'An unhanded promise rejection occurred:\n' + error.stack, false);
+		this.client.console.error('PromiseRejection', `An unhanded promise rejection occurred:\n${error?.stack || error}`, false);
 		this.client.console.channelError({
 			embeds: [
 				{
 					title: 'Unhandled promise rejection',
-					fields: [{ name: 'error', value: await this.client.util.codeblock(error.stack, 1024, 'js') }],
+					fields: [{ name: 'error', value: await this.client.util.codeblock(`${error?.stack || error}`, 1024, 'js') }],
 					color: this.client.util.colors.error
 				}
 			]