diff --git a/bot.ts b/bot.ts index 46dd19346..d89c29645 100644 --- a/bot.ts +++ b/bot.ts @@ -265,7 +265,6 @@ export function createEventHandlers( guildEmojisUpdate: events.guildEmojisUpdate ?? ignore, guildBanAdd: events.guildBanAdd ?? ignore, guildBanRemove: events.guildBanRemove ?? ignore, - guildLoaded: events.guildLoaded ?? ignore, guildCreate: events.guildCreate ?? ignore, guildDelete: events.guildDelete ?? ignore, guildUpdate: events.guildUpdate ?? ignore, @@ -727,7 +726,6 @@ export interface EventHandlers { ) => unknown; guildBanAdd: (bot: Bot, user: User, guildId: bigint) => unknown; guildBanRemove: (bot: Bot, user: User, guildId: bigint) => unknown; - guildLoaded: (bot: Bot, guild: Guild) => unknown; guildCreate: (bot: Bot, guild: Guild) => unknown; guildDelete: (bot: Bot, id: bigint, shardId: number) => unknown; guildUpdate: (bot: Bot, guild: Guild) => unknown; @@ -786,7 +784,6 @@ export interface BotGatewayHandlerOptions { GUILD_BAN_ADD: typeof handlers.handleGuildBanAdd; GUILD_BAN_REMOVE: typeof handlers.handleGuildBanRemove; GUILD_CREATE: typeof handlers.handleGuildCreate; - GUILD_LOADED_DD: typeof handlers.handleGuildLoaded; GUILD_DELETE: typeof handlers.handleGuildDelete; GUILD_EMOJIS_UPDATE: typeof handlers.handleGuildEmojisUpdate; GUILD_INTEGRATIONS_UPDATE: typeof handlers.handleGuildIntegrationsUpdate; @@ -828,7 +825,7 @@ export interface BotGatewayHandlerOptions { export function createBotGatewayHandlers( options: Partial, ): Record< - GatewayDispatchEventNames | "GUILD_LOADED_DD", + GatewayDispatchEventNames, (bot: Bot, data: DiscordGatewayPayload, shardId: number) => any > { return { @@ -856,7 +853,6 @@ export function createBotGatewayHandlers( GUILD_BAN_ADD: options.GUILD_BAN_ADD ?? handlers.handleGuildBanAdd, GUILD_BAN_REMOVE: options.GUILD_BAN_REMOVE ?? handlers.handleGuildBanRemove, GUILD_CREATE: options.GUILD_CREATE ?? handlers.handleGuildCreate, - GUILD_LOADED_DD: options.GUILD_LOADED_DD ?? handlers.handleGuildLoaded, GUILD_DELETE: options.GUILD_DELETE ?? handlers.handleGuildDelete, GUILD_EMOJIS_UPDATE: options.GUILD_EMOJIS_UPDATE ?? handlers.handleGuildEmojisUpdate, diff --git a/handlers/guilds/GUILD_LOADED_DD.ts b/handlers/guilds/GUILD_LOADED_DD.ts deleted file mode 100644 index 2ccb44dfb..000000000 --- a/handlers/guilds/GUILD_LOADED_DD.ts +++ /dev/null @@ -1,10 +0,0 @@ -import type { Bot } from "../../bot.ts"; -import type { Guild } from "../../transformers/guild.ts"; -import { DiscordGatewayPayload, DiscordGuild } from "../../types/discord.ts"; - -export function handleGuildLoaded(bot: Bot, data: DiscordGatewayPayload, shardId: number) { - const payload = data.d as DiscordGuild; - - const guild = bot.transformers.guild(bot, { guild: payload, shardId }); - bot.events.guildLoaded(bot, guild as Guild); -} diff --git a/handlers/guilds/mod.ts b/handlers/guilds/mod.ts index 3437a0509..354f21794 100644 --- a/handlers/guilds/mod.ts +++ b/handlers/guilds/mod.ts @@ -5,5 +5,4 @@ export * from "./GUILD_BAN_REMOVE.ts"; export * from "./GUILD_CREATE.ts"; export * from "./GUILD_DELETE.ts"; export * from "./GUILD_INTEGRATIONS_UPDATE.ts"; -export * from "./GUILD_LOADED_DD.ts"; export * from "./GUILD_UPDATE.ts"; diff --git a/template/bigbot/src/bot/events/raw.ts b/template/bigbot/src/bot/events/raw.ts index 0e3afbfd1..9e5632aa3 100644 --- a/template/bigbot/src/bot/events/raw.ts +++ b/template/bigbot/src/bot/events/raw.ts @@ -23,7 +23,7 @@ export function setRawEvent() { ); // The GUILD_CREATE event came from a shard loaded event so ignore it - if (["READY", "GUILD_LOADED_DD", "GUILD_CREATE", null].includes(data.t)) return; + if (["READY", "GUILD_CREATE", null].includes(data.t)) return; // console.log({ id, v: await usesLatestCommandVersion(id) }) diff --git a/template/bigbot/src/bot/index.ts b/template/bigbot/src/bot/index.ts index d47e3953a..1ec6e0562 100644 --- a/template/bigbot/src/bot/index.ts +++ b/template/bigbot/src/bot/index.ts @@ -115,7 +115,7 @@ async function handleRequest(req: express.Request, res: express.Response) { if (json.data.t && json.data.t !== "RESUMED") { // When a guild or something isnt in cache this will fetch it before doing anything else - if (!["READY", "GUILD_LOADED_DD"].includes(json.data.t)) { + if (json.data.t !== "READY") { await bot.events.dispatchRequirements(bot, json.data, json.shardId); } diff --git a/types/shared.ts b/types/shared.ts index d2cfef2f4..0627b16cb 100644 --- a/types/shared.ts +++ b/types/shared.ts @@ -1083,9 +1083,7 @@ export type GatewayDispatchEventNames = export type GatewayEventNames = | GatewayDispatchEventNames | "READY" - | "RESUMED" - // THIS IS A CUSTOM DD EVENT NOT A DISCORD EVENT - | "GUILD_LOADED_DD"; + | "RESUMED"; /** https://discord.com/developers/docs/topics/gateway#list-of-intents */ export enum GatewayIntents {