change some stuff

3 files changed, 8 insertions, 3 deletions

diff --git a/src/lib/extensions/discord-akairo/BushClientUtil.ts b/src/lib/extensions/discord-akairo/BushClientUtil.ts
index 1924de8..0e3a904 100644
--- a/src/lib/extensions/discord-akairo/BushClientUtil.ts
+++ b/src/lib/extensions/discord-akairo/BushClientUtil.ts
@@ -542,7 +542,7 @@ export class BushClientUtil extends ClientUtil {
 			if (!array.includes(action)) array.push(value);
 			newValue = array;
 		} else {
-			newValue = array.filter((ae) => ae !== value);
+			newValue = Array.from(array).filter((ae) => ae !== value);
 		}
 		return newValue;
 	}
diff --git a/src/lib/extensions/discord.js/BushGuild.ts b/src/lib/extensions/discord.js/BushGuild.ts
index f695f8b..e5eff21 100644
--- a/src/lib/extensions/discord.js/BushGuild.ts
+++ b/src/lib/extensions/discord.js/BushGuild.ts
@@ -12,12 +12,14 @@ export class BushGuild extends Guild {
 	}
 
 	public async getSetting<K extends keyof GuildModel>(setting: K): Promise<GuildModel[K]> {
-		return ((await GuildDB.findByPk(this.id)) ?? GuildDB.build({ id: this.id }))[setting];
+		return this.client.cache.guilds.get(this.id)?.[setting] ?? ((await GuildDB.findByPk(this.id)) ?? GuildDB.build({ id: this.id }))[setting];
 	}
 
 	public async setSetting<K extends keyof GuildModel>(setting: K, value: GuildDB[K]): Promise<GuildDB> {
 		const row = (await GuildDB.findByPk(this.id)) ?? GuildDB.build({ id: this.id });
 		row[setting] = value;
+		//@ts-ignore: idk why it thinks it doesn't exist
+		this.client.cache.guilds.set(this.id, row.dataValues)
 		return await row.save();
 	}
 
diff --git a/src/lib/utils/BushCache.ts b/src/lib/utils/BushCache.ts
index ffef470..e4eaf55 100644
--- a/src/lib/utils/BushCache.ts
+++ b/src/lib/utils/BushCache.ts
@@ -1,4 +1,5 @@
-import { Snowflake } from 'discord.js';
+import { Collection, Snowflake } from 'discord.js';
+import { Guild } from '../models/Guild';
 
 class GlobalCache {
 	public static superUsers = new Array<Snowflake>();
@@ -8,6 +9,8 @@ class GlobalCache {
 	public static blacklistedUsers = new Array<Snowflake>();
 }
 
+
 export class BushCache {
 	public static global = GlobalCache;
+	public static guilds = new Collection<Snowflake, Guild>()
 }