seyfert 4.5.0 → 5.0.0

package/lib/structures/GuildBan.js

@@ -10,8 +10,8 @@ class GuildBan extends DiscordBase_1.DiscordBase {
         super(client, { ...data, id });
         this.guildId = guildId;
     }
-    create(body, reason) {
-        return this.client.bans.create(this.guildId, this.id, body, reason);
+    create(options) {
+        return this.client.bans.create(this.guildId, this.id, options);
     }
     remove(reason) {
         return this.client.bans.remove(this.guildId, this.id, reason);
@@ -35,7 +35,7 @@ class GuildBan extends DiscordBase_1.DiscordBase {
         return {
             fetch: (userId, force = false) => client.bans.fetch(guildId, userId, force),
             list: (query, force = false) => client.bans.list(guildId, query, force),
-            create: (memberId, body, reason) => client.bans.create(guildId, memberId, body, reason),
+            create: (memberId, options) => client.bans.create(guildId, memberId, options),
             remove: (memberId, reason) => client.bans.remove(guildId, memberId, reason),
             bulkCreate: (body, reason) => client.bans.bulkCreate(guildId, body, reason),
         };

package/lib/structures/GuildMember.d.ts

@@ -3,8 +3,8 @@ export type GuildMemberData = APIGuildMember | Omit<APIGuildMember, 'user'> | Ga
 import type { GuildRoleStructure, ReturnCache } from '../';
 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 } from '../common';
-import type { APIGuildMember, APIInteractionDataResolvedGuildMember, APIUser, GatewayGuildMemberAddDispatchData, GatewayGuildMemberUpdateDispatchData, RESTGetAPIGuildMembersQuery, RESTGetAPIGuildMembersSearchQuery, RESTPatchAPIGuildMemberJSONBody, RESTPutAPIGuildBanJSONBody, RESTPutAPIGuildMemberJSONBody } from '../types';
+import { type BanOptions, type GuildMemberResolvable, type ImageOptions, type MessageCreateBodyRequest, type MethodContext, type ObjectToLower } from '../common';
+import type { APIGuildMember, APIInteractionDataResolvedGuildMember, APIUser, GatewayGuildMemberAddDispatchData, GatewayGuildMemberUpdateDispatchData, RESTGetAPIGuildMembersQuery, RESTGetAPIGuildMembersSearchQuery, RESTPatchAPIGuildMemberJSONBody, RESTPutAPIGuildMemberJSONBody } from '../types';
 import { PermissionsBitField } from './extra/Permissions';
 export interface BaseGuildMember extends DiscordBase, ObjectToLower<Omit<APIGuildMember, 'user' | 'roles'>> {
 }
@@ -20,7 +20,7 @@ export declare class BaseGuildMember extends DiscordBase {
     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>;
+    ban(options?: BanOptions): Promise<void>;
     kick(reason?: string): Promise<void>;
     edit(body: RESTPatchAPIGuildMemberJSONBody, reason?: string): Promise<GuildMemberStructure>;
     presence(): ReturnCache<(Omit<import("../types").GatewayPresenceUpdate, "user"> & {
@@ -36,21 +36,21 @@ export declare class BaseGuildMember extends DiscordBase {
     get hasTimeout(): false | number;
     private patch;
     get roles(): {
-        keys: string[];
+        keys: readonly string[];
         list: (force?: boolean) => Promise<GuildRoleStructure[]>;
         add: (id: string) => Promise<undefined>;
         remove: (id: string) => Promise<undefined>;
         permissions: (force?: boolean) => Promise<PermissionsBitField>;
         sorted: (force?: boolean) => Promise<GuildRoleStructure[]>;
-        highest: (force?: boolean) => Promise<GuildRoleStructure>;
+        highest: (force?: boolean) => Promise<GuildRoleStructure | undefined>;
     };
     static methods({ client, guildId }: MethodContext<{
         guildId: string;
     }>): {
         resolve: (resolve: GuildMemberResolvable) => Promise<GuildMemberStructure | undefined>;
-        search: (query?: RESTGetAPIGuildMembersSearchQuery) => Promise<GuildMemberStructure[]>;
+        search: (query: RESTGetAPIGuildMembersSearchQuery) => Promise<GuildMemberStructure[]>;
         unban: (id: string, reason?: string) => Promise<undefined>;
-        ban: (id: string, body?: RESTPutAPIGuildBanJSONBody, reason?: string) => Promise<void>;
+        ban: (id: string, options?: BanOptions) => Promise<void>;
         kick: (id: string, reason?: string) => Promise<void>;
         edit: (id: string, body: RESTPatchAPIGuildMemberJSONBody, reason?: string) => Promise<GuildMemberStructure>;
         add: (id: string, body: RESTPutAPIGuildMemberJSONBody) => Promise<GuildMemberStructure | undefined>;

package/lib/structures/GuildMember.js

@@ -31,8 +31,8 @@ class BaseGuildMember extends DiscordBase_1.DiscordBase {
     fetch(force = false) {
         return this.client.members.fetch(this.guildId, this.id, force);
     }
-    ban(body, reason) {
-        return this.client.members.ban(this.guildId, this.id, body, reason);
+    ban(options) {
+        return this.client.members.ban(this.guildId, this.id, options);
     }
     kick(reason) {
         return this.client.members.kick(this.guildId, this.id, reason);
@@ -81,7 +81,7 @@ class BaseGuildMember extends DiscordBase_1.DiscordBase {
             remove: (id) => this.client.members.removeRole(this.guildId, this.id, id),
             permissions: (force = false) => this.roles.list(force).then(roles => new Permissions_1.PermissionsBitField(roles.map(x => BigInt(x.permissions.bits)))),
             sorted: (force = false) => this.roles.list(force).then(roles => roles.sort((a, b) => b.position - a.position)),
-            highest: (force = false) => this.roles.sorted(force).then(roles => roles[0]),
+            highest: (force = false) => this.roles.sorted(force).then(roles => roles.at(0)),
         };
     }
     static methods({ client, guildId }) {
@@ -89,7 +89,7 @@ class BaseGuildMember extends DiscordBase_1.DiscordBase {
             resolve: (resolve) => client.members.resolve(guildId, resolve),
             search: (query) => client.members.search(guildId, query),
             unban: (id, reason) => client.members.unban(guildId, id, reason),
-            ban: (id, body, reason) => client.members.ban(guildId, id, body, reason),
+            ban: (id, options) => client.members.ban(guildId, id, options),
             kick: (id, reason) => client.members.kick(guildId, id, reason),
             edit: (id, body, reason) => client.members.edit(guildId, id, body, reason),
             add: (id, body) => client.members.add(guildId, id, body),
@@ -162,15 +162,36 @@ class GuildMember extends BaseGuildMember {
         return this.roles.permissions(force);
     }
     async manageable(force = false) {
-        this.__me = await this.client.guilds.fetchSelf(this.guildId, force);
-        const ownerId = (await this.client.guilds.fetch(this.guildId, force)).ownerId;
+        const [me, guild] = await Promise.all([
+            this.client.guilds.fetchSelf(this.guildId, force),
+            this.client.guilds.fetch(this.guildId, force),
+        ]);
+        this.__me = me;
+        const ownerId = guild.ownerId;
         if (this.user.id === ownerId)
             return false;
         if (this.user.id === this.client.botId)
             return false;
         if (this.client.botId === ownerId)
             return true;
-        return (await this.__me.roles.highest()).position > (await this.roles.highest(force)).position;
+        const highestFromCompleteRoles = async (member, forceRoles) => {
+            const roles = await member.roles.sorted(forceRoles);
+            const roleIds = new Set(roles.map(role => role.id));
+            if (!member.roles.keys.every(roleId => roleIds.has(roleId)))
+                return;
+            return roles.at(0);
+        };
+        const myHighest = await highestFromCompleteRoles(me, force);
+        const theirHighest = await highestFromCompleteRoles(this, force);
+        if (myHighest && theirHighest)
+            return myHighest.position > theirHighest.position;
+        if (force)
+            return false;
+        const forcedMyHighest = await highestFromCompleteRoles(me, true);
+        const forcedTheirHighest = await highestFromCompleteRoles(this, true);
+        if (!forcedMyHighest || !forcedTheirHighest)
+            return false;
+        return forcedMyHighest.position > forcedTheirHighest.position;
     }
     async bannable(force = false) {
         return (await this.manageable(force)) && (await this.__me.fetchPermissions(force)).has(['BanMembers']);

package/lib/structures/GuildRole.d.ts

@@ -14,7 +14,7 @@ export declare class GuildRole extends DiscordBase {
     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>;
+    edit(body: RESTPatchAPIGuildRoleJSONBody, reason?: string): Promise<GuildRoleStructure>;
     delete(reason?: string): Promise<void>;
     toString(): `<@&${string}>`;
     static methods(ctx: MethodContext<{

package/lib/structures/GuildRole.js

@@ -24,8 +24,8 @@ class GuildRole extends DiscordBase_1.DiscordBase {
     fetch(force = false) {
         return this.client.roles.fetch(this.guildId, this.id, force);
     }
-    edit(body) {
-        return this.client.roles.edit(this.guildId, this.id, body);
+    edit(body, reason) {
+        return this.client.roles.edit(this.guildId, this.id, body, reason);
     }
     delete(reason) {
         return this.client.roles.delete(this.guildId, this.id, reason);

package/lib/structures/Interaction.d.ts

@@ -4,7 +4,7 @@ import type { ReturnCache } from '../cache';
 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';
 import { type ComponentInteractionMessageUpdate, type InteractionCreateBodyRequest, type InteractionMessageUpdateBodyRequest, type MessageCreateBodyRequest, type MessageUpdateBodyRequest, type MessageWebhookCreateBodyRequest, type ModalCreateBodyRequest, type ModalCreateOptions, type ObjectToLower, type OmitInsert, type ToClass, type When } from '../common';
-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 ModalSubmitInsideLabelData, type RESTPostAPIInteractionCallbackJSONBody, type RESTPostAPIInteractionCallbackResult } from '../types';
+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 ModalSubmitInsideLabelData, type RESTPostAPIInteractionCallbackJSONBody } from '../types';
 import { type AllChannels } from './';
 import { DiscordBase } from './extra/DiscordBase';
 import { PermissionsBitField } from './extra/Permissions';
@@ -30,7 +30,8 @@ export declare class BaseInteraction<FromGuild extends boolean = boolean, Type e
     member: When<FromGuild, InteractionGuildMemberStructure, undefined>;
     channel?: AllChannels;
     message?: MessageStructure;
-    replied?: Promise<boolean | RESTPostAPIInteractionCallbackResult | undefined> | boolean;
+    replied?: boolean;
+    private _repliedPromise?;
     deferred?: boolean;
     appPermissions: PermissionsBitField;
     entitlements: EntitlementStructure[];
@@ -38,6 +39,7 @@ export declare class BaseInteraction<FromGuild extends boolean = boolean, Type e
     static transformBodyRequest(body: ReplyInteractionBody, files: RawFile[] | undefined, self: UsingClient): APIInteractionResponse;
     static transformBody<T>(body: InteractionCreateBodyRequest | InteractionMessageUpdateBodyRequest | MessageUpdateBodyRequest | MessageCreateBodyRequest | MessageWebhookCreateBodyRequest, files: RawFile[] | undefined, self: UsingClient): T;
     private matchReplied;
+    protected hasRepliedOrAwaitPendingReply(): Promise<boolean>;
     reply<WR extends boolean = false>(body: ReplyInteractionBody, withResponse?: WR): Promise<When<WR, WebhookMessageStructure, undefined>>;
     deferReply<WR extends boolean = false>(flags?: MessageFlags, withResponse?: WR): Promise<When<WR, WebhookMessageStructure, undefined>>;
     isButton(): this is ButtonInteraction;
@@ -52,14 +54,14 @@ export declare class BaseInteraction<FromGuild extends boolean = boolean, Type e
     isAutocomplete(): this is AutocompleteInteraction;
     isModal(): this is ModalSubmitInteraction;
     isEntryPoint(): this is EntryPointInteraction;
-    static from(client: UsingClient, gateway: GatewayInteractionCreateDispatchData, __reply?: __InternalReplyFunction): ModalSubmitInteraction<boolean> | ButtonInteraction | ChannelSelectMenuInteraction | RoleSelectMenuInteraction | MentionableSelectMenuInteraction | UserSelectMenuInteraction | StringSelectMenuInteraction<string[]> | ChatInputCommandInteraction<boolean> | UserCommandInteraction<boolean> | MessageCommandInteraction<boolean> | AutocompleteInteraction<boolean> | BaseInteraction<boolean, import("../types").APIPingInteraction> | undefined;
+    static from(client: UsingClient, gateway: GatewayInteractionCreateDispatchData, __reply?: __InternalReplyFunction): ModalSubmitInteraction<boolean> | ButtonInteraction | ChannelSelectMenuInteraction | RoleSelectMenuInteraction | MentionableSelectMenuInteraction | UserSelectMenuInteraction | StringSelectMenuInteraction<string[]> | ChatInputCommandInteraction<boolean> | UserCommandInteraction<boolean> | MessageCommandInteraction<boolean> | AutocompleteInteraction<boolean, string | number> | BaseInteraction<boolean, APIApplicationCommandInteraction>;
     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'>> {
+export interface AutocompleteInteraction<FromGuild extends boolean = boolean, ValueType extends string | number = string | number> extends ObjectToLower<Omit<APIApplicationCommandAutocompleteInteraction, 'user' | 'member' | 'type' | 'data' | 'message' | 'channel' | 'app_permissions'>> {
 }
-export declare class AutocompleteInteraction<FromGuild extends boolean = boolean> extends BaseInteraction<FromGuild, APIApplicationCommandAutocompleteInteraction> {
+export declare class AutocompleteInteraction<FromGuild extends boolean = boolean, ValueType extends string | number = string | number> extends BaseInteraction<FromGuild, APIApplicationCommandAutocompleteInteraction> {
     protected __reply?: __InternalReplyFunction | undefined;
     type: InteractionType.ApplicationCommandAutocomplete;
     data: ObjectToLower<APIApplicationCommandAutocompleteInteraction['data']>;
@@ -68,8 +70,8 @@ export declare class AutocompleteInteraction<FromGuild extends boolean = boolean
     channel: AllChannels;
     constructor(client: UsingClient, interaction: APIApplicationCommandAutocompleteInteraction, resolver?: OptionResolverStructure, __reply?: __InternalReplyFunction | undefined);
     getInput(): string;
-    respond(choices: APICommandAutocompleteInteractionResponseCallbackData['choices']): Promise<undefined>;
-    isAutocomplete(): this is AutocompleteInteraction;
+    respond(choices: APICommandAutocompleteInteractionResponseCallbackData<ValueType>['choices']): Promise<undefined>;
+    isAutocomplete(): this is AutocompleteInteraction<FromGuild, ValueType>;
     /** @intenal */
     reply(..._args: unknown[]): Promise<any>;
 }
@@ -97,7 +99,7 @@ export declare class ApplicationCommandInteraction<FromGuild extends boolean = b
  */
 export declare class EntryPointInteraction<FromGuild extends boolean = boolean> extends ApplicationCommandInteraction<FromGuild, APIEntryPointCommandInteraction> {
     channel: AllChannels;
-    withReponse(data?: InteractionCreateBodyRequest): Promise<EntryPointWithResponseResult>;
+    withResponse(data?: InteractionCreateBodyRequest): Promise<EntryPointWithResponseResult>;
     isEntryPoint(): this is EntryPointInteraction;
 }
 export interface EntryPointWithResponseResult {
@@ -197,7 +199,7 @@ export declare class ModalSubmitInteraction<FromGuild extends boolean = boolean>
     data: ObjectToLower<APIModalSubmission>;
     channel: AllChannels;
     update<WR extends boolean = false>(data: ComponentInteractionMessageUpdate, withResponse?: WR): Promise<When<WR, WebhookMessageStructure, undefined>>;
-    deferUpdate<WR extends boolean = false>(withResponse?: WR): Promise<When<WR, WebhookMessageStructure, undefined>>;
+    deferUpdate(): Promise<undefined>;
     get customId(): string;
     get components(): {
         type: ComponentType.Label;

package/lib/structures/Interaction.js

@@ -24,6 +24,7 @@ class BaseInteraction extends DiscordBase_1.DiscordBase {
     channel;
     message;
     replied;
+    _repliedPromise;
     deferred;
     appPermissions;
     entitlements;
@@ -52,7 +53,7 @@ class BaseInteraction extends DiscordBase_1.DiscordBase {
                 return body;
             case types_1.InteractionResponseType.ChannelMessageWithSource:
             case types_1.InteractionResponseType.UpdateMessage: {
-                //@ts-ignore
+                //@ts-expect-error
                 return {
                     type: body.type,
                     // @ts-expect-error
@@ -83,7 +84,7 @@ class BaseInteraction extends DiscordBase_1.DiscordBase {
             allowed_mentions: self.options?.allowedMentions,
             ...body,
             components: body.components?.map(x => (x instanceof builders_1.ActionRow ? x.toJSON() : x)),
-            embeds: body?.embeds?.map(x => (x instanceof builders_1.Embed ? x.toJSON() : x)),
+            embeds: body?.embeds?.map(x => ('toJSON' in x ? x.toJSON() : x)),
             poll: poll ? (poll instanceof builders_1.PollBuilder ? poll.toJSON() : poll) : undefined,
         };
         if (Array.isArray(body.attachments)) {
@@ -117,20 +118,38 @@ class BaseInteraction extends DiscordBase_1.DiscordBase {
             //@ts-expect-error
             const data = body.data instanceof builders_1.Modal ? body.data : rest;
             const parsedFiles = files ? await (0, builders_1.resolveFiles)(files) : undefined;
-            await (this.replied = this.__reply({
+            const repliedPromise = this.__reply({
                 body: BaseInteraction.transformBodyRequest({ data, type: body.type }, parsedFiles, this.client),
                 files: parsedFiles,
-            }).then(() => (this.replied = true)));
+            }).then(() => {
+                this.replied = true;
+                this._repliedPromise = undefined;
+            });
+            this._repliedPromise = repliedPromise;
+            await repliedPromise;
             return;
         }
-        const result = await (this.replied = this.client.interactions.reply(this.id, this.token, body, withResponse));
-        this.replied = true;
+        const repliedPromise = this.client.interactions.reply(this.id, this.token, body, withResponse).then(result => {
+            this.replied = true;
+            this._repliedPromise = undefined;
+            return result;
+        });
+        this._repliedPromise = repliedPromise;
+        const result = await repliedPromise;
         return result?.resource?.message
             ? transformers_1.Transformers.WebhookMessage(this.client, result.resource.message, this.id, this.token)
             : undefined;
     }
+    async hasRepliedOrAwaitPendingReply() {
+        const repliedPromise = this._repliedPromise;
+        if (!this.replied && !repliedPromise)
+            return false;
+        if (repliedPromise)
+            await repliedPromise;
+        return true;
+    }
     async reply(body, withResponse) {
-        if (this.replied) {
+        if (this.replied || this._repliedPromise) {
             throw new common_1.SeyfertError('INTERACTION_ALREADY_REPLIED', { metadata: { detail: 'Interaction already replied' } });
         }
         const result = await this.matchReplied(body, withResponse);
@@ -203,6 +222,8 @@ class BaseInteraction extends DiscordBase_1.DiscordBase {
                         return new MessageCommandInteraction(client, gateway, __reply);
                     case types_1.ApplicationCommandType.PrimaryEntryPoint:
                         return new EntryPointInteraction(client, gateway, __reply);
+                    default:
+                        return new BaseInteraction(client, gateway, __reply);
                 }
             case types_1.InteractionType.MessageComponent:
                 switch (gateway.data.component_type) {
@@ -219,7 +240,7 @@ class BaseInteraction extends DiscordBase_1.DiscordBase {
                     case types_1.ComponentType.StringSelect:
                         return new StringSelectMenuInteraction(client, gateway, __reply);
                     default:
-                        return;
+                        return new BaseInteraction(client, gateway, __reply);
                 }
             case types_1.InteractionType.ModalSubmit:
                 return new ModalSubmitInteraction(client, gateway);
@@ -309,7 +330,7 @@ class Interaction extends BaseInteraction {
         return promise;
     }
     async editOrReply(body, fetchReply) {
-        if (await this.replied) {
+        if (await this.hasRepliedOrAwaitPendingReply()) {
             const { content, embeds, allowed_mentions, components, files, attachments, poll, flags } = body;
             return this.editResponse({ content, embeds, allowed_mentions, components, files, attachments, poll, flags });
         }
@@ -343,7 +364,7 @@ exports.ApplicationCommandInteraction = ApplicationCommandInteraction;
  * Seyfert don't support activities, so this interaction is blank
  */
 class EntryPointInteraction extends ApplicationCommandInteraction {
-    async withReponse(data) {
+    async withResponse(data) {
         let body = { type: types_1.InteractionResponseType.LaunchActivity };
         if (data) {
             let { files, ...rest } = data;
@@ -516,10 +537,10 @@ let ModalSubmitInteraction = class ModalSubmitInteraction extends BaseInteractio
             data,
         }, withResponse);
     }
-    deferUpdate(withResponse) {
+    deferUpdate() {
         return this.reply({
             type: types_1.InteractionResponseType.DeferredMessageUpdate,
-        }, withResponse);
+        });
     }
     get customId() {
         return this.data.customId;

package/lib/structures/Message.d.ts

@@ -1,14 +1,17 @@
-import { type AllChannels, Embed, type ReturnCache } from '..';
+import type { ValidAnswerId } from '../api/Routes/channels';
 import type { ListenerOptions } from '../builders';
+import { Embed } from '../builders/Embed';
+import type { ReturnCache } from '../cache';
 import { type GuildMemberStructure, type GuildStructure, type MessageStructure, type PollStructure, type UserStructure, type WebhookMessageStructure, type WebhookStructure } from '../client/transformers';
 import type { UsingClient } from '../commands';
-import { type ObjectToLower } from '../common';
 import type { EmojiResolvable } from '../common/types/resolvables';
+import type { ObjectToLower } from '../common/types/util';
 import type { MessageCreateBodyRequest, MessageUpdateBodyRequest } from '../common/types/write';
 import type { TopLevelComponents } from '../components';
 import type { APIChannelMention, APIEmbed, APIMessage, GatewayMessageCreateDispatchData } from '../types';
+import type { AllChannels } from './channels';
 import { DiscordBase } from './extra/DiscordBase';
-import type { MessageWebhookMethodEditParams, MessageWebhookMethodWriteParams } from './Webhook';
+import type { MessageWebhookMethodEditParams, MessageWebhookMethodWriteParams, MessageWebhookMethodWriteWaitParams } from './Webhook';
 export type MessageData = APIMessage | GatewayMessageCreateDispatchData;
 export interface BaseMessage extends DiscordBase, ObjectToLower<Omit<MessageData, 'timestamp' | 'author' | 'mentions' | 'components' | 'poll' | 'embeds'>> {
     timestamp?: number;
@@ -46,9 +49,12 @@ export declare class Message extends BaseMessage {
     write(body: MessageCreateBodyRequest): Promise<MessageStructure>;
     delete(reason?: string): Promise<void>;
     crosspost(reason?: string): Promise<MessageStructure>;
+    endPoll(): Promise<MessageStructure>;
+    getAnswerVoters(answerId: ValidAnswerId, checkAnswer?: boolean): Promise<UserStructure[]>;
 }
 export type EditMessageWebhook = Omit<MessageWebhookMethodEditParams, 'messageId'>['body'] & Pick<MessageWebhookMethodEditParams, 'query'>;
 export type WriteMessageWebhook = MessageWebhookMethodWriteParams['body'] & Pick<MessageWebhookMethodWriteParams, 'query'>;
+export type WriteMessageWebhookWait = MessageWebhookMethodWriteWaitParams['body'] & Pick<MessageWebhookMethodWriteWaitParams, 'query'>;
 export declare class WebhookMessage extends BaseMessage {
     readonly webhookId: string;
     readonly webhookToken: string;
@@ -56,6 +62,7 @@ export declare class WebhookMessage extends BaseMessage {
     fetchWebhook(): Promise<WebhookStructure>;
     fetch(): Promise<WebhookMessageStructure>;
     edit(body: EditMessageWebhook): Promise<WebhookMessageStructure>;
+    write(body: WriteMessageWebhookWait): Promise<WebhookMessageStructure>;
     write(body: WriteMessageWebhook): Promise<WebhookMessageStructure | null>;
     delete(reason?: string): Promise<undefined>;
 }
@@ -63,7 +70,7 @@ export declare class InMessageEmbed {
     data: APIEmbed;
     constructor(data: APIEmbed);
     get title(): string | undefined;
-    get type(): import("../types").EmbedType | undefined;
+    get type(): import("..").EmbedType | undefined;
     get description(): string | undefined;
     get url(): string | undefined;
     get timestamp(): string | undefined;
@@ -91,28 +98,28 @@ export declare class InMessageEmbed {
         height?: number | undefined;
         width?: number | undefined;
     } | undefined;
-    get provider(): import("../types").APIEmbedProvider | undefined;
+    get provider(): import("..").APIEmbedProvider | undefined;
     get author(): {
         name: string;
         url?: string | undefined;
         iconUrl?: string | undefined;
         proxyIconUrl?: string | undefined;
     } | undefined;
-    get fields(): import("../types").APIEmbedField[] | undefined;
+    get fields(): import("..").APIEmbedField[] | undefined;
     toBuilder(): Embed;
     toJSON(): {
         title?: string;
-        type?: import("../types").EmbedType;
+        type?: import("..").EmbedType;
         description?: string;
         url?: string;
         timestamp?: string;
         color?: number;
-        footer?: import("../types").APIEmbedFooter;
-        image?: import("../types").APIEmbedImage;
-        thumbnail?: import("../types").APIEmbedThumbnail;
-        video?: import("../types").APIEmbedVideo;
-        provider?: import("../types").APIEmbedProvider;
-        author?: import("../types").APIEmbedAuthor;
-        fields?: import("../types").APIEmbedField[];
+        footer?: import("..").APIEmbedFooter;
+        image?: import("..").APIEmbedImage;
+        thumbnail?: import("..").APIEmbedThumbnail;
+        video?: import("..").APIEmbedVideo;
+        provider?: import("..").APIEmbedProvider;
+        author?: import("..").APIEmbedAuthor;
+        fields?: import("..").APIEmbedField[];
     };
 }

package/lib/structures/Message.js

@@ -1,9 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InMessageEmbed = exports.WebhookMessage = exports.Message = exports.BaseMessage = void 0;
-const __1 = require("..");
+const Embed_1 = require("../builders/Embed");
 const transformers_1 = require("../client/transformers");
-const common_1 = require("../common");
+const error_1 = require("../common/it/error");
+const formatter_1 = require("../common/it/formatter");
+const utils_1 = require("../common/it/utils");
+const components_1 = require("../components");
 const DiscordBase_1 = require("./extra/DiscordBase");
 class BaseMessage extends DiscordBase_1.DiscordBase {
     embeds;
@@ -14,7 +17,7 @@ class BaseMessage extends DiscordBase_1.DiscordBase {
             channels: data.mention_channels ?? [],
             users: [],
         };
-        this.components = data.components?.map(__1.componentFactory) ?? [];
+        this.components = data.components?.map(components_1.componentFactory) ?? [];
         this.embeds = data.embeds.map(embed => new InMessageEmbed(embed));
         this.patch(data);
     }
@@ -25,7 +28,7 @@ class BaseMessage extends DiscordBase_1.DiscordBase {
         return this.client.components.createComponentCollector(this.id, this.channelId, this.guildId, options);
     }
     get url() {
-        return common_1.Formatter.messageLink(this.guildId ?? '@me', this.channelId, this.id);
+        return formatter_1.Formatter.messageLink(this.guildId ?? '@me', this.channelId, this.id);
     }
     guild(mode = 'flow') {
         if (!this.guildId)
@@ -62,10 +65,13 @@ class BaseMessage extends DiscordBase_1.DiscordBase {
         }
         if (data.mentions?.length) {
             this.mentions.users = this.guildId
-                ? data.mentions.map(m => transformers_1.Transformers.GuildMember(this.client, {
-                    ...m.member,
-                    user: m,
-                }, m, this.guildId))
+                ? data.mentions.map(m => {
+                    const memberData = m.member;
+                    if (memberData) {
+                        return transformers_1.Transformers.GuildMember(this.client, { ...memberData, user: m }, m, this.guildId);
+                    }
+                    return transformers_1.Transformers.User(this.client, m);
+                })
                 : data.mentions.map(u => transformers_1.Transformers.User(this.client, u));
         }
         if (data.poll) {
@@ -104,6 +110,15 @@ class Message extends BaseMessage {
     crosspost(reason) {
         return this.client.messages.crosspost(this.id, this.channelId, reason);
     }
+    endPoll() {
+        return this.client.messages.endPoll(this.channelId, this.id);
+    }
+    async getAnswerVoters(answerId, checkAnswer = false) {
+        if (checkAnswer && this.poll && !this.poll.answers.find(answer => answer.answerId === answerId)) {
+            throw new error_1.SeyfertError('INVALID_ANSWER_ID', { metadata: { detail: 'Invalid answer id' } });
+        }
+        return this.client.messages.getAnswerVoters(this.channelId, this.id, answerId);
+    }
 }
 exports.Message = Message;
 class WebhookMessage extends BaseMessage {
@@ -175,28 +190,28 @@ class InMessageEmbed {
         return this.data.color;
     }
     get footer() {
-        return this.data.footer ? (0, common_1.toCamelCase)(this.data.footer) : undefined;
+        return this.data.footer ? (0, utils_1.toCamelCase)(this.data.footer) : undefined;
     }
     get image() {
-        return this.data.image ? (0, common_1.toCamelCase)(this.data.image) : undefined;
+        return this.data.image ? (0, utils_1.toCamelCase)(this.data.image) : undefined;
     }
     get thumbnail() {
-        return this.data.thumbnail ? (0, common_1.toCamelCase)(this.data.thumbnail) : undefined;
+        return this.data.thumbnail ? (0, utils_1.toCamelCase)(this.data.thumbnail) : undefined;
     }
     get video() {
-        return this.data.video ? (0, common_1.toCamelCase)(this.data.video) : undefined;
+        return this.data.video ? (0, utils_1.toCamelCase)(this.data.video) : undefined;
     }
     get provider() {
         return this.data.provider;
     }
     get author() {
-        return this.data.author ? (0, common_1.toCamelCase)(this.data.author) : undefined;
+        return this.data.author ? (0, utils_1.toCamelCase)(this.data.author) : undefined;
     }
     get fields() {
         return this.data.fields;
     }
     toBuilder() {
-        return new __1.Embed(this.data);
+        return new Embed_1.Embed(this.data);
     }
     toJSON() {
         return { ...this.data };

package/lib/structures/User.d.ts

@@ -21,7 +21,7 @@ export declare class User extends DiscordBase<APIUser> {
     avatarURL(options?: ImageOptions): string;
     avatarDecorationURL(options?: ImageOptions): string | undefined;
     bannerURL(options?: ImageOptions): string | undefined;
-    presence(): import("..").ReturnCache<(Omit<import("../types").GatewayPresenceUpdate, "user"> & {
+    presence(): import("..").ReturnCache<(Omit<import("..").GatewayPresenceUpdate, "user"> & {
         id: string;
         user_id: string;
     } & {

package/lib/structures/VoiceState.d.ts

@@ -10,6 +10,10 @@ export declare class VoiceState extends Base {
     protected withMember?: GuildMemberStructure;
     constructor(client: UsingClient, data: APIVoiceState);
     get isMuted(): boolean;
+    get isDeafened(): boolean;
+    get isCameraOn(): boolean;
+    get isStreaming(): boolean;
+    get isSuppressed(): boolean;
     member(force?: boolean): Promise<GuildMemberStructure>;
     user(force?: boolean): Promise<UserStructure>;
     channel(mode?: 'rest' | 'flow'): Promise<AllGuildVoiceChannels | undefined>;

package/lib/structures/VoiceState.js

@@ -15,6 +15,18 @@ class VoiceState extends Base_1.Base {
     get isMuted() {
         return this.mute || this.selfMute;
     }
+    get isDeafened() {
+        return this.deaf || this.selfDeaf;
+    }
+    get isCameraOn() {
+        return this.selfVideo;
+    }
+    get isStreaming() {
+        return this.selfStream ?? false;
+    }
+    get isSuppressed() {
+        return this.suppress;
+    }
     async member(force) {
         return (this.withMember = await this.client.members.fetch(this.guildId, this.userId, force));
     }
@@ -49,7 +61,7 @@ class VoiceState extends Base_1.Base {
     async requestSpeak(date = new Date()) {
         if (typeof date === 'string')
             date = new Date(date);
-        if (Number.isNaN(date))
+        if (Number.isNaN(date.getTime()))
             return Promise.reject('Invalid date');
         date = date.toISOString();
         await this.client.voiceStates.requestSpeak(this.guildId, date);

package/lib/structures/Webhook.d.ts

@@ -72,7 +72,10 @@ export declare class Webhook extends DiscordBase {
         webhookToken: string;
     }>): {
         /** Writes a message through the webhook. */
-        write: (payload: MessageWebhookMethodWriteParams) => Promise<WebhookMessageStructure | null>;
+        write: {
+            (payload: MessageWebhookMethodWriteWaitParams): Promise<WebhookMessageStructure>;
+            (payload: MessageWebhookMethodWriteParams): Promise<WebhookMessageStructure | null>;
+        };
         /** Edits a message sent through the webhook. */
         edit: (payload: MessageWebhookMethodEditParams) => Promise<WebhookMessageStructure>;
         /** Deletes a message sent through the webhook. */
@@ -103,5 +106,10 @@ export type MessageWebhookMethodEditParams = MessageWebhookPayload<MessageWebhoo
 export type MessageWebhookMethodWriteParams = MessageWebhookPayload<MessageWebhookCreateBodyRequest, {
     query?: RESTPostAPIWebhookWithTokenQuery;
 }>;
+export type MessageWebhookMethodWriteWaitParams = MessageWebhookPayload<MessageWebhookCreateBodyRequest, {
+    query: RESTPostAPIWebhookWithTokenQuery & {
+        wait: true;
+    };
+}>;
 export type MessageWebhookMethodDeleteParams = Omit<WebhookShorterMessageDeleteParams, 'token' | 'webhookId'>;
 export type MessageWebhookMethodFetchParams = Omit<WebhookShorterMessageFetchParams, 'token' | 'webhookId'>;

package/lib/structures/Webhook.js

@@ -89,9 +89,12 @@ class Webhook extends DiscordBase_1.DiscordBase {
      * Static methods related to interacting with messages through webhooks.
      */
     static messages({ client, webhookId, webhookToken }) {
+        function write(payload) {
+            return client.webhooks.writeMessage(webhookId, webhookToken, payload);
+        }
         return {
             /** Writes a message through the webhook. */
-            write: (payload) => client.webhooks.writeMessage(webhookId, webhookToken, payload),
+            write,
             /** Edits a message sent through the webhook. */
             edit: (payload) => client.webhooks.editMessage(webhookId, webhookToken, payload),
             /** Deletes a message sent through the webhook. */