cache custom clients

AyakoBot · Aug 28, 2024 · 8ff8c5f · 8ff8c5f
1 parent 072cd96
commit 8ff8c5f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/src/BaseClient/UtilModules/cache.ts b/src/BaseClient/UtilModules/cache.ts
@@ -74,6 +74,7 @@ const cache: {
  gifs: typeof gifs;
  latelySavedUsers: Map<string, number>;
  hasFetchedAllMembers: Set<string>;
+ customClients: Map<string, string>;
 
  // URLs
  urlTLDs: UrlTLDs;
@@ -104,6 +105,7 @@ const cache: {
  commandPermissions,
  interactedGuilds: new Set(),
  interactedChannels: new Set(),
+ customClients: new Map(),
 
  // Cache
  giveawayClaimTimeout,

diff --git a/src/BaseClient/UtilModules/getBotIdFrom.ts b/src/BaseClient/UtilModules/getBotIdFrom.ts
@@ -1,5 +1,6 @@
 import * as Discord from 'discord.js';
 import DataBase from '../Bot/DataBase.js';
+import cache from './cache.js';
 
 /**
  * Extracts the bot ID from a Discord bot token.
@@ -20,12 +21,19 @@ export const guild = async (g: Discord.Guild) => {
   return client.user!.id;
  }
 
+ if (cache.customClients.get(g.id)) return cache.customClients.get(g.id)!;
+
  const settings = await DataBase.customclients.findUnique({
   where: { guildid: g.id, token: { not: null } },
   select: { token: true },
  });
- if (!settings) return g.client.user.id;
- if (!settings.token) return g.client.user.id;
+ if (!settings || !settings.token) {
+  cache.customClients.set(g.id, g.client.user.id);
+  return g.client.user.id;
+ }
+
+ const id = token(settings.token);
+ cache.customClients.set(g.id, id);
 
- return token(settings.token) ?? g.client.user.id;
+ return id;
 };
diff --git a/src/Commands/SlashCommands/settings/custom-client.ts b/src/Commands/SlashCommands/settings/custom-client.ts
@@ -136,6 +136,7 @@ export const postChange: CT.SettingsFile<typeof name>['postChange'] = async (
 };
 
 const tokenDelete = (guild: Discord.Guild) => {
+ client.util.cache.customClients.delete(guild.id);
  client.util.cache.apis.delete(guild.id);
  client.util.DataBase.customclients
   .update({
@@ -161,9 +162,9 @@ const tokenCreate = async (
  updateApp(guild);
  if (!meIsValid(guild, me)) return;
 
-
  sendWebhookRequest(guild, me.id);
  doCommands(guild, me);
+ guild.client.util.cache.customClients.delete(guild.id);
 };
 
 const updateApp = (guild: Discord.Guild) => {

diff --git a/src/Events/BotEvents/guildEvents/guildDelete/cache.ts b/src/Events/BotEvents/guildEvents/guildDelete/cache.ts
@@ -58,6 +58,7 @@ export default (guild: Discord.Guild) => {
  cache.deleteSuggestions.cache.delete(guild.id);
  cache.vcDeleteTimeout.cache.get(guild.id)?.forEach((i) => i?.cancel());
  cache.vcDeleteTimeout.cache.delete(guild.id);
+ cache.customClients.delete(guild.id);
 
  const { DataBase } = guild.client.util;
  DataBase.guilds.delete({ where: { guildid: guild.id } }).then();