From f4ed3141722719f26ac2286d57a92b1031accaf3 Mon Sep 17 00:00:00 2001
From: IRONM00N <64110067+IRONM00N@users.noreply.github.com>
Date: Thu, 5 Aug 2021 18:26:55 -0400
Subject: a few fixes and stuff

---
 src/lib/extensions/discord-akairo/BushClient.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/lib/extensions/discord-akairo')

diff --git a/src/lib/extensions/discord-akairo/BushClient.ts b/src/lib/extensions/discord-akairo/BushClient.ts
index 8de630f..5b9ac1b 100644
--- a/src/lib/extensions/discord-akairo/BushClient.ts
+++ b/src/lib/extensions/discord-akairo/BushClient.ts
@@ -15,7 +15,9 @@ import {
 	Structures,
 	WebhookEditMessageOptions
 } from 'discord.js';
-import * as path from 'path';
+import JSON5 from 'json5';
+import 'json5/lib/register';
+import path from 'path';
 import { exit } from 'process';
 import readline from 'readline';
 import { Sequelize } from 'sequelize';
@@ -100,6 +102,8 @@ type If<T extends boolean, A, B = null> = T extends true ? A : T extends false ?
 
 export class BushClient<Ready extends boolean = boolean> extends AkairoClient<Ready> {
 	public static preStart(): void {
+		global.JSON5 = JSON5;
+
 		Structures.extend('GuildEmoji', () => BushGuildEmoji);
 		Structures.extend('DMChannel', () => BushDMChannel);
 		Structures.extend('TextChannel', () => BushTextChannel);
@@ -180,6 +184,7 @@ export class BushClient<Ready extends boolean = boolean> extends AkairoClient<Re
 			directory: path.join(__dirname, '..', '..', '..', 'commands'),
 			prefix: async ({ guild }: { guild: Guild }) => {
 				if (this.config.isDevelopment) return 'dev ';
+				if (!guild) return this.config.prefix;
 				const row = await GuildModel.findByPk(guild.id);
 				return (row?.prefix ?? this.config.prefix) as string;
 			},
-- 
cgit