seyfert 2.2.1-dev-12848723720.0 → 2.2.1-dev-12856239159.0

package/lib/commands/applications/chatcontext.d.ts

@@ -32,9 +32,9 @@ export declare class CommandContext<T extends OptionsRecord = {}, M extends keyo
     editOrReply<WR extends boolean = false>(body: InteractionCreateBodyRequest | InteractionMessageUpdateBodyRequest, withResponse?: WR): Promise<When<WR, WebhookMessageStructure | When<InferWithPrefix, MessageStructure, never>, void | WebhookMessageStructure | When<InferWithPrefix, MessageStructure, never>>>;
     followup(body: MessageWebhookCreateBodyRequest): Promise<If<InferWithPrefix, WebhookMessageStructure | MessageStructure, WebhookMessageStructure>>;
     fetchResponse(): Promise<If<InferWithPrefix, WebhookMessageStructure | MessageStructure, WebhookMessageStructure>>;
-    channel(mode?: 'rest' | 'flow'): Promise<If<InferWithPrefix, AllChannels | undefined, AllChannels>>;
+    channel(mode?: 'rest' | 'flow'): Promise<AllChannels>;
     channel(mode: 'cache'): ReturnCache<If<InferWithPrefix, AllChannels | undefined, AllChannels>>;
-    me(mode?: 'rest' | 'flow'): Promise<GuildMemberStructure>;
+    me(mode?: 'rest' | 'flow'): Promise<GuildMemberStructure | undefined>;
     me(mode: 'cache'): ReturnCache<GuildMemberStructure | undefined>;
     guild(mode?: 'rest' | 'flow'): Promise<GuildStructure<'cached' | 'api'> | undefined>;
     guild(mode: 'cache'): ReturnCache<GuildStructure<'cached'> | undefined>;

package/lib/commands/applications/chatcontext.js

@@ -106,11 +106,7 @@ class CommandContext extends basecontext_1.BaseContext {
     }
     guild(mode = 'flow') {
         if (!this.guildId)
-            return (mode === 'cache'
-                ? this.client.cache.adapter.isAsync
-                    ? Promise.resolve()
-                    : undefined
-                : Promise.resolve());
+            return mode === 'cache' ? (this.client.cache.adapter.isAsync ? Promise.resolve() : undefined) : Promise.resolve();
         switch (mode) {
             case 'cache':
                 return (this.client.cache.guilds?.get(this.guildId) ||

package/lib/commands/applications/entrycontext.d.ts

@@ -30,7 +30,7 @@ export declare class EntryPointContext<M extends keyof RegisteredMiddlewares = n
     fetchResponse(): Promise<WebhookMessageStructure>;
     channel(mode?: 'rest' | 'flow'): Promise<AllChannels>;
     channel(mode: 'cache'): ReturnCache<AllChannels>;
-    me(mode?: 'rest' | 'flow'): Promise<GuildMemberStructure>;
+    me(mode?: 'rest' | 'flow'): Promise<GuildMemberStructure | undefined>;
     me(mode: 'cache'): ReturnCache<GuildMemberStructure | undefined>;
     guild(mode?: 'rest' | 'flow'): Promise<GuildStructure<'cached' | 'api'> | undefined>;
     guild(mode: 'cache'): ReturnCache<GuildStructure<'cached'> | undefined>;

package/lib/commands/applications/entrycontext.js

@@ -48,7 +48,7 @@ class EntryPointContext extends basecontext_1.BaseContext {
         return this.interaction.fetchResponse();
     }
     channel(mode = 'flow') {
-        if (this.interaction.channel && mode === 'cache')
+        if (mode === 'cache')
             return this.client.cache.adapter.isAsync ? Promise.resolve(this.interaction.channel) : this.interaction.channel;
         return this.client.channels.fetch(this.channelId, mode === 'rest');
     }
@@ -57,7 +57,8 @@ class EntryPointContext extends basecontext_1.BaseContext {
             return mode === 'cache' ? (this.client.cache.adapter.isAsync ? Promise.resolve() : undefined) : Promise.resolve();
         switch (mode) {
             case 'cache':
-                return this.client.cache.members?.get(this.client.botId, this.guildId);
+                return (this.client.cache.members?.get(this.client.botId, this.guildId) ||
+                    (this.client.cache.adapter.isAsync ? Promise.resolve() : undefined));
             default:
                 return this.client.members.fetch(this.guildId, this.client.botId, mode === 'rest');
         }

package/lib/commands/applications/menucontext.d.ts

@@ -31,7 +31,7 @@ export declare class MenuCommandContext<T extends MessageCommandInteraction | Us
     fetchResponse(): Promise<WebhookMessageStructure>;
     channel(mode?: 'rest' | 'flow'): Promise<AllChannels>;
     channel(mode: 'cache'): ReturnCache<AllChannels>;
-    me(mode?: 'rest' | 'flow'): Promise<GuildMemberStructure>;
+    me(mode?: 'rest' | 'flow'): Promise<GuildMemberStructure | undefined>;
     me(mode: 'cache'): ReturnCache<GuildMemberStructure | undefined>;
     guild(mode?: 'rest' | 'flow'): Promise<GuildStructure<'cached' | 'api'> | undefined>;
     guild(mode: 'cache'): ReturnCache<GuildStructure<'cached'> | undefined>;

package/lib/commands/applications/menucontext.js

@@ -63,7 +63,7 @@ class MenuCommandContext extends basecontext_1.BaseContext {
         return this.interaction.fetchResponse();
     }
     channel(mode = 'flow') {
-        if (this.interaction.channel && mode === 'cache')
+        if (mode === 'cache')
             return this.client.cache.adapter.isAsync ? Promise.resolve(this.interaction.channel) : this.interaction.channel;
         return this.client.channels.fetch(this.channelId, mode === 'rest');
     }

package/lib/components/componentcontext.d.ts

@@ -85,7 +85,7 @@ export declare class ComponentContext<Type extends keyof ContextComponentCommand
      * @param mode - The mode to fetch the member.
      * @returns A promise that resolves to the bot member.
      */
-    me(mode?: 'rest' | 'flow'): Promise<GuildMemberStructure>;
+    me(mode?: 'rest' | 'flow'): Promise<GuildMemberStructure | undefined>;
     me(mode: 'cache'): ReturnCache<GuildMemberStructure | undefined>;
     /**
      * Gets the guild of the interaction.

package/lib/components/componentcontext.js

@@ -98,7 +98,7 @@ class ComponentContext extends basecontext_1.BaseContext {
         return this.interaction.modal(body);
     }
     channel(mode = 'flow') {
-        if (this.interaction.channel && mode === 'cache')
+        if (mode === 'cache')
             return this.client.cache.adapter.isAsync ? Promise.resolve(this.interaction.channel) : this.interaction.channel;
         return this.client.channels.fetch(this.channelId, mode === 'rest');
     }

package/lib/components/modalcontext.d.ts

@@ -81,7 +81,7 @@ export declare class ModalContext<M extends keyof RegisteredMiddlewares = never>
      * @param mode - The mode to fetch the member.
      * @returns A promise that resolves to the bot member.
      */
-    me(mode?: 'rest' | 'flow'): Promise<GuildMemberStructure>;
+    me(mode?: 'rest' | 'flow'): Promise<GuildMemberStructure | undefined>;
     me(mode: 'cache'): ReturnCache<GuildMemberStructure | undefined>;
     /**
      * Gets the guild of the interaction.

package/lib/components/modalcontext.js

@@ -86,7 +86,7 @@ class ModalContext extends basecontext_1.BaseContext {
         return this.interaction.modal(body);
     }
     channel(mode = 'flow') {
-        if (this.interaction.channel && mode === 'cache')
+        if (mode === 'cache')
             return this.client.cache.adapter.isAsync ? Promise.resolve(this.interaction.channel) : this.interaction.channel;
         return this.client.channels.fetch(this.channelId, mode === 'rest');
     }

package/lib/structures/AutoModerationRule.d.ts

@@ -1,3 +1,4 @@
+import type { ReturnCache } from '../../src';
 import type { AutoModerationRuleStructure, GuildMemberStructure, GuildStructure } from '../client';
 import type { UsingClient } from '../commands';
 import type { MethodContext, ObjectToLower } from '../common';
@@ -8,7 +9,8 @@ export interface AutoModerationRule extends ObjectToLower<APIAutoModerationRule>
 export declare class AutoModerationRule extends DiscordBase<APIAutoModerationRule> {
     constructor(client: UsingClient, data: APIAutoModerationRule);
     fetchCreator(force?: boolean): Promise<GuildMemberStructure>;
-    guild(force?: boolean): Promise<GuildStructure<'api'>>;
+    guild(mode?: 'rest' | 'flow'): Promise<GuildStructure<'cached' | 'api'>>;
+    guild(mode: 'cache'): ReturnCache<GuildStructure<'cached'> | undefined>;
     fetch(): Promise<AutoModerationRuleStructure>;
     edit(body: RESTPatchAPIAutoModerationRuleJSONBody, reason?: string): Promise<AutoModerationRuleStructure>;
     delete(reason?: string): Promise<never>;

package/lib/structures/AutoModerationRule.js

@@ -9,8 +9,14 @@ class AutoModerationRule extends DiscordBase_1.DiscordBase {
     fetchCreator(force = false) {
         return this.client.members.fetch(this.guildId, this.creatorId, force);
     }
-    guild(force = false) {
-        return this.client.guilds.fetch(this.guildId, force);
+    guild(mode = 'flow') {
+        switch (mode) {
+            case 'cache':
+                return (this.client.cache.guilds?.get(this.guildId) ||
+                    (this.client.cache.adapter.isAsync ? Promise.resolve() : undefined));
+            default:
+                return this.client.guilds.fetch(this.guildId, mode === 'rest');
+        }
     }
     fetch() {
         return this.client.guilds.moderation.fetch(this.guildId, this.id);

package/lib/structures/GuildBan.d.ts

@@ -1,3 +1,4 @@
+import type { ReturnCache } from '../../src';
 import type { GuildBanStructure, GuildStructure } from '../client';
 import type { UsingClient } from '../commands';
 import { type MethodContext, type ObjectToLower } from '../common';
@@ -11,7 +12,8 @@ export declare class GuildBan extends DiscordBase {
     constructor(client: UsingClient, data: APIBan, guildId: string);
     create(body?: Parameters<BanShorter['create']>[2], reason?: string): Promise<void>;
     remove(reason?: string): Promise<never>;
-    guild(force?: boolean): Promise<GuildStructure<'api'>>;
+    guild(mode?: 'rest' | 'flow'): Promise<GuildStructure<'cached' | 'api'>>;
+    guild(mode: 'cache'): ReturnCache<GuildStructure<'cached'> | undefined>;
     fetch(force?: boolean): Promise<GuildBanStructure>;
     toString(): `<@${string}>`;
     static methods({ client, guildId }: MethodContext<{

package/lib/structures/GuildBan.js

@@ -15,8 +15,14 @@ class GuildBan extends DiscordBase_1.DiscordBase {
     remove(reason) {
         return this.client.bans.remove(this.guildId, this.id, reason);
     }
-    guild(force = false) {
-        return this.client.guilds.fetch(this.guildId, force);
+    guild(mode = 'flow') {
+        switch (mode) {
+            case 'cache':
+                return (this.client.cache.guilds?.get(this.guildId) ||
+                    (this.client.cache.adapter.isAsync ? Promise.resolve() : undefined));
+            default:
+                return this.client.guilds.fetch(this.guildId, mode === 'rest');
+        }
     }
     fetch(force = false) {
         return this.client.bans.fetch(this.guildId, this.id, force);

package/lib/structures/GuildEmoji.d.ts

@@ -1,3 +1,4 @@
+import type { ReturnCache } from '../../src';
 import type { BaseCDNUrlOptions } from '../api';
 import type { GuildEmojiStructure, GuildStructure } from '../client';
 import type { UsingClient } from '../commands';
@@ -9,7 +10,8 @@ export interface GuildEmoji extends DiscordBase, ObjectToLower<Omit<APIEmoji, 'i
 export declare class GuildEmoji extends DiscordBase {
     readonly guildId: string;
     constructor(client: UsingClient, data: APIEmoji, guildId: string);
-    guild(force?: boolean): Promise<GuildStructure<'api'> | undefined>;
+    guild(mode?: 'rest' | 'flow'): Promise<GuildStructure<'cached' | 'api'>>;
+    guild(mode: 'cache'): ReturnCache<GuildStructure<'cached'> | undefined>;
     edit(body: RESTPatchAPIChannelJSONBody, reason?: string): Promise<GuildEmojiStructure>;
     delete(reason?: string): Promise<void>;
     fetch(force?: boolean): Promise<GuildEmojiStructure>;

package/lib/structures/GuildEmoji.js

@@ -9,10 +9,14 @@ class GuildEmoji extends DiscordBase_1.DiscordBase {
         super(client, { ...data, id: data.id });
         this.guildId = guildId;
     }
-    async guild(force = false) {
-        if (!this.guildId)
-            return;
-        return this.client.guilds.fetch(this.guildId, force);
+    guild(mode = 'flow') {
+        switch (mode) {
+            case 'cache':
+                return (this.client.cache.guilds?.get(this.guildId) ||
+                    (this.client.cache.adapter.isAsync ? Promise.resolve() : undefined));
+            default:
+                return this.client.guilds.fetch(this.guildId, mode === 'rest');
+        }
     }
     edit(body, reason) {
         return this.client.emojis.edit(this.guildId, this.id, body, reason);

package/lib/structures/GuildMember.d.ts

@@ -1,5 +1,6 @@
 import { DiscordBase } from './extra/DiscordBase';
 export type GuildMemberData = APIGuildMember | Omit<APIGuildMember, 'user'> | GatewayGuildMemberUpdateDispatchData | GatewayGuildMemberAddDispatchData | APIInteractionDataResolvedGuildMember;
+import type { ReturnCache } from '../../src';
 import { type DMChannelStructure, type GuildMemberStructure, type GuildStructure, type MessageStructure, type UserStructure, type VoiceStateStructure } from '../client/transformers';
 import type { UsingClient } from '../commands';
 import { type GuildMemberResolvable, type ImageOptions, type MessageCreateBodyRequest, type MethodContext, type ObjectToLower, type ToClass } from '../common';
@@ -17,12 +18,13 @@ export declare class BaseGuildMember extends DiscordBase {
     constructor(client: UsingClient, data: GuildMemberData, id: string, 
     /** the choosen guild id */
     guildId: string);
-    guild(force?: boolean): Promise<GuildStructure<'api'>>;
+    guild(mode?: 'rest' | 'flow'): Promise<GuildStructure<'cached' | 'api'>>;
+    guild(mode: 'cache'): ReturnCache<GuildStructure<'cached'> | undefined>;
     fetch(force?: boolean): Promise<GuildMemberStructure>;
     ban(body?: RESTPutAPIGuildBanJSONBody, reason?: string): Promise<void>;
     kick(reason?: string): Promise<void>;
     edit(body: RESTPatchAPIGuildMemberJSONBody, reason?: string): Promise<GuildMemberStructure>;
-    presence(): import("..").ReturnCache<(Omit<import("../types").GatewayPresenceUpdate, "user"> & {
+    presence(): ReturnCache<(Omit<import("../types").GatewayPresenceUpdate, "user"> & {
         id: string;
         user_id: string;
     } & {

package/lib/structures/GuildMember.js

@@ -19,8 +19,14 @@ class BaseGuildMember extends DiscordBase_1.DiscordBase {
         this._roles = data.roles;
         this.patch(data);
     }
-    guild(force = false) {
-        return this.client.guilds.fetch(this.guildId, force);
+    guild(mode = 'flow') {
+        switch (mode) {
+            case 'cache':
+                return (this.client.cache.guilds?.get(this.guildId) ||
+                    (this.client.cache.adapter.isAsync ? Promise.resolve() : undefined));
+            default:
+                return this.client.guilds.fetch(this.guildId, mode === 'rest');
+        }
     }
     fetch(force = false) {
         return this.client.members.fetch(this.guildId, this.id, force);

package/lib/structures/GuildRole.d.ts

@@ -1,3 +1,4 @@
+import type { ReturnCache } from '../../src';
 import type { GuildRoleStructure, GuildStructure } from '../client';
 import type { UsingClient } from '../commands';
 import { type MethodContext, type ObjectToLower } from '../common';
@@ -10,7 +11,8 @@ export declare class GuildRole extends DiscordBase {
     readonly guildId: string;
     permissions: PermissionsBitField;
     constructor(client: UsingClient, data: APIRole, guildId: string);
-    guild(force?: boolean): Promise<GuildStructure<'api'> | undefined>;
+    guild(mode?: 'rest' | 'flow'): Promise<GuildStructure<'cached' | 'api'>>;
+    guild(mode: 'cache'): ReturnCache<GuildStructure<'cached'> | undefined>;
     fetch(force?: boolean): Promise<GuildRoleStructure>;
     edit(body: RESTPatchAPIGuildRoleJSONBody): Promise<GuildRoleStructure>;
     delete(reason?: string): Promise<GuildRoleStructure>;

package/lib/structures/GuildRole.js

@@ -12,10 +12,14 @@ class GuildRole extends DiscordBase_1.DiscordBase {
         this.guildId = guildId;
         this.permissions = new Permissions_1.PermissionsBitField(BigInt(data.permissions));
     }
-    async guild(force = false) {
-        if (!this.guildId)
-            return;
-        return this.client.guilds.fetch(this.guildId, force);
+    guild(mode = 'flow') {
+        switch (mode) {
+            case 'cache':
+                return (this.client.cache.guilds?.get(this.guildId) ||
+                    (this.client.cache.adapter.isAsync ? Promise.resolve() : undefined));
+            default:
+                return this.client.guilds.fetch(this.guildId, mode === 'rest');
+        }
     }
     fetch(force = false) {
         return this.client.roles.fetch(this.guildId, this.id, force);

package/lib/structures/GuildTemplate.d.ts

@@ -1,3 +1,4 @@
+import type { ReturnCache } from '../../src';
 import type { GuildStructure, GuildTemplateStructure } from '../client';
 import type { UsingClient } from '../commands';
 import type { MethodContext, ObjectToLower } from '../common';
@@ -7,7 +8,8 @@ export interface GuildTemplate extends Base, ObjectToLower<APITemplate> {
 }
 export declare class GuildTemplate extends Base {
     constructor(client: UsingClient, data: APITemplate);
-    guild(force?: boolean): Promise<GuildStructure<'api'>>;
+    guild(mode?: 'rest' | 'flow'): Promise<GuildStructure<'cached' | 'api'>>;
+    guild(mode: 'cache'): ReturnCache<GuildStructure<'cached'> | undefined>;
     fetch(): Promise<GuildTemplateStructure>;
     sync(): Promise<GuildTemplateStructure>;
     edit(body: RESTPatchAPIGuildTemplateJSONBody): Promise<GuildTemplateStructure>;

package/lib/structures/GuildTemplate.js

@@ -7,8 +7,14 @@ class GuildTemplate extends Base_1.Base {
         super(client);
         this.__patchThis(data);
     }
-    guild(force = false) {
-        return this.client.guilds.fetch(this.sourceGuildId, force);
+    guild(mode = 'flow') {
+        switch (mode) {
+            case 'cache':
+                return (this.client.cache.guilds?.get(this.sourceGuildId) ||
+                    (this.client.cache.adapter.isAsync ? Promise.resolve() : undefined));
+            default:
+                return this.client.guilds.fetch(this.sourceGuildId, mode === 'rest');
+        }
     }
     fetch() {
         return this.client.templates.fetch(this.sourceGuildId);

package/lib/structures/Interaction.d.ts

@@ -1,4 +1,5 @@
 import { type APIApplicationCommandAutocompleteInteraction, type APIApplicationCommandInteraction, type APIBaseInteraction, type APIChatInputApplicationCommandInteraction, type APIChatInputApplicationCommandInteractionData, type APICommandAutocompleteInteractionResponseCallbackData, type APIEntryPointCommandInteraction, type APIInteraction, type APIInteractionResponse, type APIInteractionResponseChannelMessageWithSource, type APIInteractionResponseDeferredChannelMessageWithSource, type APIInteractionResponseDeferredMessageUpdate, type APIInteractionResponsePong, type APIInteractionResponseUpdateMessage, type APIMessageApplicationCommandInteraction, type APIMessageApplicationCommandInteractionData, type APIMessageButtonInteractionData, type APIMessageComponentInteraction, type APIMessageComponentSelectMenuInteraction, type APIMessageStringSelectInteractionData, type APIModalSubmission, type APIModalSubmitInteraction, type APIUserApplicationCommandInteraction, type APIUserApplicationCommandInteractionData, ApplicationCommandType, ComponentType, type GatewayInteractionCreateDispatchData, type InteractionCallbackData, type InteractionCallbackResourceActivity, InteractionResponseType, InteractionType, type MessageFlags, type RESTPostAPIInteractionCallbackJSONBody, type RESTPostAPIInteractionCallbackResult } from '../types';
+import type { ReturnCache } from '../../src';
 import type { RawFile } from '../api';
 import { type EntitlementStructure, type GuildRoleStructure, type GuildStructure, type InteractionGuildMemberStructure, type MessageStructure, type OptionResolverStructure, type UserStructure, type WebhookMessageStructure } from '../client/transformers';
 import type { UsingClient } from '../commands';
@@ -50,7 +51,8 @@ export declare class BaseInteraction<FromGuild extends boolean = boolean, Type e
     isModal(): this is ModalSubmitInteraction;
     isEntryPoint(): this is EntryPointInteraction;
     static from(client: UsingClient, gateway: GatewayInteractionCreateDispatchData, __reply?: __InternalReplyFunction): RoleSelectMenuInteraction | UserSelectMenuInteraction | MentionableSelectMenuInteraction | ChannelSelectMenuInteraction | ChatInputCommandInteraction<boolean> | UserCommandInteraction<boolean> | MessageCommandInteraction<boolean> | ButtonInteraction | StringSelectMenuInteraction<string[]> | ModalSubmitInteraction<boolean> | AutocompleteInteraction<boolean> | BaseInteraction<boolean, import("../types").APIPingInteraction>;
-    fetchGuild(force?: boolean): Promise<GuildStructure<'api'> | undefined>;
+    fetchGuild(mode?: 'rest' | 'flow'): Promise<GuildStructure<'cached' | 'api'> | undefined>;
+    fetchGuild(mode: 'cache'): ReturnCache<GuildStructure<'cached'> | undefined>;
 }
 export type AllInteractions = AutocompleteInteraction | ChatInputCommandInteraction | UserCommandInteraction | MessageCommandInteraction | ComponentInteraction | SelectMenuInteraction | ModalSubmitInteraction | EntryPointInteraction | BaseInteraction;
 export interface AutocompleteInteraction extends ObjectToLower<Omit<APIApplicationCommandAutocompleteInteraction, 'user' | 'member' | 'type' | 'data' | 'message' | 'channel' | 'app_permissions'>> {

package/lib/structures/Interaction.js

@@ -216,8 +216,16 @@ class BaseInteraction extends DiscordBase_1.DiscordBase {
                 return new BaseInteraction(client, gateway);
         }
     }
-    async fetchGuild(force = false) {
-        return this.guildId ? this.client.guilds.fetch(this.guildId, force) : undefined;
+    fetchGuild(mode = 'flow') {
+        if (!this.guildId)
+            return mode === 'cache' ? (this.client.cache.adapter.isAsync ? Promise.resolve() : undefined) : Promise.resolve();
+        switch (mode) {
+            case 'cache':
+                return (this.client.cache.guilds?.get(this.guildId) ||
+                    (this.client.cache.adapter.isAsync ? Promise.resolve() : undefined));
+            default:
+                return this.client.guilds.fetch(this.guildId, mode === 'rest');
+        }
     }
 }
 exports.BaseInteraction = BaseInteraction;

package/lib/structures/Message.d.ts

@@ -32,7 +32,8 @@ export declare class BaseMessage extends DiscordBase {
     get url(): `https://discord.com/channels/${string}/${string}/${string}`;
     guild(mode?: 'rest' | 'flow'): Promise<GuildStructure<'cached' | 'api'> | undefined>;
     guild(mode: 'cache'): ReturnCache<GuildStructure<'cached'> | undefined>;
-    channel(force?: boolean): Promise<AllChannels>;
+    channel(mode?: 'rest' | 'flow'): Promise<AllChannels>;
+    channel(mode: 'cache'): ReturnCache<AllChannels | undefined>;
     react(emoji: EmojiResolvable): Promise<void>;
     private patch;
 }

package/lib/structures/Message.js

@@ -34,13 +34,20 @@ class BaseMessage extends DiscordBase_1.DiscordBase {
             return (mode === 'cache' ? (this.client.cache.adapter.isAsync ? Promise.resolve() : undefined) : Promise.resolve());
         switch (mode) {
             case 'cache':
-                return this.client.cache.guilds?.get(this.guildId);
+                return (this.client.cache.guilds?.get(this.guildId) ||
+                    (this.client.cache.adapter.isAsync ? Promise.resolve() : undefined));
             default:
                 return this.client.guilds.fetch(this.guildId, mode === 'rest');
         }
     }
-    channel(force = false) {
-        return this.client.channels.fetch(this.channelId, force);
+    channel(mode = 'flow') {
+        switch (mode) {
+            case 'cache':
+                return (this.client.cache.channels?.get(this.channelId) ||
+                    (this.client.cache.adapter.isAsync ? Promise.resolve() : undefined));
+            default:
+                return this.client.channels.fetch(this.channelId, mode === 'rest');
+        }
     }
     react(emoji) {
         return this.client.reactions.add(this.id, this.channelId, emoji);

package/lib/structures/Sticker.d.ts

@@ -1,4 +1,5 @@
 import type { GuildStructure, RawFile, StickerStructure, UsingClient } from '..';
+import type { ReturnCache } from '../../src';
 import type { Attachment, AttachmentBuilder } from '../builders';
 import { type UserStructure } from '../client/transformers';
 import type { MethodContext, ObjectToLower } from '../common';
@@ -9,7 +10,8 @@ export interface Sticker extends DiscordBase, ObjectToLower<Omit<APISticker, 'us
 export declare class Sticker extends DiscordBase {
     user?: UserStructure;
     constructor(client: UsingClient, data: APISticker);
-    guild(force?: boolean): Promise<GuildStructure<'api'> | undefined>;
+    guild(mode?: 'rest' | 'flow'): Promise<GuildStructure<'cached' | 'api'> | undefined>;
+    guild(mode: 'cache'): ReturnCache<GuildStructure<'cached'> | undefined>;
     edit(body: RESTPatchAPIGuildStickerJSONBody, reason?: string): Promise<StickerStructure | undefined>;
     fetch(force?: boolean): Promise<StickerStructure | undefined>;
     delete(reason?: string): Promise<void>;

package/lib/structures/Sticker.js

@@ -11,10 +11,16 @@ class Sticker extends DiscordBase_1.DiscordBase {
             this.user = transformers_1.Transformers.User(this.client, data.user);
         }
     }
-    async guild(force = false) {
+    guild(mode = 'flow') {
         if (!this.guildId)
-            return;
-        return this.client.guilds.fetch(this.guildId, force);
+            return mode === 'cache' ? (this.client.cache.adapter.isAsync ? Promise.resolve() : undefined) : Promise.resolve();
+        switch (mode) {
+            case 'cache':
+                return (this.client.cache.guilds?.get(this.guildId) ||
+                    (this.client.cache.adapter.isAsync ? Promise.resolve() : undefined));
+            default:
+                return this.client.guilds.fetch(this.guildId, mode === 'rest');
+        }
     }
     async edit(body, reason) {
         if (!this.guildId)

package/lib/structures/VoiceState.d.ts

@@ -1,9 +1,10 @@
 import type { UserStructure, UsingClient, VoiceStateStructure } from '../';
+import type { GuildStructure, ReturnCache } from '../../src';
 import type { VoiceStateResource } from '../cache/resources/voice-states';
 import { type GuildMemberStructure } from '../client/transformers';
 import type { ObjectToLower } from '../common';
 import type { APIVoiceState } from '../types';
-import type { AllGuildVoiceChannels } from './channels';
+import type { AllChannels } from './channels';
 import { Base } from './extra/Base';
 export interface VoiceState extends Base, ObjectToLower<Omit<VoiceStateResource, 'member'>> {
 }
@@ -13,7 +14,8 @@ export declare class VoiceState extends Base {
     get isMuted(): boolean;
     member(force?: boolean): Promise<GuildMemberStructure>;
     user(force?: boolean): Promise<UserStructure>;
-    channel(force?: boolean): Promise<AllGuildVoiceChannels | undefined>;
+    channel(mode?: 'rest' | 'flow'): Promise<AllChannels | undefined>;
+    channel(mode: 'cache'): ReturnCache<AllChannels | undefined>;
     setMute(mute?: boolean, reason?: string): Promise<GuildMemberStructure>;
     setDeaf(deaf?: boolean, reason?: string): Promise<GuildMemberStructure>;
     setSuppress(suppress?: boolean): Promise<void>;
@@ -21,4 +23,6 @@ export declare class VoiceState extends Base {
     disconnect(reason?: string): Promise<GuildMemberStructure>;
     fetch(force?: boolean): Promise<VoiceStateStructure>;
     setChannel(channel_id: null | string, reason?: string): Promise<GuildMemberStructure>;
+    guild(mode?: 'rest' | 'flow'): Promise<GuildStructure<'cached' | 'api'>>;
+    guild(mode: 'cache'): ReturnCache<GuildStructure<'cached'> | undefined>;
 }

package/lib/structures/VoiceState.js

@@ -21,10 +21,16 @@ class VoiceState extends Base_1.Base {
     user(force) {
         return this.client.users.fetch(this.userId, force);
     }
-    async channel(force) {
+    channel(mode = 'flow') {
         if (!this.channelId)
-            return;
-        return this.client.channels.fetch(this.channelId, force);
+            return mode === 'cache' ? (this.client.cache.adapter.isAsync ? Promise.resolve() : undefined) : Promise.resolve();
+        switch (mode) {
+            case 'cache':
+                return (this.client.cache.channels?.get(this.channelId) ||
+                    (this.client.cache.adapter.isAsync ? Promise.resolve() : undefined));
+            default:
+                return this.client.channels.fetch(this.channelId, mode === 'rest');
+        }
     }
     async setMute(mute = !this.mute, reason) {
         const member = await this.client.members.edit(this.guildId, this.userId, { mute }, reason);
@@ -61,5 +67,14 @@ class VoiceState extends Base_1.Base {
         this.channelId = channel_id;
         return member;
     }
+    guild(mode = 'flow') {
+        switch (mode) {
+            case 'cache':
+                return (this.client.cache.guilds?.get(this.guildId) ||
+                    (this.client.cache.adapter.isAsync ? Promise.resolve() : undefined));
+            default:
+                return this.client.guilds.fetch(this.guildId, mode === 'rest');
+        }
+    }
 }
 exports.VoiceState = VoiceState;

package/lib/structures/Webhook.d.ts

@@ -1,3 +1,4 @@
+import type { ReturnCache } from '../../src';
 import { type AnonymousGuildStructure, type GuildStructure, type UserStructure, type WebhookMessageStructure, type WebhookStructure } from '../client/transformers';
 import type { UsingClient } from '../commands';
 import type { ImageOptions, MessageWebhookCreateBodyRequest, MessageWebhookPayload, MessageWebhookUpdateBodyRequest, MethodContext, ObjectToLower } from '../common';
@@ -30,13 +31,15 @@ export declare class Webhook extends DiscordBase {
      * @param force Whether to force fetching the guild even if it's already cached.
      * @returns A promise that resolves to the guild associated with the webhook, or undefined if not applicable.
      */
-    guild(force?: boolean): Promise<GuildStructure<'api'> | undefined>;
+    guild(mode?: 'rest' | 'flow'): Promise<GuildStructure<'cached' | 'api'> | undefined>;
+    guild(mode: 'cache'): ReturnCache<GuildStructure<'cached'> | undefined>;
     /**
      * Fetches the channel associated with the webhook.
      * @param force Whether to force fetching the channel even if it's already cached.
      * @returns A promise that resolves to the channel associated with the webhook, or undefined if not applicable.
      */
-    channel(force?: boolean): Promise<AllChannels | undefined>;
+    channel(mode?: 'rest' | 'flow'): Promise<AllChannels>;
+    channel(mode: 'cache'): ReturnCache<AllChannels | undefined>;
     /**
      * Retrieves the avatar URL of the webhook.
      * @param options The image options for the avatar.

package/lib/structures/Webhook.js

@@ -30,25 +30,25 @@ class Webhook extends DiscordBase_1.DiscordBase {
             messages: Webhook.messages({ client, webhookId: this.id, webhookToken: this.token }),
         });
     }
-    /**
-     * Fetches the guild associated with the webhook.
-     * @param force Whether to force fetching the guild even if it's already cached.
-     * @returns A promise that resolves to the guild associated with the webhook, or undefined if not applicable.
-     */
-    async guild(force = false) {
-        if (!this.sourceGuild?.id)
-            return;
-        return this.client.guilds.fetch(this.sourceGuild.id, force);
+    guild(mode = 'flow') {
+        if (!this.guildId)
+            return mode === 'cache' ? (this.client.cache.adapter.isAsync ? Promise.resolve() : undefined) : Promise.resolve();
+        switch (mode) {
+            case 'cache':
+                return (this.client.cache.guilds?.get(this.guildId) ||
+                    (this.client.cache.adapter.isAsync ? Promise.resolve() : undefined));
+            default:
+                return this.client.guilds.fetch(this.guildId, mode === 'rest');
+        }
     }
-    /**
-     * Fetches the channel associated with the webhook.
-     * @param force Whether to force fetching the channel even if it's already cached.
-     * @returns A promise that resolves to the channel associated with the webhook, or undefined if not applicable.
-     */
-    async channel(force = false) {
-        if (!this.sourceChannel?.id)
-            return;
-        return this.client.channels.fetch(this.sourceChannel.id, force);
+    channel(mode = 'flow') {
+        switch (mode) {
+            case 'cache':
+                return (this.client.cache.channels?.get(this.channelId) ||
+                    (this.client.cache.adapter.isAsync ? Promise.resolve() : undefined));
+            default:
+                return this.client.channels.fetch(this.channelId, mode === 'rest');
+        }
     }
     /**
      * Retrieves the avatar URL of the webhook.

package/lib/structures/channels.d.ts

@@ -14,7 +14,8 @@ export declare class BaseNoEditableChannel<T extends ChannelType> extends Discor
     static __intent__(id: string): 'DirectMessages' | 'Guilds';
     /** The URL to the channel */
     get url(): string;
-    fetch(force?: boolean): Promise<AllChannels>;
+    fetch(mode?: 'rest' | 'flow'): Promise<AllChannels>;
+    fetch(mode: 'cache'): ReturnCache<AllChannels | undefined>;
     delete(reason?: string): Promise<AllChannels>;
     toString(): `<#${string}>`;
     isStage(): this is StageChannel;
@@ -62,6 +63,7 @@ interface IChannelTypes {
 export interface BaseGuildChannel extends ObjectToLower<Omit<APIGuildChannel<ChannelType>, 'permission_overwrites'>> {
 }
 export declare class BaseGuildChannel extends BaseChannel<ChannelType> {
+    guildId: string;
     constructor(client: UsingClient, data: APIGuildChannel<ChannelType>);
     permissionOverwrites: {
         fetch: () => ReturnType<Overwrites["get"]>;
@@ -92,7 +94,8 @@ export declare class BaseGuildChannel extends BaseChannel<ChannelType> {
             guildId: string;
         } | undefined;
     }>;
-    guild(force?: boolean): Promise<GuildStructure<'api'>>;
+    guild(mode?: 'rest' | 'flow'): Promise<GuildStructure<'cached' | 'api'>>;
+    guild(mode: 'cache'): ReturnCache<GuildStructure<'cached'> | undefined>;
     get url(): string;
     setPosition(position: number, reason?: string): Promise<this>;
     setName(name: string, reason?: string): Promise<this>;
@@ -152,7 +155,7 @@ export declare class MessagesMethods extends DiscordBase {
     };
     static transformMessageBody<T>(body: MessageCreateBodyRequest | MessageUpdateBodyRequest, files: RawFile[] | undefined, self: UsingClient): T;
 }
-export interface TextBaseGuildChannel extends ObjectToLower<Omit<APITextChannel, 'type' | 'permission_overwrites'>>, MessagesMethods {
+export interface TextBaseGuildChannel extends ObjectToLower<Omit<APITextChannel, 'type' | 'permission_overwrites' | 'guild_id'>>, MessagesMethods {
 }
 export declare class TextBaseGuildChannel extends BaseGuildChannel {
 }
@@ -206,7 +209,7 @@ export declare class WebhookChannelMethods extends DiscordBase {
         create: (body: RESTPostAPIChannelWebhookJSONBody) => Promise<WebhookStructure>;
     };
 }
-export interface TextGuildChannel extends ObjectToLower<Omit<APITextChannel, 'type' | 'permission_overwrites'>>, BaseGuildChannel, TextBaseGuildChannel, WebhookChannelMethods {
+export interface TextGuildChannel extends ObjectToLower<Omit<APITextChannel, 'type' | 'permission_overwrites' | 'guild_id'>>, BaseGuildChannel, TextBaseGuildChannel, WebhookChannelMethods {
 }
 export declare class TextGuildChannel extends BaseGuildChannel {
     type: ChannelType.GuildText;
@@ -216,27 +219,29 @@ export interface DMChannel extends ObjectToLower<APIDMChannel>, MessagesMethods
 export declare class DMChannel extends BaseNoEditableChannel<ChannelType.DM> {
     type: ChannelType.DM;
 }
-export interface VoiceChannel extends ObjectToLower<Omit<APIGuildVoiceChannel, 'permission_overwrites'>>, Omit<TextGuildChannel, keyof BaseGuildChannel>, VoiceChannelMethods, WebhookChannelMethods {
+export interface VoiceChannel extends ObjectToLower<Omit<APIGuildVoiceChannel, 'permission_overwrites' | 'guild_id'>>, Omit<TextGuildChannel, keyof BaseGuildChannel>, VoiceChannelMethods, WebhookChannelMethods {
+    guildId: string;
 }
 export declare class VoiceChannel extends BaseGuildChannel {
     type: ChannelType.GuildVoice;
 }
-export interface StageChannel extends ObjectToLower<Omit<APIGuildStageVoiceChannel, 'type' | 'permission_overwrites'>>, TopicableGuildChannel, VoiceChannelMethods {
+export interface StageChannel extends ObjectToLower<Omit<APIGuildStageVoiceChannel, 'type' | 'permission_overwrites' | 'guild_id'>>, TopicableGuildChannel, VoiceChannelMethods {
+    guildId: string;
 }
 export declare class StageChannel extends BaseGuildChannel {
     type: ChannelType.GuildStageVoice;
 }
-export interface MediaChannel extends ObjectToLower<Omit<APIGuildMediaChannel, 'type' | 'permission_overwrites'>>, ThreadOnlyMethods {
+export interface MediaChannel extends ObjectToLower<Omit<APIGuildMediaChannel, 'type' | 'permission_overwrites' | 'guild_id'>>, ThreadOnlyMethods {
 }
 export declare class MediaChannel extends BaseGuildChannel {
     type: ChannelType.GuildMedia;
 }
-export interface ForumChannel extends ObjectToLower<Omit<APIGuildForumChannel, 'permission_overwrites'>>, Omit<ThreadOnlyMethods, 'type' | 'edit'>, WebhookChannelMethods {
+export interface ForumChannel extends ObjectToLower<Omit<APIGuildForumChannel, 'permission_overwrites' | 'guild_id'>>, Omit<ThreadOnlyMethods, 'type' | 'edit'>, WebhookChannelMethods {
 }
 export declare class ForumChannel extends BaseGuildChannel {
     type: ChannelType.GuildForum;
 }
-export interface ThreadChannel extends ObjectToLower<Omit<APIThreadChannel, 'permission_overwrites'>>, Omit<TextBaseGuildChannel, 'edit' | 'parentId'> {
+export interface ThreadChannel extends ObjectToLower<Omit<APIThreadChannel, 'permission_overwrites' | 'guild_id'>>, Omit<TextBaseGuildChannel, 'edit' | 'parentId'> {
 }
 export declare class ThreadChannel extends BaseChannel<ChannelType.PublicThread | ChannelType.AnnouncementThread | ChannelType.PrivateThread> {
     parentId: string;
@@ -256,13 +261,13 @@ export declare class ThreadChannel extends BaseChannel<ChannelType.PublicThread
     setInvitable(invitable?: boolean, reason?: string): Promise<this>;
     setLocked(locked?: boolean, reason?: string): Promise<this>;
 }
-export interface CategoryChannel extends ObjectToLower<Omit<APIGuildCategoryChannel, 'permission_overwrites'>> {
+export interface CategoryChannel extends ObjectToLower<Omit<APIGuildCategoryChannel, 'permission_overwrites' | 'guild_id'>> {
 }
 declare const CategoryChannel_base: ToClass<Omit<BaseGuildChannel, "setParent" | "type">, CategoryChannel>;
 export declare class CategoryChannel extends CategoryChannel_base {
     type: ChannelType.GuildCategory;
 }
-export interface NewsChannel extends ObjectToLower<Omit<APINewsChannel, 'permission_overwrites'>>, WebhookChannelMethods, Omit<TextGuildChannel, keyof BaseGuildChannel> {
+export interface NewsChannel extends ObjectToLower<Omit<APINewsChannel, 'permission_overwrites' | 'guild_id'>>, WebhookChannelMethods, Omit<TextGuildChannel, keyof BaseGuildChannel> {
 }
 export declare class NewsChannel extends BaseGuildChannel {
     type: ChannelType.GuildAnnouncement;

package/lib/structures/channels.js

@@ -26,8 +26,14 @@ class BaseNoEditableChannel extends DiscordBase_1.DiscordBase {
     get url() {
         return __1.Formatter.channelLink(this.id);
     }
-    fetch(force = false) {
-        return this.client.channels.fetch(this.id, force);
+    fetch(mode = 'flow') {
+        switch (mode) {
+            case 'cache':
+                return (this.client.cache.channels?.get(this.id) ||
+                    (this.client.cache.adapter.isAsync ? Promise.resolve() : undefined));
+            default:
+                return this.client.channels.fetch(this.id, mode === 'rest');
+        }
     }
     delete(reason) {
         return this.client.channels.delete(this.id, { reason });
@@ -122,8 +128,14 @@ class BaseGuildChannel extends BaseChannel {
     overwritesFor(member) {
         return this.client.channels.overwritesFor(this.id, member);
     }
-    guild(force = false) {
-        return this.client.guilds.fetch(this.guildId, force);
+    guild(mode = 'flow') {
+        switch (mode) {
+            case 'cache':
+                return (this.client.cache.guilds?.get(this.guildId) ||
+                    (this.client.cache.adapter.isAsync ? Promise.resolve() : undefined));
+            default:
+                return this.client.guilds.fetch(this.guildId, mode === 'rest');
+        }
     }
     get url() {
         return __1.Formatter.channelLink(this.id, this.guildId);

package/lib/structures/extra/BaseGuild.d.ts

@@ -1,3 +1,5 @@
+import type { ReturnCache } from '../../../src';
+import type { GuildStructure } from '../../client';
 import { type ObjectToLower } from '../../common';
 import type { ImageOptions } from '../../common/types/options';
 import { type APIPartialGuild } from '../../types';
@@ -17,7 +19,8 @@ export declare class BaseGuild extends DiscordBase<APIPartialGuild> {
     /**
      * Fetch guild on API
      */
-    fetch(): Promise<BaseGuild>;
+    fetch(mode?: 'rest' | 'flow'): Promise<GuildStructure<'cached' | 'api'>>;
+    fetch(mode: 'cache'): ReturnCache<GuildStructure<'cached'> | undefined>;
     /**
      * iconURL gets the current guild icon.
      * @link https://discord.com/developers/docs/reference#image-formatting

package/lib/structures/extra/BaseGuild.js

@@ -24,12 +24,14 @@ class BaseGuild extends DiscordBase_1.DiscordBase {
         }
         return this.features.includes(types_1.GuildFeature.Verified);
     }
-    /**
-     * Fetch guild on API
-     */
-    async fetch() {
-        const data = await this.api.guilds(this.id).get();
-        return new BaseGuild(this.client, data);
+    fetch(mode = 'flow') {
+        switch (mode) {
+            case 'cache':
+                return (this.client.cache.guilds?.get(this.id) ||
+                    (this.client.cache.adapter.isAsync ? Promise.resolve() : undefined));
+            default:
+                return this.client.guilds.fetch(this.id, mode === 'rest');
+        }
     }
     /**
      * iconURL gets the current guild icon.

package/lib/websocket/discord/shard.js

@@ -305,6 +305,9 @@ class Shard {
         this.logger.warn(`${shared_1.ShardSocketCloseCodes[close.code] ?? types_1.GatewayCloseCodes[close.code] ?? close.code} (${close.code})`, close.reason);
         switch (close.code) {
             case shared_1.ShardSocketCloseCodes.Shutdown:
+            case shared_1.ShardSocketCloseCodes.Reconnect:
+            case shared_1.ShardSocketCloseCodes.Resharding:
+            case shared_1.ShardSocketCloseCodes.ShutdownAll:
                 //Force disconnect, ignore
                 break;
             case 1000:

package/package.json

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