fix: gateway events

src/cache/index.ts

@@ -468,9 +468,11 @@ export class Cache {
 				break;
 			case 'GUILD_CREATE':
 			case 'GUILD_UPDATE':
+			case 'RAW_GUILD_CREATE':
 				await this.guilds?.patch(event.d.id, { unavailable: false, ...event.d });
 				break;
 			case 'GUILD_DELETE':
+			case 'RAW_GUILD_DELETE':
 				if (event.d.unavailable) {
 					await this.guilds?.patch(event.d.id, event.d);
 				} else {

src/client/client.ts

@@ -7,7 +7,6 @@ import {
 	type WatcherPayload,
 	type WatcherSendToShard,
 	assertString,
-	hasIntent,
 	lazyLoadPackage,
 } from '../common';
 import { EventHandler } from '../events';
@@ -23,7 +22,6 @@ import { type ClientUserStructure, type MessageStructure, Transformers } from '.
 let parentPort: import('node:worker_threads').MessagePort;
 
 export class Client<Ready extends boolean = boolean> extends BaseClient {
-	private __handleGuilds?: string[];
 	gateway!: ShardManager;
 	me!: If<Ready, ClientUserStructure>;
 	declare options: Omit<ClientOptions, 'commands'> & {
@@ -155,21 +153,6 @@ export class Client<Ready extends boolean = boolean> extends BaseClient {
 					await this.events.execute(packet, this as Client<true>, shardId);
 				}
 				break;
-			case 'GUILD_DELETE':
-			case 'GUILD_CREATE': {
-				if (this.__handleGuilds?.includes(packet.d.id)) {
-					this.__handleGuilds?.splice(this.__handleGuilds!.indexOf(packet.d.id), 1);
-					if (!this.__handleGuilds?.length && [...this.gateway.values()].every(shard => shard.data.session_id)) {
-						delete this.__handleGuilds;
-						await this.cache.onPacket(packet);
-						return this.events.runEvent('BOT_READY', this, this.me, -1);
-					}
-					if (!this.__handleGuilds?.length) delete this.__handleGuilds;
-					return this.cache.onPacket(packet);
-				}
-				await this.events.execute(packet, this as Client<true>, shardId);
-				break;
-			}
 			//rest of the events
 			default: {
 				switch (packet.t) {
@@ -186,23 +169,21 @@ export class Client<Ready extends boolean = boolean> extends BaseClient {
 						}
 						break;
 					case 'READY': {
-						const ids = packet.d.guilds.map(x => x.id);
-						if (hasIntent(this.gateway.options.intents, 'Guilds')) {
-							this.__handleGuilds = this.__handleGuilds?.concat(ids) ?? ids;
-						}
 						this.botId = packet.d.user.id;
 						this.applicationId = packet.d.application.id;
 						this.me = Transformers.ClientUser(this, packet.d.user, packet.d.application) as never;
-						if (!this.__handleGuilds?.length) {
-							if ([...this.gateway.values()].every(shard => shard.data.session_id)) {
-								await this.events.runEvent('BOT_READY', this, this.me, -1);
-							}
-							delete this.__handleGuilds;
-						}
 						this.debugger?.debug(`#${shardId}[${packet.d.user.username}](${this.botId}) is online...`);
 						await this.events.execute(packet, this as Client<true>, shardId);
 						break;
 					}
+					case 'GUILDS_READY':
+						{
+							await this.events.execute(packet, this as Client<true>, shardId);
+							if ([...this.gateway.values()].every(shard => shard.isReady)) {
+								await this.events.runEvent('BOT_READY', this, this.me, -1);
+							}
+						}
+						break;
 					default:
 						await this.events.execute(packet, this as Client<true>, shardId);
 						break;

src/client/workerclient.ts

@@ -1,7 +1,7 @@
 import { type UUID, randomUUID } from 'node:crypto';
 import { ApiHandler, Logger } from '..';
 import { WorkerAdapter } from '../cache';
-import { type DeepPartial, LogLevels, type MakeRequired, type When, hasIntent, lazyLoadPackage } from '../common';
+import { type DeepPartial, LogLevels, type MakeRequired, type When, lazyLoadPackage } from '../common';
 import { EventHandler } from '../events';
 import type { GatewayDispatchPayload, GatewaySendPayload } from '../types';
 import { Shard, type ShardManagerOptions, type WorkerData, properties } from '../websocket';
@@ -57,9 +57,6 @@ try {
 }
 
 export class WorkerClient<Ready extends boolean = boolean> extends BaseClient {
-	private __handleGuilds?: string[];
-	private __handleGuildsResharding?: string[];
-
 	memberUpdateHandler = new MemberUpdateHandler();
 	presenceUpdateHandler = new PresenceUpdateHandler();
 	collectors = new Collectors();
@@ -69,7 +66,6 @@ export class WorkerClient<Ready extends boolean = boolean> extends BaseClient {
 
 	shards = new Map<number, Shard>();
 	resharding = new Map<number, Shard>();
-	private _ready?: boolean;
 
 	declare options: WorkerClientOptions;
 
@@ -150,15 +146,12 @@ export class WorkerClient<Ready extends boolean = boolean> extends BaseClient {
 			type: workerData.resharding ? 'WORKER_START_RESHARDING' : 'WORKER_START',
 			workerId: workerData.workerId,
 		} satisfies WorkerStart | WorkerStartResharding);
-		if (workerData.resharding) {
-			this.__handleGuildsResharding = [];
-		}
 		await super.start(options);
 		await this.loadEvents(options.eventsDir);
 	}
 
 	async loadEvents(dir?: string) {
-		dir ??= await this.getRC().then(x => ('events' in x.locations ? x.locations.events : undefined));
+		dir ??= await this.getRC().then(x => x.locations.events);
 		if (dir) {
 			await this.events.load(dir);
 			this.logger.info('EventHandler loaded');
@@ -243,30 +236,9 @@ export class WorkerClient<Ready extends boolean = boolean> extends BaseClient {
 								...this.options.gateway?.properties,
 							},
 							handlePayload(_, payload) {
-								if (payload.t === 'GUILD_CREATE' || payload.t === 'GUILD_DELETE') {
-									const indexOf = self.__handleGuildsResharding!.indexOf(payload.d.id);
-									if (indexOf !== -1) {
-										self.__handleGuildsResharding!.splice(indexOf, 1);
-										if (!self.__handleGuildsResharding?.length && shardsConnected === workerData.shards.length) {
-											delete self.__handleGuildsResharding;
-											self.postMessage({
-												type: 'WORKER_READY_RESHARDING',
-												workerId: workerData.workerId,
-											} satisfies WorkerReadyResharding);
-										}
-									}
-								}
-
-								if (payload.t !== 'READY') return;
-								shardsConnected++;
-
-								const ids = payload.d.guilds.map(x => x.id);
-								if (hasIntent(workerData.intents, 'Guilds')) {
-									self.__handleGuildsResharding = self.__handleGuildsResharding?.concat(ids) ?? ids;
-								}
-
-								if (shardsConnected === workerData.shards.length && !self.__handleGuildsResharding?.length) {
-									delete self.__handleGuildsResharding;
+								if (payload.t === 'READY') {
+									shardsConnected++;
+								} else if (payload.t === 'GUILDS_READY' && shardsConnected === workerData.shards.length) {
 									self.postMessage({
 										type: 'WORKER_READY_RESHARDING',
 										workerId: workerData.workerId,
@@ -370,7 +342,6 @@ export class WorkerClient<Ready extends boolean = boolean> extends BaseClient {
 				break;
 			case 'WORKER_ALREADY_EXISTS_RESHARDING':
 				{
-					this.__handleGuildsResharding = [];
 					this.postMessage({
 						type: 'WORKER_START_RESHARDING',
 						workerId: workerData.workerId,
@@ -510,25 +481,6 @@ export class WorkerClient<Ready extends boolean = boolean> extends BaseClient {
 					await this.events.execute(packet, this as WorkerClient<true>, shardId);
 				}
 				break;
-			case 'GUILD_DELETE':
-			case 'GUILD_CREATE': {
-				if (this.__handleGuilds?.includes(packet.d.id)) {
-					this.__handleGuilds?.splice(this.__handleGuilds!.indexOf(packet.d.id), 1);
-					if (!this.__handleGuilds?.length && [...this.shards.values()].every(shard => shard.data.session_id)) {
-						delete this.__handleGuilds;
-						await this.cache.onPacket(packet);
-						this.postMessage({
-							type: 'WORKER_READY',
-							workerId: this.workerId,
-						} as WorkerReady);
-						return this.events.runEvent('WORKER_READY', this, this.me, -1);
-					}
-					if (!this.__handleGuilds?.length) delete this.__handleGuilds;
-					return this.cache.onPacket(packet);
-				}
-				await this.events.execute(packet, this, shardId);
-				break;
-			}
 			default: {
 				switch (packet.t) {
 					case 'INTERACTION_CREATE':
@@ -543,35 +495,31 @@ export class WorkerClient<Ready extends boolean = boolean> extends BaseClient {
 							await this.handleCommand.message(packet.d, shardId);
 						}
 						break;
-					case 'READY':
+					case 'READY': {
+						this.botId = packet.d.user.id;
+						this.applicationId = packet.d.application.id;
+						this.me = Transformers.ClientUser(this, packet.d.user, packet.d.application) as never;
+						if ([...this.shards.values()].every(shard => shard.data.session_id)) {
+							this.postMessage({
+								type: 'WORKER_SHARDS_CONNECTED',
+								workerId: this.workerId,
+							} as WorkerShardsConnected);
+							await this.events.runEvent('WORKER_SHARDS_CONNECTED', this, this.me, -1);
+						}
+						await this.events.execute(packet, this, shardId);
+						this.debugger?.debug(`#${shardId}[${packet.d.user.username}](${this.botId}) is online...`);
+						break;
+					}
+					case 'GUILDS_READY':
 						{
-							const ids = packet.d.guilds.map(x => x.id);
-							if (hasIntent(this.workerData.intents, 'Guilds')) {
-								this.__handleGuilds = this.__handleGuilds?.concat(ids) ?? ids;
-							}
-							this.botId = packet.d.user.id;
-							this.applicationId = packet.d.application.id;
-							this.me = Transformers.ClientUser(this, packet.d.user, packet.d.application) as never;
-							await this.events.execute(packet, this, shardId);
-							if (!this._ready && [...this.shards.values()].every(shard => shard.data.session_id)) {
-								this._ready = true;
+							if ([...this.shards.values()].every(shard => shard.isReady)) {
 								this.postMessage({
-									type: 'WORKER_SHARDS_CONNECTED',
+									type: 'WORKER_READY',
 									workerId: this.workerId,
-								} as WorkerShardsConnected);
-								await this.events.runEvent('WORKER_SHARDS_CONNECTED', this, this.me, -1);
+								} as WorkerReady);
+								await this.events.runEvent('WORKER_READY', this, this.me, -1);
 							}
-							if (!this.__handleGuilds?.length) {
-								if ([...this.shards.values()].every(shard => shard.data.session_id)) {
-									this.postMessage({
-										type: 'WORKER_READY',
-										workerId: this.workerId,
-									} as WorkerReady);
-									await this.events.runEvent('WORKER_READY', this, this.me, -1);
-								}
-								delete this.__handleGuilds;
-							}
-							this.debugger?.debug(`#${shardId}[${packet.d.user.username}](${this.botId}) is online...`);
+							await this.events.execute(packet, this, shardId);
 						}
 						break;
 					default:

src/common/shorters/guilds.ts

@@ -131,7 +131,7 @@ export class GuildShorter extends BaseShorter {
 				let channel: APIChannel | ReturnType<Channels['get']>;
 				if (!force) {
 					channel = await this.client.cache.channels?.get(channelId);
-					if (channel) return channel;
+					if (channel) return channel as ReturnType<typeof channelFrom>;
 				}
 
 				channel = await this.client.proxy.channels(channelId).get();

src/common/shorters/messages.ts

@@ -70,7 +70,12 @@ export class MessageShorter extends BaseShorter {
 			});
 	}
 
-	fetch(messageId: string, channelId: string) {
+	async fetch(messageId: string, channelId: string, force = false) {
+		if (!force) {
+			const message = await this.client.cache.messages?.get(messageId);
+			if (message) return message;
+		}
+
 		return this.client.proxy
 			.channels(channelId)
 			.messages(messageId)

src/events/hooks/custom.ts

@@ -1,5 +1,6 @@
-import type { ClientUserStructure } from '../../client/transformers';
+import { type ClientUserStructure, Transformers } from '../../client/transformers';
 import type { UsingClient } from '../../commands';
+import type { GatewayRawGuildCreateDispatch, GatewayRawGuildDeleteDispatch } from '../../types';
 
 export const BOT_READY = (_self: UsingClient, me: ClientUserStructure) => {
 	return me;
@@ -12,3 +13,15 @@ export const WORKER_READY = (_self: UsingClient, me: ClientUserStructure) => {
 export const WORKER_SHARDS_CONNECTED = (_self: UsingClient, me: ClientUserStructure) => {
 	return me;
 };
+
+export const RAW_GUILD_CREATE = (self: UsingClient, data: GatewayRawGuildCreateDispatch['d']) => {
+	return Transformers.Guild<'create'>(self, data);
+};
+
+export const RAW_GUILD_DELETE = async (self: UsingClient, data: GatewayRawGuildDeleteDispatch['d']) => {
+	return (await self.cache.guilds?.get(data.id)) ?? data;
+};
+
+export const GUILDS_READY = () => {
+	return;
+};

src/structures/Message.ts

@@ -125,8 +125,8 @@ export class Message extends BaseMessage {
 		super(client, data);
 	}
 
-	fetch() {
-		return this.client.messages.fetch(this.id, this.channelId);
+	fetch(force = false) {
+		return this.client.messages.fetch(this.id, this.channelId, force);
 	}
 
 	reply(body: Omit<MessageCreateBodyRequest, 'message_reference'>, fail = true) {

src/structures/channels.ts

@@ -271,7 +271,7 @@ export class MessagesMethods extends DiscordBase {
 			crosspost: (messageId: string, reason?: string) =>
 				ctx.client.messages.crosspost(messageId, ctx.channelId, reason),
 			delete: (messageId: string, reason?: string) => ctx.client.messages.delete(messageId, ctx.channelId, reason),
-			fetch: (messageId: string) => ctx.client.messages.fetch(messageId, ctx.channelId),
+			fetch: (messageId: string, force = false) => ctx.client.messages.fetch(messageId, ctx.channelId, force),
 			purge: (messages: string[], reason?: string) => ctx.client.messages.purge(messages, ctx.channelId, reason),
 			list: (fetchOptions: RESTGetAPIChannelMessagesQuery) => ctx.client.messages.list(ctx.channelId, fetchOptions),
 		};

src/types/gateway.ts

@@ -1,5 +1,6 @@
 // https://github.com/discordjs/discord-api-types/blob/main/gateway/v10.ts
 
+import type { OmitInsert } from '../common';
 import type { ChannelType, GatewayDispatchEvents, GatewayOpcodes, Snowflake } from './index';
 import type { GatewayPresenceUpdate } from './payloads/gateway';
 import type {
@@ -81,7 +82,10 @@ export type GatewayDispatchPayload =
 	| GatewayGuildAuditLogEntryCreateDispatch
 	| GatewayGuildBanModifyDispatch
 	| GatewayGuildCreateDispatch
+	| GatewayRawGuildCreateDispatch
 	| GatewayGuildDeleteDispatch
+	| GatewayRawGuildDeleteDispatch
+	| GatewayGuildsReadyDispatch
 	| GatewayGuildEmojisUpdateDispatch
 	| GatewayGuildIntegrationsUpdateDispatch
 	| GatewayGuildMemberAddDispatch
@@ -531,6 +535,12 @@ export type GatewayGuildModifyDispatchData = APIGuild;
  */
 export type GatewayGuildCreateDispatch = DataPayload<GatewayDispatchEvents.GuildCreate, GatewayGuildCreateDispatchData>;
 
+export type GatewayRawGuildCreateDispatch = OmitInsert<
+	GatewayGuildCreateDispatch,
+	't',
+	{ t: GatewayDispatchEvents.RawGuildCreate }
+>;
+
 /**
  * https://discord.com/developers/docs/topics/gateway-events#guild-create
  * https://discord.com/developers/docs/topics/gateway-events#guild-create-guild-create-extra-fields
@@ -639,6 +649,18 @@ export type GatewayGuildUpdateDispatchData = GatewayGuildModifyDispatchData;
  */
 export type GatewayGuildDeleteDispatch = DataPayload<GatewayDispatchEvents.GuildDelete, GatewayGuildDeleteDispatchData>;
 
+export type GatewayRawGuildDeleteDispatch = OmitInsert<
+	GatewayGuildDeleteDispatch,
+	't',
+	{ t: GatewayDispatchEvents.RawGuildDelete }
+>;
+
+export type GatewayGuildsReadyDispatch = OmitInsert<
+	GatewayReadyDispatch,
+	't' | 'd',
+	{ t: GatewayDispatchEvents.GuildsReady; d?: never }
+>;
+
 /**
  * https://discord.com/developers/docs/topics/gateway-events#guild-delete
  */

src/types/utils/index.ts

@@ -325,7 +325,10 @@ export enum GatewayDispatchEvents {
 	GuildBanAdd = 'GUILD_BAN_ADD',
 	GuildBanRemove = 'GUILD_BAN_REMOVE',
 	GuildCreate = 'GUILD_CREATE',
+	RawGuildCreate = 'RAW_GUILD_CREATE',
 	GuildDelete = 'GUILD_DELETE',
+	RawGuildDelete = 'RAW_GUILD_DELETE',
+	GuildsReady = 'GUILDS_READY',
 	GuildEmojisUpdate = 'GUILD_EMOJIS_UPDATE',
 	GuildIntegrationsUpdate = 'GUILD_INTEGRATIONS_UPDATE',
 	GuildMemberAdd = 'GUILD_MEMBER_ADD',