[PATCH] Help fix

example.env

@@ -4,7 +4,6 @@ DBToken=""     # https://discord.bots.gg/ Access Token
 DBListToken="" # https://discordbotlist.com Access Token
 
 # Internals
-postgresToken="" # PostgreSQL DataBase Token
 socketToken=""   # WebSocket Token
 DATABASE_URL=""  # DataBase Connection String
 Token=""         # Bot Token

package.json

@@ -1,11 +1,12 @@
 {
  "type": "module",
- "version": "2.0.14",
+ "version": "2.0.15",
  "scripts": {
   "start": "node --max-old-space-size=8192 ./dist/index.js",
   "build": "npx tsc",
-  "dev": "node --enable-source-maps ./dist/bot.js --debug --warn",
-  "lint": "npx eslint 'src/**/*.ts' --fix"
+  "dev": "node --enable-source-maps --experimental-wasm-modules ./dist/bot.js --debug --warn",
+  "lint": "npx eslint 'src/**/*.ts' --fix",
+  "postinstall": "mkdir ./logs"
  },
  "dependencies": {
   "@discordjs/core": "^1.1.1",

src/BaseClient/ClientHelperModules/helpHelpers.ts

@@ -1,10 +1,9 @@
 import * as Discord from 'discord.js';
-import * as CT from '../../Typings/Typings.js';
 import SlashCommands from '../../Events/readyEvents/startupTasks/SlashCommands.js';
-import replyCmd from './replyCmd.js';
+import * as CT from '../../Typings/Typings.js';
 import getLanguage from './getLanguage.js';
-
 import getEmbeds from './helpHelpers/getEmbeds.js';
+import replyCmd from './replyCmd.js';
 
 /**
  * Helper function to generate a message payload for a slash command

src/BaseClient/ClientHelperModules/requestHandler/commands/getGlobalCommands.ts

@@ -11,23 +11,27 @@ import error from '../../error.js';
  * @param query - Optional query parameters to filter the commands.
  * @returns A Promise that resolves to an array of parsed ApplicationCommand objects.
  */
-export default async (guild: Discord.Guild, query?: Discord.RESTGetAPIApplicationCommandsQuery) =>
- (cache.apis.get(guild.id) ?? API).applicationCommands
-  .getGlobalCommands(await getBotIdFromGuild(guild), query)
+export default async (
+ guild: Discord.Guild | undefined,
+ client: Discord.Client<true>,
+ query?: Discord.RESTGetAPIApplicationCommandsQuery,
+) =>
+ (guild ? cache.apis.get(guild.id) ?? API : API).applicationCommands
+  .getGlobalCommands(guild ? await getBotIdFromGuild(guild) : client.user.id, query)
   .then((cmds) => {
-   const parsed = cmds.map((cmd) => new Classes.ApplicationCommand(guild.client, cmd));
+   const parsed = cmds.map((cmd) => new Classes.ApplicationCommand(client, cmd));
 
-   if (!cache.commands.cache.get(guild.id)) cache.commands.cache.set(guild.id, new Map());
+   if (guild && !cache.commands.cache.get(guild.id)) cache.commands.cache.set(guild.id, new Map());
    parsed.forEach((p) => {
-    cache.commands.cache.get(guild.id)?.set(p.id, p);
+    if (guild) cache.commands.cache.get(guild.id)?.set(p.id, p);
 
-    if (cache.apis.get(guild.id)) return;
-    if (guild.client.application.commands.cache.get(p.id)) return;
-    guild.client.application.commands.cache.set(p.id, p);
+    if (guild && cache.apis.get(guild.id)) return;
+    if (client.application.commands.cache.get(p.id)) return;
+    client.application.commands.cache.set(p.id, p);
    });
    return parsed;
   })
   .catch((e) => {
-   error(guild, new Error((e as Discord.DiscordAPIError).message));
+   if (guild) error(guild, new Error((e as Discord.DiscordAPIError).message));
    return e as Discord.DiscordAPIError;
   });

src/Events/guildEvents/guildDelete/log.ts

@@ -1,28 +1,35 @@
 import type * as Discord from 'discord.js';
 import client from '../../../BaseClient/Client.js';
 import * as CT from '../../../Typings/Typings.js';
+import * as ch from '../../../BaseClient/ClientHelper.js';
 
 export default async (guild: Discord.Guild | undefined) => {
  const webhook = await client.fetchWebhook(
   process.env.guildActionWebhookID ?? '',
   process.env.guildActionWebhookToken ?? '',
  );
 
+ const totalguildcount =
+  ((await client.shard?.fetchClientValues('guilds.cache.size')) as number[] | undefined)?.reduce(
+   (acc, count) => acc + count,
+   0,
+  ) ?? 0;
+
  webhook?.send({
   embeds: [
    {
     color: CT.Colors.Danger,
     description: '<@&669894051851403294> joined a new Guild',
     fields: [
-     {
-      name: 'Guild Name',
-      value: guild?.name || 'Unknown/Uncached',
-     },
-     { name: 'Guild ID', value: String(guild?.id) || 'Unknown/Uncached' },
-     { name: 'Membercount', value: String(guild?.memberCount) || 'Unknown/Uncached' },
-     { name: 'Guild Owner ID', value: String(guild?.ownerId) || 'Unknown/Uncached' },
+     { name: 'Guild Name', value: guild?.name || 'Unknown/Uncached', inline: true },
+     { name: 'Guild ID', value: String(guild?.id) || 'Unknown/Uncached', inline: true },
+     { name: 'Membercount', value: String(guild?.memberCount) || 'Unknown/Uncached', inline: true },
+     { name: 'Guild Owner ID', value: String(guild?.ownerId) || 'Unknown/Uncached', inline: true },
     ],
     timestamp: new Date().toISOString(),
+    footer: {
+     text: `Total Guilds: ${ch.splitByThousand(totalguildcount)}`,
+    },
    },
   ],
  });

src/Events/readyEvents/startupTasks.ts

@@ -19,13 +19,14 @@ import verification from './timedFiles/verification.js';
 import websiteFetcher from './timedFiles/websiteFetcher.js';
 
 export default async () => {
- customAPIsHandler();
+ await slashCommandInitializer();
+
+ await customAPIsHandler();
  customBotCommands();
 
  voteHandler();
  appealHandler();
  interactionHandler();
- slashCommandInitializer();
  antivirusBlocklistCacher();
  nitroHandler();
  separators();

src/Events/readyEvents/startupTasks/customBotCommands.ts

@@ -1,45 +1,31 @@
+import * as Discord from 'discord.js';
 import client from '../../../BaseClient/Client.js';
 import * as ch from '../../../BaseClient/ClientHelper.js';
 
 export default async () => {
- if (client.shard?.mode === 'process') return;
-
- const settings = await ch.DataBase.guildsettings.findMany({
-  where: {
-   token: { not: null },
-  },
- });
-
- settings.forEach(async (s) => {
-  if (!s.token) return;
-
-  const guild = client.guilds.cache.get(s.guildid);
-  if (!guild) return;
+ ch.request.commands.getGlobalCommands(undefined, client as Discord.Client<true>);
 
+ client.guilds.cache.forEach((g) => {
   const globalCommands = async () => {
-   if (!s.token) return;
-
-   const commands = await ch.request.commands.getGlobalCommands(guild);
+   const commands = await ch.request.commands.getGlobalCommands(g, client as Discord.Client<true>);
 
    if ('message' in commands) {
-    ch.error(guild, new Error(commands.message));
+    ch.error(g, new Error(commands.message));
     return;
    }
 
-   commands.forEach((c) => ch.cache.commands.set(guild.id, c.id, c));
+   commands.forEach((c) => ch.cache.commands.set(g.id, c.id, c));
   };
 
   const guildCommands = async () => {
-   if (!s.token) return;
-
-   const commands = await ch.request.commands.getGuildCommands(guild);
+   const commands = await ch.request.commands.getGuildCommands(g);
 
    if ('message' in commands) {
-    ch.error(guild, new Error(commands.message));
+    ch.error(g, new Error(commands.message));
     return;
    }
 
-   commands.forEach((c) => ch.cache.commands.set(guild.id, c.id, c));
+   commands.forEach((c) => ch.cache.commands.set(g.id, c.id, c));
   };
 
   globalCommands();

src/Events/readyEvents/startupTasks/slashCommandInitializer.ts

@@ -10,8 +10,8 @@ export default async () => {
  await client.application?.commands.set(createCommands);
  await client.application?.commands.fetch();
 
- mainBotCommands(createCommands);
- customBotCommands(createCommands);
+ await mainBotCommands(createCommands);
+ await customBotCommands(createCommands);
 };
 
 type ValueOf<T> = T[keyof T];

src/index.ts

@@ -16,15 +16,13 @@ sms.install({
 
 console.clear();
 log(
- `
-+++++++++++++++ Welcome to Ayako ++++++++++++++++
+ `+++++++++++++++ Welcome to Ayako ++++++++++++++++
 +       Restart all Shards with "restart"       +
 +   Restart one Shard with "restart [Shard ID]" +
 +                   Arguments:                  +
 +   --debug --debug-db --warn --debug-queries   +
 +           --silent --put-commands             +
-+++++++++++++++++++++++++++++++++++++++++++++++++
-`,
++++++++++++++++++++++++++++++++++++++++++++++++++`,
  true,
 );
 
@@ -33,7 +31,7 @@ const manager = new Discord.ShardingManager(
  {
   token: process.env.Token,
   shardArgs: process.argv,
-  execArgv: ['--experimental-wasm-modules', '--experimental-websocket'],
+  execArgv: ['--experimental-wasm-modules'],
  },
 );