seyfert 0.1.0 → 1.0.1

package/lib/index.js

@@ -14,23 +14,33 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extendContext = exports.config = exports.createEvent = exports.throwError = exports.WorkerManager = exports.ShardManager = exports.ModalCommand = exports.ComponentsListener = exports.ComponentCommand = exports.Watcher = exports.Logger = void 0;
+exports.extendContext = exports.config = exports.createEvent = exports.throwError = exports.WorkerManager = exports.ShardManager = exports.LimitedCollection = exports.Collection = exports.Watcher = exports.PermissionFlagsBits = exports.Logger = void 0;
 const common_1 = require("./common");
-__exportStar(require("./api"), exports);
-__exportStar(require("./builders"), exports);
-__exportStar(require("./client"), exports);
-__exportStar(require("./commands"), exports);
 var common_2 = require("./common");
 Object.defineProperty(exports, "Logger", { enumerable: true, get: function () { return common_2.Logger; } });
+Object.defineProperty(exports, "PermissionFlagsBits", { enumerable: true, get: function () { return common_2.PermissionFlagsBits; } });
 Object.defineProperty(exports, "Watcher", { enumerable: true, get: function () { return common_2.Watcher; } });
-var components_1 = require("./components");
-Object.defineProperty(exports, "ComponentCommand", { enumerable: true, get: function () { return components_1.ComponentCommand; } });
-Object.defineProperty(exports, "ComponentsListener", { enumerable: true, get: function () { return components_1.ComponentsListener; } });
-Object.defineProperty(exports, "ModalCommand", { enumerable: true, get: function () { return components_1.ModalCommand; } });
-__exportStar(require("./structures"), exports);
+//
+var collection_1 = require("./collection");
+Object.defineProperty(exports, "Collection", { enumerable: true, get: function () { return collection_1.Collection; } });
+Object.defineProperty(exports, "LimitedCollection", { enumerable: true, get: function () { return collection_1.LimitedCollection; } });
+//
+__exportStar(require("./api"), exports);
+__exportStar(require("./builders"), exports);
+__exportStar(require("./cache"), exports);
+__exportStar(require("./commands"), exports);
+__exportStar(require("./components"), exports);
+__exportStar(require("./events"), exports);
+__exportStar(require("./langs"), exports);
+//
 var discord_1 = require("./websocket/discord");
 Object.defineProperty(exports, "ShardManager", { enumerable: true, get: function () { return discord_1.ShardManager; } });
 Object.defineProperty(exports, "WorkerManager", { enumerable: true, get: function () { return discord_1.WorkerManager; } });
+//
+__exportStar(require("./structures"), exports);
+//
+__exportStar(require("./client"), exports);
+//
 function throwError(msg) {
     throw new Error(msg);
 }

package/lib/langs/handler.d.ts

@@ -1,11 +1,13 @@
-import type { DefaultLocale } from '../commands';
-import { BaseHandler } from '../common';
+import { BaseHandler, type LocaleString } from '../common';
 export declare class LangsHandler extends BaseHandler {
     values: Partial<Record<string, any>>;
     protected filter: (path: string) => boolean;
     defaultLang?: string;
+    aliases: [string, LocaleString[]][];
+    getLocale(locale: string): string;
     getKey(lang: string, message: string): string | undefined;
-    parse(str: string, metadata: Record<string, any>): string;
-    get(userLocale: string): DefaultLocale;
+    get(userLocale: string): import("./router").__InternalParseLocale<import("..").DefaultLocale> & {
+        get(locale?: string | undefined): import("..").DefaultLocale;
+    };
     load(dir: string): Promise<void>;
 }

package/lib/langs/handler.js

@@ -5,29 +5,31 @@ const common_1 = require("../common");
 const router_1 = require("./router");
 class LangsHandler extends common_1.BaseHandler {
     values = {};
-    filter = (path) => path.endsWith('.js') || path.endsWith('.ts');
+    filter = (path) => path.endsWith('.js') || (!path.endsWith('.d.ts') && path.endsWith('.ts')) || path.endsWith('.json');
     defaultLang;
+    aliases = [];
+    getLocale(locale) {
+        return this.aliases.find(([_key, aliases]) => aliases.includes(locale))?.[0] ?? locale;
+    }
     getKey(lang, message) {
         let value = this.values[lang];
         for (const i of message.split('.')) {
             value = value[i];
         }
         if (typeof value !== 'string') {
-            return undefined;
+            return;
         }
         return value;
     }
-    parse(str, metadata) {
-        const regex = /{{(.*?)}}/g;
-        return str.replace(regex, match => metadata[match.slice(2, -2)] ?? match);
-    }
     get(userLocale) {
-        return (0, router_1.LangRouter)(userLocale, this.defaultLang ?? userLocale, this.values)();
+        const locale = this.getLocale(userLocale);
+        return (0, router_1.LangRouter)(locale, this.defaultLang ?? locale, this.values)();
     }
     async load(dir) {
         const files = await this.loadFilesK(await this.getFiles(dir));
         for (const i of files) {
-            this.values[i.name.slice(0, -3)] = i.file;
+            const locale = i.name.split('.').slice(0, -1).join('.');
+            this.values[locale] = i.file;
         }
     }
 }

package/lib/langs/router.d.ts

@@ -1,18 +1,17 @@
 import type { DefaultLocale } from '../commands';
-export declare const LangRouter: (userLocale: string, defaultLang: string, langs: Partial<Record<string, any>>) => (route?: string[], args?: any[]) => DefaultLocale;
-type ParseLocale<T extends Record<string, any>> = {
+export declare const LangRouter: (userLocale: string, defaultLang: string, langs: Partial<Record<string, any>>) => (route?: string[], args?: any[]) => __InternalParseLocale<DefaultLocale> & {
+    get(locale?: string): DefaultLocale;
+};
+export type __InternalParseLocale<T extends Record<string, any>> = {
     [K in keyof T]: T[K] extends (...args: any[]) => any ? (...args: Parameters<T[K]>) => {
-        get(locale?: string): any;
+        get(locale?: string): ReturnType<T[K]>;
     } : T[K] extends string ? {
         get(locale?: string): T[K];
     } : T[K] extends unknown[] ? {
         get(locale?: string): T[K];
-    } : T[K] extends Record<string, any> ? ParseLocales<T[K]> & {
+    } : T[K] extends Record<string, any> ? __InternalParseLocale<T[K]> & {
         get(locale?: string): T[K];
     } : never;
 };
-export type ParseLocales<T extends Record<string, any>> = ParseLocale<T> & {
-    get(locale?: string): T;
-};
-export {};
-/**Code inspiration from: FreeAoi */
+export type ParseLocales<T extends Record<string, any>> = T;
+/**Idea inspiration from: FreeAoi */

package/lib/langs/router.js

@@ -18,14 +18,14 @@ const LangRouter = (userLocale, defaultLang, langs) => {
                         return value;
                     }
                     return (locale) => {
-                        let object;
+                        let result;
                         try {
-                            object = getValue(locale ?? userLocale);
+                            result = getValue(locale ?? userLocale);
                         }
                         catch {
-                            object = getValue(defaultLang);
+                            result = getValue(defaultLang);
                         }
-                        const value = typeof object === 'function' ? object(...args) : object;
+                        const value = typeof result === 'function' ? result(...args) : result;
                         return value;
                     };
                 }
@@ -39,4 +39,4 @@ const LangRouter = (userLocale, defaultLang, langs) => {
     return createProxy;
 };
 exports.LangRouter = LangRouter;
-/**Code inspiration from: FreeAoi */
+/**Idea inspiration from: FreeAoi */

package/lib/structures/ClientUser.d.ts

@@ -1,8 +1,5 @@
 import type { BaseClient } from '../client/base';
-import type { GatewayReadyDispatchData, MethodContext, RESTGetAPICurrentUserGuildsQuery, RESTPatchAPICurrentUserJSONBody } from '../common';
-import { AnonymousGuild } from './AnonymousGuild';
-import { Guild } from './Guild';
-import { GuildMember } from './GuildMember';
+import type { GatewayReadyDispatchData, RESTPatchAPICurrentUserJSONBody } from '../common';
 import { User } from './User';
 export declare class ClientUser extends User {
     application: GatewayReadyDispatchData['application'];
@@ -10,16 +7,4 @@ export declare class ClientUser extends User {
     constructor(client: BaseClient, data: GatewayReadyDispatchData['user'], application: GatewayReadyDispatchData['application']);
     fetch(): Promise<ClientUser>;
     edit(body: RESTPatchAPICurrentUserJSONBody): Promise<ClientUser>;
-    guilds: {
-        list: (query?: RESTGetAPICurrentUserGuildsQuery) => Promise<AnonymousGuild[]>;
-        fetch: (id: string) => Promise<Guild<"api">>;
-        fetchSelf: (id: string) => Promise<GuildMember>;
-        leave: (id: string) => Promise<void | undefined>;
-    };
-    static guilds(ctx: MethodContext): {
-        list: (query?: RESTGetAPICurrentUserGuildsQuery) => Promise<AnonymousGuild[]>;
-        fetch: (id: string) => Promise<Guild<"api">>;
-        fetchSelf: (id: string) => Promise<GuildMember>;
-        leave: (id: string) => Promise<void | undefined>;
-    };
 }

package/lib/structures/ClientUser.js

@@ -1,9 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ClientUser = void 0;
-const AnonymousGuild_1 = require("./AnonymousGuild");
-const Guild_1 = require("./Guild");
-const GuildMember_1 = require("./GuildMember");
 const User_1 = require("./User");
 class ClientUser extends User_1.User {
     application;
@@ -20,33 +17,5 @@ class ClientUser extends User_1.User {
         const data = await this.api.users('@me').patch({ body });
         return new ClientUser(this.client, data, this.application);
     }
-    guilds = ClientUser.guilds(this);
-    static guilds(ctx) {
-        return {
-            list: (query) => {
-                return ctx.client.proxy
-                    .users('@me')
-                    .guilds.get({ query })
-                    .then(guilds => guilds.map(guild => new AnonymousGuild_1.AnonymousGuild(ctx.client, { ...guild, splash: null })));
-            },
-            fetch: async (id) => {
-                const guild = await ctx.client.proxy.guilds(id).get();
-                await ctx.client.cache.guilds?.patch(id, guild);
-                return new Guild_1.Guild(ctx.client, guild);
-            },
-            fetchSelf: async (id) => {
-                const self = await ctx.client.proxy.users('@me').guilds(id).member.get();
-                await ctx.client.cache.members?.patch(self.user.id, id, self);
-                return new GuildMember_1.GuildMember(ctx.client, self, self.user, id);
-            },
-            leave: (id) => {
-                return ctx.client.proxy
-                    .users('@me')
-                    .guilds(id)
-                    .delete()
-                    .then(() => ctx.client.cache.guilds?.removeIfNI('Guilds', id));
-            },
-        };
-    }
 }
 exports.ClientUser = ClientUser;

package/lib/structures/Guild.d.ts

@@ -21,7 +21,7 @@ export declare class Guild<State extends StructStates = 'api'> extends Guild_bas
     };
     get maxStickers(): MaxStickers;
     get maxEmojis(): MaxEmojis;
-    fetchOwner(force?: boolean): Promise<GuildMember> | Promise<null>;
+    fetchOwner(force?: boolean): Promise<null> | Promise<GuildMember>;
     templates: {
         fetch: (code: string) => Promise<import("discord-api-types/payloads/v10/template").APITemplate>;
         list: () => Promise<import("discord-api-types/rest/v10/template").RESTGetAPIGuildTemplatesResult>;

package/lib/structures/GuildMember.d.ts

@@ -25,12 +25,23 @@ export declare class BaseGuildMember extends DiscordBase {
     ban(body?: RESTPutAPIGuildBanJSONBody, reason?: string): Promise<void>;
     kick(reason?: string): Promise<void>;
     edit(body: RESTPatchAPIGuildMemberJSONBody, reason?: string): Promise<GuildMember>;
+    presence(): import("..").ReturnCache<(Omit<import("discord-api-types/payloads/v10/gateway").GatewayPresenceUpdate, "user"> & {
+        id: string;
+    } & {
+        guild_id: string;
+    }) | undefined>;
+    voice(): import("..").ReturnCache<(Omit<import("discord-api-types/payloads/v10/voice").GatewayVoiceState, "member"> & {
+        guild_id: string;
+    } & {
+        guild_id: string;
+    }) | undefined>;
     toString(): string;
     private patch;
     get roles(): {
         values: readonly string[];
         add: (id: string) => Promise<void>;
         remove: (id: string) => Promise<void>;
+        permissions: () => Promise<PermissionsBitField>;
     };
     static methods({ client, guildId }: MethodContext<{
         guildId: string;
@@ -70,6 +81,7 @@ export declare class GuildMember extends BaseGuildMember {
     write(body: MessageCreateBodyRequest): Promise<import("./Message").Message>;
     avatarURL(options?: ImageOptions): string;
     dynamicAvatarURL(options?: ImageOptions): string;
+    fetchPermissions(): Promise<PermissionsBitField>;
 }
 export interface UnavailableMember {
     pending: true;

package/lib/structures/GuildMember.js

@@ -33,6 +33,12 @@ class BaseGuildMember extends DiscordBase_1.DiscordBase {
     edit(body, reason) {
         return this.client.members.edit(this.guildId, this.id, body, reason);
     }
+    presence() {
+        return this.cache.presences?.get(this.id);
+    }
+    voice() {
+        return this.cache.voiceStates?.get(this.id, this.guildId);
+    }
     toString() {
         return `<@${this.id}>`;
     }
@@ -51,6 +57,9 @@ class BaseGuildMember extends DiscordBase_1.DiscordBase {
             values: Object.freeze(this._roles),
             add: (id) => this.client.members.roles.add(this.guildId, this.id, id),
             remove: (id) => this.client.members.roles.remove(this.guildId, this.id, id),
+            permissions: async () => new Permissions_1.PermissionsBitField(((await this.cache.roles?.bulk(this.roles.values)) ?? [])
+                .filter(x => x)
+                .map(x => BigInt(x.permissions.bits))),
         };
     }
     static methods({ client, guildId }) {
@@ -116,6 +125,11 @@ class GuildMember extends BaseGuildMember {
         }
         return this.rest.cdn.guildMemberAvatar(this.guildId, this.id, this.avatar, options);
     }
+    async fetchPermissions() {
+        if ('permissions' in this)
+            return this.permissions;
+        return this.roles.permissions();
+    }
 }
 exports.GuildMember = GuildMember;
 class UnavailableMember extends BaseGuildMember {

package/lib/structures/GuildRole.d.ts

@@ -1,12 +1,14 @@
 import type { BaseClient } from '../client/base';
 import type { APIRole, MethodContext, ObjectToLower, RESTPatchAPIGuildRoleJSONBody, RESTPatchAPIGuildRolePositionsJSONBody, RESTPostAPIGuildRoleJSONBody } from '../common';
 import { DiscordBase } from './extra/DiscordBase';
-export interface GuildRole extends DiscordBase, ObjectToLower<APIRole> {
+import { PermissionsBitField } from './extra/Permissions';
+export interface GuildRole extends DiscordBase, ObjectToLower<Omit<APIRole, 'permissions'>> {
 }
 export declare class GuildRole extends DiscordBase {
     readonly guildId: string;
+    permissions: PermissionsBitField;
     constructor(client: BaseClient, data: APIRole, guildId: string);
-    guild(force?: boolean): Promise<import("./Guild").Guild<"cached"> | import("./Guild").Guild<"api"> | undefined>;
+    guild(force?: boolean): Promise<import("./Guild").Guild<"cached"> | import("./Guild").Guild<"api">> | undefined;
     edit(body: RESTPatchAPIGuildRoleJSONBody, reason?: string): Promise<any>;
     delete(reason?: string): Promise<void | undefined>;
     static methods(ctx: MethodContext<{

package/lib/structures/GuildRole.js

@@ -2,13 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GuildRole = void 0;
 const DiscordBase_1 = require("./extra/DiscordBase");
+const Permissions_1 = require("./extra/Permissions");
 class GuildRole extends DiscordBase_1.DiscordBase {
     guildId;
+    permissions;
     constructor(client, data, guildId) {
         super(client, data);
         this.guildId = guildId;
+        this.permissions = new Permissions_1.PermissionsBitField(BigInt(data.permissions));
     }
-    async guild(force = false) {
+    guild(force = false) {
         if (!this.guildId)
             return;
         return this.client.guilds.fetch(this.guildId, force);

package/lib/structures/GuildTemplate.js

@@ -7,7 +7,7 @@ class GuildTemplate extends Base_1.Base {
         super(client);
         this.__patchThis(data);
     }
-    async guild(force = false) {
+    guild(force = false) {
         return this.client.guilds.fetch(this.sourceGuildId, force);
     }
     async fetch() {

package/lib/structures/Interaction.d.ts

@@ -34,6 +34,7 @@ export declare class BaseInteraction<FromGuild extends boolean = boolean, Type e
     reply(body: ReplyInteractionBody): Promise<void>;
     deferReply(flags?: MessageFlags): Promise<void>;
     static from(client: BaseClient, gateway: GatewayInteractionCreateDispatchData, __reply?: __InternalReplyFunction): StringSelectMenuInteraction<string[]> | AutocompleteInteraction<boolean> | BaseInteraction<boolean, import("discord-api-types/payloads/v10/_interactions/ping").APIPingInteraction>;
+    fetchGuild(force?: boolean): Promise<import("./Guild").Guild<"cached"> | import("./Guild").Guild<"api">> | undefined;
 }
 export type AllInteractions = AutocompleteInteraction | ChatInputCommandInteraction | UserCommandInteraction | MessageCommandInteraction | ComponentInteraction | SelectMenuInteraction | ModalSubmitInteraction | BaseInteraction;
 export interface AutocompleteInteraction extends ObjectToLower<Omit<APIApplicationCommandAutocompleteInteraction, 'user' | 'member' | 'type' | 'data' | 'message' | 'channel' | 'app_permissions'>> {
@@ -72,6 +73,7 @@ export declare class ComponentInteraction<FromGuild extends boolean = boolean, T
     channelId: string;
     channel: AllChannels;
     type: InteractionType.MessageComponent;
+    message: Message;
     update(data: ComponentInteractionMessageUpdate): Promise<void>;
     deferUpdate(): Promise<void>;
     get customId(): string;

package/lib/structures/Interaction.js

@@ -14,7 +14,6 @@ const ts_mixer_1 = require("ts-mixer");
 const builders_1 = require("../builders");
 const commands_1 = require("../commands");
 const common_1 = require("../common");
-const listener_1 = require("../components/listener");
 const _1 = require("./");
 const GuildRole_1 = require("./GuildRole");
 const Message_1 = require("./Message");
@@ -59,12 +58,12 @@ class BaseInteraction extends DiscordBase_1.DiscordBase {
             case common_1.InteractionResponseType.UpdateMessage:
                 return {
                     type: body.type,
+                    // @ts-ignore
                     data: {
+                        // @ts-ignore
                         ...(body.data ?? {}),
-                        // @ts-expect-error
-                        components: (body.data?.components instanceof listener_1.ComponentsListener
-                            ? body.data.components.components
-                            : body.data.components)?.map(x => (x instanceof builders_1.ActionRow ? x.toJSON() : x)) ?? undefined,
+                        // @ts-ignore
+                        components: body.data?.components?.map(x => (x instanceof builders_1.ActionRow ? x.toJSON() : x)) ?? undefined,
                         embeds: body.data?.embeds?.map(x => (x instanceof builders_1.Embed ? x.toJSON() : x)) ?? undefined,
                         attachments: body.data?.attachments?.map((x, i) => ({ id: i, ...(0, builders_1.resolveAttachment)(x) })) ?? undefined,
                     },
@@ -90,7 +89,7 @@ class BaseInteraction extends DiscordBase_1.DiscordBase {
     static transformBody(body) {
         return {
             ...body,
-            components: (body?.components instanceof listener_1.ComponentsListener ? body.components.components : body.components)?.map(x => x instanceof builders_1.ActionRow ? x.toJSON() : x) ?? undefined,
+            components: body.components?.map(x => (x instanceof builders_1.ActionRow ? x.toJSON() : x)) ?? undefined,
             embeds: body?.embeds?.map(x => (x instanceof builders_1.Embed ? x.toJSON() : x)) ?? undefined,
             // attachments: body.attachments?.map((x, i) => ({ id: i, ...resolveAttachment(x) })) ?? undefined,
         };
@@ -115,11 +114,10 @@ class BaseInteraction extends DiscordBase_1.DiscordBase {
         }
         else
             this.matchReplied(body.data, body.type);
-        this.client.components.onRequestInteraction(body.type === common_1.InteractionResponseType.Modal
-            ? this.user.id
-            : body.type === common_1.InteractionResponseType.UpdateMessage
-                ? this.message.interaction.id
-                : this.id, body);
+        // @ts-expect-error
+        if (body.data instanceof builders_1.Modal)
+            // @ts-expect-error
+            this.client.components.modals.set(this.user.id, body.data.__exec);
         await this.replied;
     }
     deferReply(flags) {
@@ -166,6 +164,9 @@ class BaseInteraction extends DiscordBase_1.DiscordBase {
                 return new BaseInteraction(client, gateway);
         }
     }
+    fetchGuild(force = false) {
+        return this.guildId ? this.client.guilds.fetch(this.guildId, force) : undefined;
+    }
 }
 exports.BaseInteraction = BaseInteraction;
 class AutocompleteInteraction extends BaseInteraction {
@@ -226,7 +227,6 @@ class Interaction extends BaseInteraction {
             body: BaseInteraction.transformBody(data),
             files: files ? await (0, builders_1.resolveFiles)(files) : undefined,
         });
-        this.client.components.onRequestInteractionUpdate(body, apiMessage);
         return new Message_1.Message(this.client, apiMessage);
     }
     editResponse(body) {
@@ -250,7 +250,6 @@ class Interaction extends BaseInteraction {
             body: BaseInteraction.transformBody(body),
             files: files,
         });
-        this.client.components.onRequestMessage(body, apiMessage);
         return new Message_1.Message(this.client, apiMessage);
     }
 }

package/lib/structures/Message.d.ts

@@ -1,3 +1,4 @@
+import type { ListenerOptions } from '../builders';
 import type { BaseClient } from '../client/base';
 import type { APIChannelMention, APIMessage, GatewayMessageCreateDispatchData, ObjectToLower } from '../common';
 import type { EmojiResolvable } from '../common/types/resolvables';
@@ -23,8 +24,12 @@ export declare class BaseMessage extends DiscordBase {
         users: (GuildMember | User)[];
     };
     constructor(client: BaseClient, data: MessageData);
+    createComponentCollector(options?: ListenerOptions): {
+        run: (customId: string, callback: import("../builders").ComponentCallback) => any;
+        stop: (reason?: string | undefined) => void;
+    };
     get url(): string;
-    guild(force?: boolean): Promise<import("./Guild").Guild<"cached"> | import("./Guild").Guild<"api"> | undefined>;
+    guild(force?: boolean): Promise<import("./Guild").Guild<"cached"> | import("./Guild").Guild<"api">> | undefined;
     channel(force?: boolean): Promise<import("./channels").AllChannels>;
     react(emoji: EmojiResolvable): Promise<never>;
     private patch;
@@ -34,7 +39,7 @@ export interface Message extends BaseMessage, ObjectToLower<Omit<MessageData, 't
 export declare class Message extends BaseMessage {
     constructor(client: BaseClient, data: MessageData);
     fetch(): Promise<Message>;
-    reply(body: Omit<MessageCreateBodyRequest, 'message_reference'>): Promise<Message>;
+    reply(body: Omit<MessageCreateBodyRequest, 'message_reference'>, fail?: boolean): Promise<Message>;
     edit(body: MessageUpdateBodyRequest): Promise<Message>;
     write(body: MessageCreateBodyRequest): Promise<Message>;
     delete(reason?: string): Promise<void>;

package/lib/structures/Message.js

@@ -23,10 +23,13 @@ class BaseMessage extends DiscordBase_1.DiscordBase {
         this.components = data.components?.map(x => new ActionRow_1.MessageActionRowComponent(x)) ?? [];
         this.patch(data);
     }
+    createComponentCollector(options) {
+        return this.client.components.createComponentCollector(this.id, options);
+    }
     get url() {
         return (0, functions_1.messageLink)(this.channelId, this.id, this.guildId);
     }
-    async guild(force = false) {
+    guild(force = false) {
         if (!this.guildId)
             return;
         return this.client.guilds.fetch(this.guildId, force);
@@ -74,14 +77,14 @@ class Message extends BaseMessage {
     fetch() {
         return this.client.messages.fetch(this.id, this.channelId);
     }
-    reply(body) {
+    reply(body, fail = true) {
         return this.write({
             ...body,
             message_reference: {
                 message_id: this.id,
                 channel_id: this.channelId,
                 guild_id: this.guildId,
-                fail_if_not_exists: true,
+                fail_if_not_exists: fail,
             },
         });
     }

package/lib/structures/Sticker.d.ts

@@ -8,7 +8,7 @@ export interface Sticker extends DiscordBase, ObjectToLower<Omit<APISticker, 'us
 export declare class Sticker extends DiscordBase {
     user?: User;
     constructor(client: BaseClient, data: APISticker);
-    guild(force?: boolean): Promise<import("./Guild").Guild<"cached"> | import("./Guild").Guild<"api"> | undefined>;
+    guild(force?: boolean): Promise<import("./Guild").Guild<"cached"> | import("./Guild").Guild<"api">> | undefined;
     edit(body: RESTPatchAPIGuildStickerJSONBody, reason?: string): Promise<Sticker> | undefined;
     fetch(force?: boolean): Promise<Sticker> | undefined;
     delete(reason?: string): Promise<void> | undefined;

package/lib/structures/Sticker.js

@@ -11,7 +11,7 @@ class Sticker extends DiscordBase_1.DiscordBase {
             this.user = new User_1.User(this.client, data.user);
         }
     }
-    async guild(force = false) {
+    guild(force = false) {
         if (!this.guildId)
             return;
         return this.client.guilds.fetch(this.id, force);

package/lib/structures/User.d.ts

@@ -16,5 +16,10 @@ export declare class User extends DiscordBase<APIUser> {
     dm(force?: boolean): Promise<import("./channels").DMChannel>;
     write(body: MessageCreateBodyRequest): Promise<import("./Message").Message>;
     avatarURL(options?: ImageOptions): string;
+    presence(): import("..").ReturnCache<(Omit<import("discord-api-types/payloads/v10/gateway").GatewayPresenceUpdate, "user"> & {
+        id: string;
+    } & {
+        guild_id: string;
+    }) | undefined>;
     toString(): string;
 }

package/lib/structures/User.js

@@ -30,6 +30,9 @@ class User extends DiscordBase_1.DiscordBase {
         }
         return this.rest.cdn.avatar(this.id, this.avatar, options);
     }
+    presence() {
+        return this.cache.presences?.get(this.id);
+    }
     toString() {
         return `<@${this.id}>`;
     }

package/lib/structures/Webhook.d.ts

@@ -10,7 +10,7 @@ export declare class Webhook extends DiscordBase {
     sourceGuild?: Partial<AnonymousGuild>;
     messages: ReturnType<typeof Webhook.messages>;
     constructor(client: BaseClient, data: APIWebhook);
-    guild(force?: boolean): Promise<import("./Guild").Guild<"cached"> | import("./Guild").Guild<"api"> | undefined>;
+    guild(force?: boolean): Promise<import("./Guild").Guild<"cached"> | import("./Guild").Guild<"api">> | undefined;
     channel(force?: boolean): Promise<import("./channels").BaseChannel<import("discord-api-types/payloads/v10/channel").ChannelType> | import("./channels").DMChannel | import("./channels").CategoryChannel | undefined>;
     avatarURL(options?: ImageOptions): string | null;
     fetch(): Promise<Webhook>;

package/lib/structures/Webhook.js

@@ -20,7 +20,7 @@ class Webhook extends DiscordBase_1.DiscordBase {
             messages: Webhook.messages({ client, webhookId: this.id, webhookToken: this.token }),
         });
     }
-    async guild(force = false) {
+    guild(force = false) {
         if (!this.sourceGuild?.id)
             return;
         return this.client.guilds.fetch(this.sourceGuild.id, force);