seyfert 2.1.1-dev-12261178806.0 → 2.1.1-dev-12309212345.0

package/lib/cache/index.js

@@ -321,9 +321,11 @@ 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);
                 }

package/lib/client/client.d.ts

@@ -10,7 +10,6 @@ import { BaseClient } from './base';
 import { Collectors } from './collectors';
 import { type ClientUserStructure, type MessageStructure } from './transformers';
 export declare class Client<Ready extends boolean = boolean> extends BaseClient {
-    private __handleGuilds?;
     gateway: ShardManager;
     me: If<Ready, ClientUserStructure>;
     options: Omit<ClientOptions, 'commands'> & {

package/lib/client/client.js

@@ -11,7 +11,6 @@ const collectors_1 = require("./collectors");
 const transformers_1 = require("./transformers");
 let parentPort;
 class Client extends base_1.BaseClient {
-    __handleGuilds;
     gateway;
     me;
     memberUpdateHandler = new memberUpdate_1.MemberUpdateHandler();
@@ -125,22 +124,6 @@ class Client extends base_1.BaseClient {
                     await this.events.execute(packet, this, 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, shardId);
-                break;
-            }
             //rest of the events
             default: {
                 switch (packet.t) {
@@ -157,23 +140,21 @@ class Client extends base_1.BaseClient {
                         }
                         break;
                     case 'READY': {
-                        const ids = packet.d.guilds.map(x => x.id);
-                        if ((0, common_1.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_1.Transformers.ClientUser(this, packet.d.user, packet.d.application);
-                        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, shardId);
                         break;
                     }
+                    case 'GUILDS_READY':
+                        {
+                            await this.events.execute(packet, this, 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, shardId);
                         break;

package/lib/client/workerclient.d.ts

@@ -13,8 +13,6 @@ import type { ShardData } from '../websocket/discord/shared';
 import { Collectors } from './collectors';
 import { type ClientUserStructure } from './transformers';
 export declare class WorkerClient<Ready extends boolean = boolean> extends BaseClient {
-    private __handleGuilds?;
-    private __handleGuildsResharding?;
     memberUpdateHandler: MemberUpdateHandler;
     presenceUpdateHandler: PresenceUpdateHandler;
     collectors: Collectors;
@@ -26,7 +24,6 @@ export declare class WorkerClient<Ready extends boolean = boolean> extends BaseC
     }>;
     shards: Map<number, Shard>;
     resharding: Map<number, Shard>;
-    private _ready?;
     options: WorkerClientOptions;
     constructor(options?: WorkerClientOptions);
     get workerId(): number;

package/lib/client/workerclient.js

@@ -36,8 +36,6 @@ catch {
     //
 }
 class WorkerClient extends base_1.BaseClient {
-    __handleGuilds;
-    __handleGuildsResharding;
     memberUpdateHandler = new memberUpdate_1.MemberUpdateHandler();
     presenceUpdateHandler = new presenceUpdate_1.PresenceUpdateHandler();
     collectors = new collectors_1.Collectors();
@@ -46,7 +44,6 @@ class WorkerClient extends base_1.BaseClient {
     promises = new Map();
     shards = new Map();
     resharding = new Map();
-    _ready;
     constructor(options) {
         super(options);
         if (options?.postMessage) {
@@ -111,14 +108,11 @@ class WorkerClient extends base_1.BaseClient {
             type: workerData.resharding ? 'WORKER_START_RESHARDING' : 'WORKER_START',
             workerId: workerData.workerId,
         });
-        if (workerData.resharding) {
-            this.__handleGuildsResharding = [];
-        }
         await super.start(options);
         await this.loadEvents(options.eventsDir);
     }
     async loadEvents(dir) {
-        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');
@@ -199,28 +193,10 @@ class WorkerClient extends base_1.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,
-                                            });
-                                        }
-                                    }
-                                }
-                                if (payload.t !== 'READY')
-                                    return;
-                                shardsConnected++;
-                                const ids = payload.d.guilds.map(x => x.id);
-                                if ((0, common_1.hasIntent)(workerData.intents, 'Guilds')) {
-                                    self.__handleGuildsResharding = self.__handleGuildsResharding?.concat(ids) ?? ids;
+                                if (payload.t === 'READY') {
+                                    shardsConnected++;
                                 }
-                                if (shardsConnected === workerData.shards.length && !self.__handleGuildsResharding?.length) {
-                                    delete self.__handleGuildsResharding;
+                                else if (payload.t === 'GUILDS_READY' && shardsConnected === workerData.shards.length) {
                                     self.postMessage({
                                         type: 'WORKER_READY_RESHARDING',
                                         workerId: workerData.workerId,
@@ -326,7 +302,6 @@ class WorkerClient extends base_1.BaseClient {
                 break;
             case 'WORKER_ALREADY_EXISTS_RESHARDING':
                 {
-                    this.__handleGuildsResharding = [];
                     this.postMessage({
                         type: 'WORKER_START_RESHARDING',
                         workerId: workerData.workerId,
@@ -460,26 +435,6 @@ class WorkerClient extends base_1.BaseClient {
                     await this.events.execute(packet, this, 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,
-                        });
-                        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':
@@ -494,35 +449,31 @@ class WorkerClient extends base_1.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_1.Transformers.ClientUser(this, packet.d.user, packet.d.application);
+                        if ([...this.shards.values()].every(shard => shard.data.session_id)) {
+                            this.postMessage({
+                                type: 'WORKER_SHARDS_CONNECTED',
+                                workerId: this.workerId,
+                            });
+                            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 ((0, common_1.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_1.Transformers.ClientUser(this, packet.d.user, packet.d.application);
-                            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,
                                 });
-                                await this.events.runEvent('WORKER_SHARDS_CONNECTED', this, this.me, -1);
+                                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,
-                                    });
-                                    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:

package/lib/common/shorters/guilds.d.ts

@@ -1,5 +1,5 @@
 import { type GuildStructure } from '../../client/transformers';
-import { BaseChannel, type CreateStickerBodyRequest, Guild, GuildMember } from '../../structures';
+import { type CreateStickerBodyRequest, Guild, GuildMember } from '../../structures';
 import type { GuildWidgetStyle, RESTGetAPICurrentUserGuildsQuery, RESTPatchAPIAutoModerationRuleJSONBody, RESTPatchAPIChannelJSONBody, RESTPatchAPIGuildChannelPositionsJSONBody, RESTPatchAPIGuildJSONBody, RESTPatchAPIGuildStickerJSONBody, RESTPostAPIAutoModerationRuleJSONBody, RESTPostAPIGuildChannelJSONBody, RESTPostAPIGuildsJSONBody } from '../../types';
 import { BaseShorter } from './base';
 export declare class GuildShorter extends BaseShorter {
@@ -46,7 +46,7 @@ export declare class GuildShorter extends BaseShorter {
          * @param force Whether to force fetching the channel from the API even if it exists in the cache.
          * @returns A Promise that resolves to the fetched channel.
          */
-        fetch: (guildId: string, channelId: string, force?: boolean) => Promise<import("../../types").APIGuildCategoryChannel | import("../../types").APIGuildStageVoiceChannel | import("../../types").APIGuildVoiceChannel | import("../../types").APINewsChannel | import("../../types").APITextChannel | BaseChannel<import("../../types").ChannelType> | import("../../structures").DMChannel | import("../../structures").CategoryChannel>;
+        fetch: (guildId: string, channelId: string, force?: boolean) => Promise<import("../../structures").AllChannels>;
         /**
          * Creates a new channel in the guild.
          * @param guildId The ID of the guild.

package/lib/common/shorters/messages.d.ts

@@ -7,7 +7,7 @@ export declare class MessageShorter extends BaseShorter {
     edit(messageId: string, channelId: string, { files, ...body }: MessageUpdateBodyRequest): Promise<import("../../structures").Message>;
     crosspost(messageId: string, channelId: string, reason?: string): Promise<import("../../structures").Message>;
     delete(messageId: string, channelId: string, reason?: string): Promise<void>;
-    fetch(messageId: string, channelId: string): Promise<import("../../structures").Message>;
+    fetch(messageId: string, channelId: string, force?: boolean): Promise<import("../../structures").Message>;
     purge(messages: string[], channelId: string, reason?: string): Promise<void | undefined>;
     thread(channelId: string, messageId: string, options: RESTPostAPIChannelMessagesThreadsJSONBody & {
         reason?: string;

package/lib/common/shorters/messages.js

@@ -54,7 +54,12 @@ class MessageShorter extends base_1.BaseShorter {
             this.client.components.deleteValue(messageId, 'messageDelete');
         });
     }
-    fetch(messageId, channelId) {
+    async fetch(messageId, channelId, 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)

package/lib/events/hooks/custom.d.ts

@@ -1,5 +1,9 @@
-import type { ClientUserStructure } from '../../client/transformers';
+import { type ClientUserStructure } from '../../client/transformers';
 import type { UsingClient } from '../../commands';
+import type { GatewayRawGuildCreateDispatch, GatewayRawGuildDeleteDispatch } from '../../types';
 export declare const BOT_READY: (_self: UsingClient, me: ClientUserStructure) => import("../..").ClientUser;
 export declare const WORKER_READY: (_self: UsingClient, me: ClientUserStructure) => import("../..").ClientUser;
 export declare const WORKER_SHARDS_CONNECTED: (_self: UsingClient, me: ClientUserStructure) => import("../..").ClientUser;
+export declare const RAW_GUILD_CREATE: (self: UsingClient, data: GatewayRawGuildCreateDispatch["d"]) => import("../..").Guild<"create">;
+export declare const RAW_GUILD_DELETE: (self: UsingClient, data: GatewayRawGuildDeleteDispatch["d"]) => Promise<import("../../types").APIUnavailableGuild | import("../..").Guild<"cached">>;
+export declare const GUILDS_READY: () => void;

package/lib/events/hooks/custom.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WORKER_SHARDS_CONNECTED = exports.WORKER_READY = exports.BOT_READY = void 0;
+exports.GUILDS_READY = exports.RAW_GUILD_DELETE = exports.RAW_GUILD_CREATE = exports.WORKER_SHARDS_CONNECTED = exports.WORKER_READY = exports.BOT_READY = void 0;
+const transformers_1 = require("../../client/transformers");
 const BOT_READY = (_self, me) => {
     return me;
 };
@@ -13,3 +14,15 @@ const WORKER_SHARDS_CONNECTED = (_self, me) => {
     return me;
 };
 exports.WORKER_SHARDS_CONNECTED = WORKER_SHARDS_CONNECTED;
+const RAW_GUILD_CREATE = (self, data) => {
+    return transformers_1.Transformers.Guild(self, data);
+};
+exports.RAW_GUILD_CREATE = RAW_GUILD_CREATE;
+const RAW_GUILD_DELETE = async (self, data) => {
+    return (await self.cache.guilds?.get(data.id)) ?? data;
+};
+exports.RAW_GUILD_DELETE = RAW_GUILD_DELETE;
+const GUILDS_READY = () => {
+    return;
+};
+exports.GUILDS_READY = GUILDS_READY;

package/lib/structures/Guild.d.ts

@@ -8,7 +8,6 @@ import { GuildMember } from './GuildMember';
 import { GuildRole } from './GuildRole';
 import { GuildTemplate } from './GuildTemplate';
 import { Sticker } from './Sticker';
-import { BaseChannel } from './channels';
 import { BaseGuild } from './extra/BaseGuild';
 import type { DiscordBase } from './extra/DiscordBase';
 export interface Guild extends ObjectToLower<Omit<APIGuild, 'stickers' | 'emojis' | 'roles'>>, DiscordBase {
@@ -70,7 +69,7 @@ export declare class Guild<State extends StructStates = 'api'> extends Guild_bas
     };
     channels: {
         list: (force?: boolean) => Promise<import("./channels").AllChannels[]>;
-        fetch: (id: string, force?: boolean) => Promise<import("../types").APIGuildCategoryChannel | import("../types").APIGuildStageVoiceChannel | import("../types").APIGuildVoiceChannel | import("../types").APINewsChannel | import("../types").APITextChannel | BaseChannel<import("../types").ChannelType> | import("./channels").DMChannel | import("./channels").CategoryChannel>;
+        fetch: (id: string, force?: boolean) => Promise<import("./channels").AllChannels>;
         create: (body: import("../types").RESTPostAPIGuildChannelJSONBody) => Promise<import("./channels").AllChannels>;
         delete: (id: string, reason?: string) => Promise<import("./channels").AllChannels>;
         edit: (id: string, body: import("../types").RESTPatchAPIChannelJSONBody, reason?: string) => Promise<import("./channels").AllChannels>;

package/lib/structures/Message.d.ts

@@ -39,7 +39,7 @@ export interface Message extends BaseMessage, ObjectToLower<Omit<MessageData, 't
 }
 export declare class Message extends BaseMessage {
     constructor(client: UsingClient, data: MessageData);
-    fetch(): Promise<Message>;
+    fetch(force?: boolean): Promise<Message>;
     reply(body: Omit<MessageCreateBodyRequest, 'message_reference'>, fail?: boolean): Promise<Message>;
     edit(body: MessageUpdateBodyRequest): Promise<Message>;
     write(body: MessageCreateBodyRequest): Promise<Message>;

package/lib/structures/Message.js

@@ -68,8 +68,8 @@ class Message extends BaseMessage {
     constructor(client, data) {
         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, fail = true) {
         return this.write({

package/lib/structures/channels.d.ts

@@ -35,7 +35,7 @@ export declare class BaseNoEditableChannel<T extends ChannelType> extends Discor
         guildId: string;
     }>): {
         list: (force?: boolean) => Promise<AllChannels[]>;
-        fetch: (id: string, force?: boolean) => Promise<APIGuildCategoryChannel | APIGuildStageVoiceChannel | APIGuildVoiceChannel | APINewsChannel | APITextChannel | BaseChannel<ChannelType> | DMChannel | CategoryChannel>;
+        fetch: (id: string, force?: boolean) => Promise<AllChannels>;
         create: (body: RESTPostAPIGuildChannelJSONBody) => Promise<AllChannels>;
         delete: (id: string, reason?: string) => Promise<AllChannels>;
         edit: (id: string, body: RESTPatchAPIChannelJSONBody, reason?: string) => Promise<AllChannels>;
@@ -109,7 +109,7 @@ export declare class MessagesMethods extends DiscordBase {
         edit: (messageId: string, body: MessageUpdateBodyRequest) => Promise<import("./Message").Message>;
         crosspost: (messageId: string, reason?: string) => Promise<import("./Message").Message>;
         delete: (messageId: string, reason?: string) => Promise<void>;
-        fetch: (messageId: string) => Promise<import("./Message").Message>;
+        fetch: (messageId: string, force?: boolean) => Promise<import("./Message").Message>;
         purge: (messages: string[], reason?: string) => Promise<void | undefined>;
         list: (fetchOptions: RESTGetAPIChannelMessagesQuery) => Promise<import("./Message").Message[]>;
     };
@@ -131,7 +131,7 @@ export declare class MessagesMethods extends DiscordBase {
         edit: (messageId: string, body: MessageUpdateBodyRequest) => Promise<import("./Message").Message>;
         crosspost: (messageId: string, reason?: string) => Promise<import("./Message").Message>;
         delete: (messageId: string, reason?: string) => Promise<void>;
-        fetch: (messageId: string) => Promise<import("./Message").Message>;
+        fetch: (messageId: string, force?: boolean) => Promise<import("./Message").Message>;
         purge: (messages: string[], reason?: string) => Promise<void | undefined>;
         list: (fetchOptions: RESTGetAPIChannelMessagesQuery) => Promise<import("./Message").Message[]>;
     };

package/lib/structures/channels.js

@@ -164,7 +164,7 @@ class MessagesMethods extends DiscordBase_1.DiscordBase {
             edit: (messageId, body) => ctx.client.messages.edit(messageId, ctx.channelId, body),
             crosspost: (messageId, reason) => ctx.client.messages.crosspost(messageId, ctx.channelId, reason),
             delete: (messageId, reason) => ctx.client.messages.delete(messageId, ctx.channelId, reason),
-            fetch: (messageId) => ctx.client.messages.fetch(messageId, ctx.channelId),
+            fetch: (messageId, force = false) => ctx.client.messages.fetch(messageId, ctx.channelId, force),
             purge: (messages, reason) => ctx.client.messages.purge(messages, ctx.channelId, reason),
             list: (fetchOptions) => ctx.client.messages.list(ctx.channelId, fetchOptions),
         };

package/lib/types/gateway.d.ts

@@ -1,3 +1,4 @@
+import type { OmitInsert } from '../common';
 import type { ChannelType, GatewayDispatchEvents, GatewayOpcodes, Snowflake } from './index';
 import type { GatewayPresenceUpdate } from './payloads/gateway';
 import type { APIApplication, APIApplicationCommandPermission, APIAuditLogEntry, APIAutoModerationAction, APIAutoModerationRule, APIChannel, APIEmoji, APIEntitlement, APIGuild, APIGuildIntegration, APIGuildMember, APIGuildScheduledEvent, APIInteraction, APIMessage, APIPartialEmoji, APIRole, APIStageInstance, APISticker, APISubscription, APIThreadChannel, APIThreadMember, APIUnavailableGuild, APIUser, APIVoiceState, AutoModerationRuleTriggerType, GatewayActivity, InviteTargetType, PresenceUpdateStatus, GatewayPresenceUpdate as RawGatewayPresenceUpdate, GatewayThreadListSync as RawGatewayThreadListSync, GatewayThreadMembersUpdate as RawGatewayThreadMembersUpdate } from './payloads/index';
@@ -17,7 +18,7 @@ export interface GatewayURLQuery {
  */
 export type GatewaySendPayload = GatewayHeartbeat | GatewayIdentify | GatewayRequestGuildMembers | GatewayResume | GatewayUpdatePresence | GatewayVoiceStateUpdate | GatewayRequestSoundboardSounds;
 export type GatewayReceivePayload = GatewayDispatchPayload | GatewayHeartbeatAck | GatewayHeartbeatRequest | GatewayHello | GatewayInvalidSession | GatewayReconnect;
-export type GatewayDispatchPayload = GatewayApplicationCommandPermissionsUpdateDispatch | GatewayAutoModerationActionExecutionDispatch | GatewayAutoModerationRuleCreateDispatch | GatewayAutoModerationRuleDeleteDispatch | GatewayAutoModerationRuleModifyDispatch | GatewayChannelModifyDispatch | GatewayChannelPinsUpdateDispatch | GatewayEntitlementModifyDispatch | GatewayGuildAuditLogEntryCreateDispatch | GatewayGuildBanModifyDispatch | GatewayGuildCreateDispatch | GatewayGuildDeleteDispatch | GatewayGuildEmojisUpdateDispatch | GatewayGuildIntegrationsUpdateDispatch | GatewayGuildMemberAddDispatch | GatewayGuildMemberRemoveDispatch | GatewayGuildMembersChunkDispatch | GatewayGuildMemberUpdateDispatch | GatewayGuildModifyDispatch | GatewayGuildRoleDeleteDispatch | GatewayGuildRoleModifyDispatch | GatewayGuildScheduledEventCreateDispatch | GatewayGuildScheduledEventDeleteDispatch | GatewayGuildScheduledEventUpdateDispatch | GatewayGuildScheduledEventUserAddDispatch | GatewayGuildScheduledEventUserRemoveDispatch | GatewayGuildStickersUpdateDispatch | GatewayIntegrationCreateDispatch | GatewayIntegrationDeleteDispatch | GatewayIntegrationUpdateDispatch | GatewayInteractionCreateDispatch | GatewayInviteCreateDispatch | GatewayInviteDeleteDispatch | GatewayMessageCreateDispatch | GatewayMessageDeleteBulkDispatch | GatewayMessageDeleteDispatch | GatewayMessagePollVoteAddDispatch | GatewayMessagePollVoteRemoveDispatch | GatewayMessageReactionAddDispatch | GatewayMessageReactionRemoveAllDispatch | GatewayMessageReactionRemoveDispatch | GatewayMessageReactionRemoveEmojiDispatch | GatewayMessageUpdateDispatch | GatewayPresenceUpdateDispatch | GatewayReadyDispatch | GatewayResumedDispatch | GatewayStageInstanceCreateDispatch | GatewayStageInstanceDeleteDispatch | GatewayStageInstanceUpdateDispatch | GatewayThreadCreateDispatch | GatewayThreadDeleteDispatch | GatewayThreadListSyncDispatch | GatewayThreadMembersUpdateDispatch | GatewayThreadMemberUpdateDispatch | GatewayThreadUpdateDispatch | GatewayTypingStartDispatch | GatewayUserUpdateDispatch | GatewayVoiceServerUpdateDispatch | GatewayVoiceStateUpdateDispatch | GatewayWebhooksUpdateDispatch | GatewayGuildSoundboardSoundCreateDispatch | GatewayGuildSoundboardSoundDeleteDispatch | GatewayGuildSoundboardSoundUpdateDispatch | GatewayGuildSoundboardSoundsUpdateDispatch | GatewaySoundboardSoundsDispatch;
+export type GatewayDispatchPayload = GatewayApplicationCommandPermissionsUpdateDispatch | GatewayAutoModerationActionExecutionDispatch | GatewayAutoModerationRuleCreateDispatch | GatewayAutoModerationRuleDeleteDispatch | GatewayAutoModerationRuleModifyDispatch | GatewayChannelModifyDispatch | GatewayChannelPinsUpdateDispatch | GatewayEntitlementModifyDispatch | GatewayGuildAuditLogEntryCreateDispatch | GatewayGuildBanModifyDispatch | GatewayGuildCreateDispatch | GatewayRawGuildCreateDispatch | GatewayGuildDeleteDispatch | GatewayRawGuildDeleteDispatch | GatewayGuildsReadyDispatch | GatewayGuildEmojisUpdateDispatch | GatewayGuildIntegrationsUpdateDispatch | GatewayGuildMemberAddDispatch | GatewayGuildMemberRemoveDispatch | GatewayGuildMembersChunkDispatch | GatewayGuildMemberUpdateDispatch | GatewayGuildModifyDispatch | GatewayGuildRoleDeleteDispatch | GatewayGuildRoleModifyDispatch | GatewayGuildScheduledEventCreateDispatch | GatewayGuildScheduledEventDeleteDispatch | GatewayGuildScheduledEventUpdateDispatch | GatewayGuildScheduledEventUserAddDispatch | GatewayGuildScheduledEventUserRemoveDispatch | GatewayGuildStickersUpdateDispatch | GatewayIntegrationCreateDispatch | GatewayIntegrationDeleteDispatch | GatewayIntegrationUpdateDispatch | GatewayInteractionCreateDispatch | GatewayInviteCreateDispatch | GatewayInviteDeleteDispatch | GatewayMessageCreateDispatch | GatewayMessageDeleteBulkDispatch | GatewayMessageDeleteDispatch | GatewayMessagePollVoteAddDispatch | GatewayMessagePollVoteRemoveDispatch | GatewayMessageReactionAddDispatch | GatewayMessageReactionRemoveAllDispatch | GatewayMessageReactionRemoveDispatch | GatewayMessageReactionRemoveEmojiDispatch | GatewayMessageUpdateDispatch | GatewayPresenceUpdateDispatch | GatewayReadyDispatch | GatewayResumedDispatch | GatewayStageInstanceCreateDispatch | GatewayStageInstanceDeleteDispatch | GatewayStageInstanceUpdateDispatch | GatewayThreadCreateDispatch | GatewayThreadDeleteDispatch | GatewayThreadListSyncDispatch | GatewayThreadMembersUpdateDispatch | GatewayThreadMemberUpdateDispatch | GatewayThreadUpdateDispatch | GatewayTypingStartDispatch | GatewayUserUpdateDispatch | GatewayVoiceServerUpdateDispatch | GatewayVoiceStateUpdateDispatch | GatewayWebhooksUpdateDispatch | GatewayGuildSoundboardSoundCreateDispatch | GatewayGuildSoundboardSoundDeleteDispatch | GatewayGuildSoundboardSoundUpdateDispatch | GatewayGuildSoundboardSoundsUpdateDispatch | GatewaySoundboardSoundsDispatch;
 /**
  * https://discord.com/developers/docs/topics/gateway-events#hello
  */
@@ -346,6 +347,9 @@ export type GatewayGuildModifyDispatchData = APIGuild;
  * https://discord.com/developers/docs/topics/gateway-events#guild-create
  */
 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
@@ -450,6 +454,13 @@ export type GatewayGuildUpdateDispatchData = GatewayGuildModifyDispatchData;
  * https://discord.com/developers/docs/topics/gateway-events#guild-delete
  */
 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
  */

package/lib/types/utils/index.d.ts

@@ -295,7 +295,10 @@ export declare 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",

package/lib/types/utils/index.js

@@ -280,7 +280,10 @@ var GatewayDispatchEvents;
     GatewayDispatchEvents["GuildBanAdd"] = "GUILD_BAN_ADD";
     GatewayDispatchEvents["GuildBanRemove"] = "GUILD_BAN_REMOVE";
     GatewayDispatchEvents["GuildCreate"] = "GUILD_CREATE";
+    GatewayDispatchEvents["RawGuildCreate"] = "RAW_GUILD_CREATE";
     GatewayDispatchEvents["GuildDelete"] = "GUILD_DELETE";
+    GatewayDispatchEvents["RawGuildDelete"] = "RAW_GUILD_DELETE";
+    GatewayDispatchEvents["GuildsReady"] = "GUILDS_READY";
     GatewayDispatchEvents["GuildEmojisUpdate"] = "GUILD_EMOJIS_UPDATE";
     GatewayDispatchEvents["GuildIntegrationsUpdate"] = "GUILD_INTEGRATIONS_UPDATE";
     GatewayDispatchEvents["GuildMemberAdd"] = "GUILD_MEMBER_ADD";

package/lib/websocket/discord/shard.d.ts

@@ -21,7 +21,9 @@ export declare class Shard {
     heart: ShardHeart;
     bucket: DynamicBucket;
     offlineSendQueue: ((_?: unknown) => void)[];
+    pendingGuilds: Set<string>;
     options: MakeRequired<ShardOptions, 'properties' | 'ratelimitOptions'>;
+    isReady: boolean;
     constructor(id: number, options: ShardOptions);
     get latency(): number;
     get isOpen(): boolean;
@@ -34,16 +36,16 @@ export declare class Shard {
     identify(): Promise<void>;
     get resumable(): boolean;
     resume(): Promise<void>;
-    heartbeat(requested: boolean): Promise<void>;
-    disconnect(): Promise<void>;
+    heartbeat(requested: boolean): void;
+    disconnect(): void;
     reconnect(): Promise<void>;
-    onpacket(packet: GatewayReceivePayload): Promise<void>;
+    onpacket(packet: GatewayReceivePayload): void | Promise<void>;
     protected handleClosed(close: {
         code: number;
         reason: string;
     }): Promise<void>;
-    close(code: number, reason: string): Promise<void>;
-    protected handleMessage(data: string | Buffer): Promise<void> | undefined;
+    close(code: number, reason: string): void;
+    protected handleMessage(data: string | Buffer): void | Promise<void>;
     checkOffline(force: boolean): Promise<unknown>;
     calculateSafeRequests(): number;
 }

package/lib/websocket/discord/shard.js

@@ -24,7 +24,9 @@ class Shard {
     };
     bucket;
     offlineSendQueue = [];
+    pendingGuilds = new Set();
     options;
+    isReady = false;
     constructor(id, options) {
         this.id = id;
         this.options = (0, common_1.MergeOptions)({
@@ -127,11 +129,11 @@ class Shard {
             },
         });
     }
-    async heartbeat(requested) {
+    heartbeat(requested) {
         this.debugger?.debug(`[Shard #${this.id}] Sending ${requested ? '' : 'un'}requested heartbeat (Ack=${this.heart.ack})`);
         if (!requested) {
             if (!this.heart.ack) {
-                await this.close(shared_1.ShardSocketCloseCodes.ZombiedConnection, 'Zombied connection');
+                this.close(shared_1.ShardSocketCloseCodes.ZombiedConnection, 'Zombied connection');
                 return;
             }
             this.heart.ack = false;
@@ -142,33 +144,31 @@ class Shard {
             d: this.data.resume_seq ?? null,
         }));
     }
-    async disconnect() {
+    disconnect() {
         this.debugger?.info(`[Shard #${this.id}] Disconnecting`);
-        await this.close(shared_1.ShardSocketCloseCodes.Shutdown, 'Shard down request');
+        this.close(shared_1.ShardSocketCloseCodes.Shutdown, 'Shard down request');
     }
     async reconnect() {
         this.debugger?.info(`[Shard #${this.id}] Reconnecting`);
-        await this.disconnect();
+        this.disconnect();
         await this.connect();
     }
-    async onpacket(packet) {
+    onpacket(packet) {
         if (packet.s !== null) {
             this.data.resume_seq = packet.s;
         }
         this.debugger?.debug(`[Shard #${this.id}]`, packet.t ? packet.t : types_1.GatewayOpcodes[packet.op], this.data.resume_seq);
         switch (packet.op) {
-            case types_1.GatewayOpcodes.Hello:
-                {
-                    clearInterval(this.heart.nodeInterval);
-                    this.heart.interval = packet.d.heartbeat_interval;
-                    await this.heartbeat(false);
-                    this.heart.nodeInterval = setInterval(() => this.heartbeat(false), this.heart.interval);
-                    if (this.resumable) {
-                        return this.resume();
-                    }
-                    await this.identify();
+            case types_1.GatewayOpcodes.Hello: {
+                clearInterval(this.heart.nodeInterval);
+                this.heart.interval = packet.d.heartbeat_interval;
+                this.heartbeat(false);
+                this.heart.nodeInterval = setInterval(() => this.heartbeat(false), this.heart.interval);
+                if (this.resumable) {
+                    return this.resume();
                 }
-                break;
+                return this.identify();
+            }
             case types_1.GatewayOpcodes.HeartbeatAck:
                 {
                     this.heart.ack = true;
@@ -179,37 +179,66 @@ class Shard {
                 this.heartbeat(true);
                 break;
             case types_1.GatewayOpcodes.Reconnect:
-                await this.reconnect();
-                break;
-            case types_1.GatewayOpcodes.InvalidSession:
+                return this.reconnect();
+            case types_1.GatewayOpcodes.InvalidSession: {
                 if (packet.d) {
                     if (!this.resumable) {
                         return this.logger.fatal('This is a completely unexpected error message.');
                     }
-                    await this.resume();
+                    return this.resume();
                 }
-                else {
-                    this.data.resume_seq = 0;
-                    this.data.session_id = undefined;
-                    await this.identify();
-                }
-                break;
+                this.data.resume_seq = 0;
+                this.data.session_id = undefined;
+                return this.identify();
+            }
             case types_1.GatewayOpcodes.Dispatch:
                 {
                     switch (packet.t) {
                         case types_1.GatewayDispatchEvents.Resumed:
                             {
-                                this.offlineSendQueue.map((resolve) => resolve());
+                                this.isReady = true;
+                                this.offlineSendQueue.map(resolve => resolve());
                                 this.options.handlePayload(this.id, packet);
                             }
                             break;
                         case types_1.GatewayDispatchEvents.Ready: {
+                            if ((0, common_1.hasIntent)(this.options.intents, 'Guilds')) {
+                                for (let i = 0; i < packet.d.guilds.length; i++) {
+                                    this.pendingGuilds.add(packet.d.guilds.at(i).id);
+                                }
+                            }
                             this.data.resume_gateway_url = packet.d.resume_gateway_url;
                             this.data.session_id = packet.d.session_id;
-                            this.offlineSendQueue.map((resolve) => resolve());
+                            this.offlineSendQueue.map(resolve => resolve());
                             this.options.handlePayload(this.id, packet);
+                            if (this.pendingGuilds.size === 0) {
+                                this.isReady = true;
+                                this.options.handlePayload(this.id, {
+                                    t: types_1.GatewayDispatchEvents.GuildsReady,
+                                    op: packet.op,
+                                    s: packet.s,
+                                });
+                            }
                             break;
                         }
+                        case types_1.GatewayDispatchEvents.GuildCreate:
+                        case types_1.GatewayDispatchEvents.GuildDelete:
+                            if (this.pendingGuilds.delete(packet.d.id)) {
+                                packet.t = `RAW_${packet.t}`;
+                                this.options.handlePayload(this.id, packet);
+                                if (this.pendingGuilds.size === 0) {
+                                    this.isReady = true;
+                                    this.options.handlePayload(this.id, {
+                                        t: types_1.GatewayDispatchEvents.GuildsReady,
+                                        op: packet.op,
+                                        s: packet.s,
+                                    });
+                                }
+                            }
+                            else {
+                                this.options.handlePayload(this.id, packet);
+                            }
+                            break;
                         default:
                             this.options.handlePayload(this.id, packet);
                             break;
@@ -219,6 +248,7 @@ class Shard {
         }
     }
     async handleClosed(close) {
+        this.isReady = false;
         clearInterval(this.heart.nodeInterval);
         this.logger.warn(`${shared_1.ShardSocketCloseCodes[close.code] ?? types_1.GatewayCloseCodes[close.code] ?? close.code} (${close.code})`, close.reason);
         switch (close.code) {
@@ -265,7 +295,7 @@ class Shard {
                 break;
         }
     }
-    async close(code, reason) {
+    close(code, reason) {
         clearInterval(this.heart.nodeInterval);
         if (!this.isOpen) {
             return this.debugger?.warn(`[Shard #${this.id}] Is not open, reason:`, reason);

package/lib/websocket/discord/sharder.d.ts

@@ -22,7 +22,7 @@ export declare class ShardManager extends Map<number, Shard> {
     startResharder(): Promise<void>;
     spawnBuckets(): Shard[][];
     forceIdentify(shardId: number): Promise<void>;
-    disconnect(shardId: number): Promise<void> | undefined;
+    disconnect(shardId: number): void | undefined;
     disconnectAll(): void;
     setShardPresence(shardId: number, payload: GatewayUpdatePresence['d']): void;
     setPresence(payload: GatewayUpdatePresence['d']): void;

package/lib/websocket/discord/workermanager.js

@@ -15,7 +15,7 @@ const structures_1 = require("../structures");
 const timeout_1 = require("../structures/timeout");
 class WorkerManager extends Map {
     static prepareSpaces(options, logger) {
-        logger?.info('Preparing buckets', options);
+        logger?.info('Preparing buckets');
         const chunks = structures_1.DynamicBucket.chunk(new Array(options.shardEnd - options.shardStart), options.shardsPerWorker);
         chunks.forEach((shards, index) => {
             for (let i = 0; i < shards.length; i++) {
@@ -342,7 +342,7 @@ class WorkerManager extends Map {
             case 'WORKER_READY':
                 {
                     this.get(message.workerId).ready = true;
-                    if ([...this.values()].every(w => w.ready)) {
+                    if (this.size === this.totalWorkers && [...this.values()].every(w => w.ready)) {
                         this.postMessage(this.keys().next().value, {
                             type: 'BOT_READY',
                         });
@@ -529,7 +529,7 @@ class WorkerManager extends Map {
             const percentage = (info.shards / ((this.totalShards * 2500) / 1000)) * 100;
             if (percentage < this.options.resharding.percentage)
                 return this.debugger?.debug(`Percentage is not enough to reshard ${percentage}/${this.options.resharding.percentage}`);
-            this.debugger?.info('Starting resharding process');
+            this.debugger?.info(`Starting resharding process to ${info.shards}`);
             this._info = info;
             this.connectQueue.concurrency = info.session_start_limit.max_concurrency;
             this.options.info.session_start_limit.max_concurrency = info.session_start_limit.max_concurrency;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "seyfert",
-	"version": "2.1.1-dev-12261178806.0",
+	"version": "2.1.1-dev-12309212345.0",
 	"description": "The most advanced framework for discord bots",
 	"main": "./lib/index.js",
 	"module": "./lib/index.js",