disgroove 2.2.0-dev.301452e → 2.2.0-dev.4623b99

package/dist/lib/Client.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
-import { GatewayIntents, type OAuth2Scopes, type StatusTypes, type ActionTypes, type ImageWidgetStyleOptions, InteractionCallbackType, type MFALevel, type ReactionTypes, ApplicationCommandTypes, EventTypes, TriggerTypes, ChannelTypes, VideoQualityModes, SortOrderTypes, ForumLayoutTypes, InviteTargetTypes, VerificationLevel, DefaultMessageNotificationLevel, ExplicitContentFilterLevel, SystemChannelFlags, ApplicationFlags, ApplicationIntegrationTypes, ChannelFlags, GuildFeatures, GuildScheduledEventEntityTypes, GuildScheduledEventPrivacyLevel, GuildScheduledEventStatus, MessageFlags, OnboardingMode, PrivacyLevel, GuildMemberFlags } from "./constants";
+import { GatewayIntents, type OAuth2Scopes, type StatusTypes, type ActionTypes, type ImageWidgetStyleOptions, InteractionCallbackType, type MFALevel, type ReactionTypes, type ApplicationCommandTypes, type EventTypes, type TriggerTypes, type ChannelTypes, type VideoQualityModes, type SortOrderTypes, type ForumLayoutTypes, type InviteTargetTypes, type VerificationLevel, type DefaultMessageNotificationLevel, type ExplicitContentFilterLevel, type SystemChannelFlags, type ApplicationFlags, type ApplicationIntegrationTypes, type ChannelFlags, type GuildFeatures, type GuildScheduledEventEntityTypes, type GuildScheduledEventPrivacyLevel, type GuildScheduledEventStatus, type MessageFlags, type OnboardingMode, type PrivacyLevel, type GuildMemberFlags } from "./constants";
 import { Util } from "./utils";
-import { RequestManager, File } from "./rest";
+import { RequestManager, type File } from "./rest";
 import EventEmitter from "node:events";
 import { ShardManager } from "./gateway";
 import type { Application, ApplicationIntegrationTypeConfiguration, InstallParams } from "./types/application";

package/dist/lib/Client.js

@@ -393,6 +393,18 @@ class Client extends node_events_1.default {
                 attachments: options.attachments?.map((attachment) => this.util.attachmentToRaw(attachment)),
                 flags: options.flags,
                 thread_name: options.threadName,
+                poll: options.poll !== undefined
+                    ? {
+                        question: options.poll.question,
+                        answers: options.poll.answers.map((answer) => ({
+                            answer_id: answer.answerId,
+                            poll_media: answer.pollMedia,
+                        })),
+                        duration: options.poll.duration,
+                        allow_multiselect: options.poll.allowMultiselect,
+                        layout_type: options.poll.layoutType,
+                    }
+                    : undefined,
             },
             files: options.files,
         });
@@ -784,28 +796,10 @@ class Client extends node_events_1.default {
     async editApplicationCommandPermissions(applicationId, guildId, commandId, options) {
         const response = await this.rest.request(rest_1.RESTMethods.Put, rest_1.Endpoints.applicationCommandPermissions(applicationId, guildId, commandId), {
             json: {
-                permissions: options.permissions.map((permission) => ({
-                    id: permission.id,
-                    application_id: permission.applicationId,
-                    guild_id: permission.guildId,
-                    permissions: permission.permissions.map((perm) => ({
-                        id: perm.id,
-                        type: perm.type,
-                        permission: perm.permission,
-                    })),
-                })),
+                permissions: options.permissions.map((permission) => this.util.guildApplicationCommandPermissionsToRaw(permission)),
             },
         });
-        return {
-            id: response.id,
-            applicationId: response.application_id,
-            guildId: response.guild_id,
-            permissions: response.permissions.map((permission) => ({
-                id: permission.id,
-                type: permission.type,
-                permission: permission.permission,
-            })),
-        };
+        return this.util.guildApplicationCommandPermissionsFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/channel#modify-channel */
     async editChannel(channelId, options, reason) {
@@ -1375,15 +1369,7 @@ class Client extends node_events_1.default {
         const response = await this.rest.request(rest_1.RESTMethods.Get, rest_1.Endpoints.guildActiveThreads(guildId));
         return {
             threads: response.threads.map((thread) => this.util.channelFromRaw(thread)),
-            members: response.members.map((threadMember) => ({
-                id: threadMember.id,
-                userId: threadMember.user_id,
-                joinTimestamp: threadMember.join_timestamp,
-                flags: threadMember.flags,
-                member: threadMember.member !== undefined
-                    ? this.util.guildMemberFromRaw(threadMember.member)
-                    : undefined,
-            })),
+            members: response.members.map((threadMember) => this.util.threadMemberFromRaw(threadMember)),
         };
     }
     /** https://discord.com/developers/docs/resources/channel#list-public-archived-threads */
@@ -1396,15 +1382,7 @@ class Client extends node_events_1.default {
         });
         return {
             threads: response.threads.map((thread) => this.util.channelFromRaw(thread)),
-            members: response.members.map((threadMember) => ({
-                id: threadMember.id,
-                userId: threadMember.user_id,
-                joinTimestamp: threadMember.join_timestamp,
-                flags: threadMember.flags,
-                member: threadMember.member !== undefined
-                    ? this.util.guildMemberFromRaw(threadMember.member)
-                    : undefined,
-            })),
+            members: response.members.map((threadMember) => this.util.threadMemberFromRaw(threadMember)),
             hasMore: response.has_more,
         };
     }
@@ -1434,16 +1412,7 @@ class Client extends node_events_1.default {
     /** https://discord.com/developers/docs/interactions/application-commands#get-application-command-permissions */
     async getApplicationCommandPermissions(applicationId, guildId, commandId) {
         const response = await this.rest.request(rest_1.RESTMethods.Get, rest_1.Endpoints.applicationCommandPermissions(applicationId, guildId, commandId));
-        return {
-            id: response.id,
-            applicationId: response.application_id,
-            guildId: response.guild_id,
-            permissions: response.permissions.map((permission) => ({
-                id: permission.id,
-                type: permission.type,
-                permission: permission.permission,
-            })),
-        };
+        return this.util.guildApplicationCommandPermissionsFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/application-role-connection-metadata#get-application-role-connection-metadata-records */
     async getApplicationRoleConnectionMetadataRecords(applicationId) {
@@ -1604,16 +1573,7 @@ class Client extends node_events_1.default {
     /** https://discord.com/developers/docs/interactions/application-commands#get-guild-application-command-permissions */
     async getGuildApplicationCommandPermissions(applicationId, guildId) {
         const response = await this.rest.request(rest_1.RESTMethods.Get, rest_1.Endpoints.guildApplicationCommandsPermissions(applicationId, guildId));
-        return {
-            id: response.id,
-            applicationId: response.application_id,
-            guildId: response.guild_id,
-            permissions: response.permissions.map((permission) => ({
-                id: permission.id,
-                type: permission.type,
-                permission: permission.permission,
-            })),
-        };
+        return this.util.guildApplicationCommandPermissionsFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/guild#get-guild-ban */
     async getGuildBan(guildId, userId) {
@@ -1871,15 +1831,7 @@ class Client extends node_events_1.default {
         });
         return {
             threads: response.threads.map((thread) => this.util.channelFromRaw(thread)),
-            members: response.members.map((threadMember) => ({
-                id: threadMember.id,
-                userId: threadMember.user_id,
-                joinTimestamp: threadMember.join_timestamp,
-                flags: threadMember.flags,
-                member: threadMember.member !== undefined
-                    ? this.util.guildMemberFromRaw(threadMember.member)
-                    : undefined,
-            })),
+            members: response.members.map((threadMember) => this.util.threadMemberFromRaw(threadMember)),
             hasMore: response.has_more,
         };
     }
@@ -1996,15 +1948,7 @@ class Client extends node_events_1.default {
                 limit: options?.limit,
             },
         });
-        return response.map((threadMember) => ({
-            id: threadMember.id,
-            userId: threadMember.user_id,
-            joinTimestamp: threadMember.join_timestamp,
-            flags: threadMember.flags,
-            member: threadMember.member !== undefined
-                ? this.util.guildMemberFromRaw(threadMember.member)
-                : undefined,
-        }));
+        return response.map((threadMember) => this.util.threadMemberFromRaw(threadMember));
     }
     /** https://discord.com/developers/docs/resources/user#get-user */
     async getUser(userId) {

package/dist/lib/gateway/Shard.js

@@ -117,16 +117,7 @@ class Shard {
                 this.client.emit(constants_1.GatewayEvents.Resumed);
                 break;
             case "APPLICATION_COMMAND_PERMISSIONS_UPDATE":
-                this.client.emit(constants_1.GatewayEvents.ApplicationCommandPermissionsUpdate, {
-                    id: packet.d.id,
-                    applicationId: packet.d.application_id,
-                    guildId: packet.d.guild_id,
-                    permissions: packet.d.permissions.map((permission) => ({
-                        id: permission.id,
-                        type: permission.type,
-                        permission: permission.permission,
-                    })),
-                });
+                this.client.emit(constants_1.GatewayEvents.ApplicationCommandPermissionsUpdate, this.client.util.guildApplicationCommandPermissionsFromRaw(packet.d));
                 break;
             case "AUTO_MODERATION_RULE_CREATE":
                 this.client.emit(constants_1.GatewayEvents.AutoModerationRuleCreate, this.client.util.autoModerationRuleFromRaw(packet.d));
@@ -189,15 +180,7 @@ class Shard {
                     guildId: packet.d.guild_id,
                     channelIds: packet.d.channel_ids,
                     threads: packet.d.threads.map((thread) => this.client.util.channelFromRaw(thread)),
-                    members: packet.d.members.map((threadMember) => ({
-                        id: threadMember.id,
-                        userId: threadMember.user_id,
-                        joinTimestamp: threadMember.join_timestamp,
-                        flags: threadMember.flags,
-                        member: threadMember.member !== undefined
-                            ? this.client.util.guildMemberFromRaw(threadMember.member)
-                            : undefined,
-                    })),
+                    members: packet.d.members.map((threadMember) => this.client.util.threadMemberFromRaw(threadMember)),
                 });
                 break;
             case "THREAD_MEMBER_UPDATE":
@@ -217,15 +200,7 @@ class Shard {
                     id: packet.d.id,
                     guildId: packet.d.guild_id,
                     memberCount: packet.d.member_count,
-                    addedMembers: packet.d.members.map((threadMember) => ({
-                        id: threadMember.id,
-                        userId: threadMember.user_id,
-                        joinTimestamp: threadMember.join_timestamp,
-                        flags: threadMember.flags,
-                        member: threadMember.member !== undefined
-                            ? this.client.util.guildMemberFromRaw(threadMember.member)
-                            : undefined,
-                    })),
+                    addedMembers: packet.d.members.map((threadMember) => this.client.util.threadMemberFromRaw(threadMember)),
                     removedMemberIds: packet.d.removed_member_ids,
                 });
                 break;

package/dist/lib/types/interaction.d.ts

@@ -1,10 +1,10 @@
-import type { ApplicationCommandOptionType, ApplicationCommandTypes, ComponentTypes, InteractionCallbackType, InteractionType, MessageFlags } from "../constants";
+import type { ApplicationCommandOptionType, ApplicationCommandTypes, ApplicationIntegrationTypes, ComponentTypes, InteractionCallbackType, InteractionContextTypes, InteractionType, Locales, MessageFlags } from "../constants";
 import type { File } from "../rest";
 import type { RawApplicationCommandOptionChoice, ApplicationCommandOptionChoice } from "./application-command";
 import type { RawChannel, RawMessage, RawAttachment, RawEmbed, RawAllowedMentions, Channel, Message, Attachment, Embed, AllowedMentions } from "./channel";
 import type { snowflake } from "./common";
 import type { RawEntitlement, Entitlement } from "./entitlements";
-import type { RawGuildMember, GuildMember } from "./guild";
+import type { RawGuildMember, GuildMember, Guild, RawGuild } from "./guild";
 import type { RawTextInput, RawActionRow, TextInput, ActionRow } from "./message-components";
 import type { RawPollCreateParams, PollCreateParams } from "./poll";
 import type { RawRole, Role } from "./role";
@@ -15,6 +15,9 @@ export interface RawInteraction {
     application_id: snowflake;
     type: InteractionType;
     data?: RawApplicationCommandData & RawMessageComponentData & RawModalSubmitData;
+    guild?: {
+        locale: Locales;
+    } & Pick<RawGuild, "id" | "features">;
     guild_id?: snowflake;
     channel?: RawChannel;
     channel_id?: snowflake;
@@ -27,6 +30,8 @@ export interface RawInteraction {
     locale?: string;
     guild_locale?: string;
     entitlements: Array<RawEntitlement>;
+    authorizing_integration_owners: Record<ApplicationIntegrationTypes, string>;
+    context?: InteractionContextTypes;
 }
 /** https://discord.com/developers/docs/interactions/receiving-and-responding#interaction-object-application-command-data-structure */
 export interface RawApplicationCommandData {
@@ -103,6 +108,9 @@ export interface Interaction {
     applicationId: snowflake;
     type: InteractionType;
     data?: ApplicationCommandData & MessageComponentData & ModalSubmitData;
+    guild?: {
+        locale: Locales;
+    } & Pick<Guild, "id" | "features">;
     guildId?: snowflake;
     channel?: Channel;
     channelId?: snowflake;
@@ -115,6 +123,8 @@ export interface Interaction {
     locale?: string;
     guildLocale?: string;
     entitlements: Array<Entitlement>;
+    authorizingIntegrationOwners: Record<ApplicationIntegrationTypes, string>;
+    context?: InteractionContextTypes;
 }
 export interface ApplicationCommandData {
     id: snowflake;

package/dist/lib/utils/Util.d.ts

@@ -1,7 +1,7 @@
 import type { Application, RawApplication } from "../types/application";
-import type { ApplicationCommand, RawApplicationCommand } from "../types/application-command";
+import type { ApplicationCommand, GuildApplicationCommandPermissions, RawApplicationCommand, RawGuildApplicationCommandPermissions } from "../types/application-command";
 import type { AutoModerationRule, RawAutoModerationRule } from "../types/auto-moderation";
-import type { Attachment, Channel, Embed, Message, MessageInteractionMetadata, RawAttachment, RawChannel, RawEmbed, RawMessage, RawMessageInteractionMetadata } from "../types/channel";
+import type { Attachment, Channel, Embed, Message, MessageInteractionMetadata, RawAttachment, RawChannel, RawEmbed, RawMessage, RawMessageInteractionMetadata, RawThreadMember, ThreadMember } from "../types/channel";
 import type { Emoji, RawEmoji } from "../types/emoji";
 import type { Guild, GuildMember, Integration, RawGuild, RawGuildMember, RawIntegration } from "../types/guild";
 import type { GuildScheduledEvent, RawGuildScheduledEvent } from "../types/guild-scheduled-event";
@@ -42,6 +42,8 @@ export declare class Util {
     emojiToRaw(emoji: Emoji): RawEmoji;
     entitlementFromRaw(entitlement: RawEntitlement): Entitlement;
     entitlementToRaw(entitlement: Entitlement): RawEntitlement;
+    guildApplicationCommandPermissionsFromRaw(guildApplicationCommandPermissions: RawGuildApplicationCommandPermissions): GuildApplicationCommandPermissions;
+    guildApplicationCommandPermissionsToRaw(guildApplicationCommandPermissions: GuildApplicationCommandPermissions): RawGuildApplicationCommandPermissions;
     guildFromRaw(guild: RawGuild): Guild;
     guildToRaw(guild: Guild): RawGuild;
     guildMemberFromRaw(guildMember: RawGuildMember): GuildMember;
@@ -79,6 +81,8 @@ export declare class Util {
     stickerToRaw(sticker: Sticker): RawSticker;
     teamFromRaw(team: RawTeam): Team;
     teamToRaw(team: Team): RawTeam;
+    threadMemberFromRaw(threadMember: RawThreadMember): ThreadMember;
+    threadMemberToRaw(threadMember: ThreadMember): RawThreadMember;
     testEntitlementFromRaw(entitlement: Omit<RawEntitlement, "starts_at" | "ends_at" | "subscription_id">): Omit<Entitlement, "startsAt" | "endsAt" | "subscriptionId">;
     testEntitlementToRaw(entitlement: Omit<Entitlement, "startsAt" | "endsAt" | "subscriptionId">): Omit<RawEntitlement, "starts_at" | "ends_at" | "subscription_id">;
     userFromRaw(user: RawUser): User;

package/dist/lib/utils/Util.js

@@ -729,6 +729,30 @@ class Util {
             subscription_id: entitlement.subscriptionId,
         };
     }
+    guildApplicationCommandPermissionsFromRaw(guildApplicationCommandPermissions) {
+        return {
+            id: guildApplicationCommandPermissions.id,
+            applicationId: guildApplicationCommandPermissions.application_id,
+            guildId: guildApplicationCommandPermissions.guild_id,
+            permissions: guildApplicationCommandPermissions.permissions.map((permission) => ({
+                id: permission.id,
+                type: permission.type,
+                permission: permission.permission,
+            })),
+        };
+    }
+    guildApplicationCommandPermissionsToRaw(guildApplicationCommandPermissions) {
+        return {
+            id: guildApplicationCommandPermissions.id,
+            application_id: guildApplicationCommandPermissions.applicationId,
+            guild_id: guildApplicationCommandPermissions.guildId,
+            permissions: guildApplicationCommandPermissions.permissions.map((permission) => ({
+                id: permission.id,
+                type: permission.type,
+                permission: permission.permission,
+            })),
+        };
+    }
     guildFromRaw(guild) {
         return {
             id: guild.id,
@@ -1052,6 +1076,13 @@ class Util {
                     })),
                 }
                 : undefined,
+            guild: interaction.guild !== undefined
+                ? {
+                    locale: interaction.guild.locale,
+                    id: interaction.guild.id,
+                    features: interaction.guild.features,
+                }
+                : undefined,
             guildId: interaction.guild_id,
             channel: interaction.channel !== undefined
                 ? this.channelFromRaw(interaction.channel)
@@ -1072,6 +1103,11 @@ class Util {
             locale: interaction.locale,
             guildLocale: interaction.guild_locale,
             entitlements: interaction.entitlements.map((entitlement) => this.entitlementFromRaw(entitlement)),
+            authorizingIntegrationOwners: {
+                "0": interaction.authorizing_integration_owners[0],
+                "1": interaction.authorizing_integration_owners[1],
+            },
+            context: interaction.context,
         };
     }
     interactionToRaw(interaction) {
@@ -1109,6 +1145,13 @@ class Util {
                     })),
                 }
                 : undefined,
+            guild: interaction.guild !== undefined
+                ? {
+                    locale: interaction.guild.locale,
+                    id: interaction.guild.id,
+                    features: interaction.guild.features,
+                }
+                : undefined,
             guild_id: interaction.guildId,
             channel: interaction.channel !== undefined
                 ? this.channelToRaw(interaction.channel)
@@ -1129,6 +1172,11 @@ class Util {
             locale: interaction.locale,
             guild_locale: interaction.guildLocale,
             entitlements: interaction.entitlements.map((entitlement) => this.entitlementToRaw(entitlement)),
+            authorizing_integration_owners: {
+                "0": interaction.authorizingIntegrationOwners[0],
+                "1": interaction.authorizingIntegrationOwners[1],
+            },
+            context: interaction.context,
         };
     }
     interactionMetadataFromRaw(interactionMetadata) {
@@ -2002,6 +2050,28 @@ class Util {
             owner_user_id: team.ownerUserId,
         };
     }
+    threadMemberFromRaw(threadMember) {
+        return {
+            id: threadMember.id,
+            userId: threadMember.user_id,
+            joinTimestamp: threadMember.join_timestamp,
+            flags: threadMember.flags,
+            member: threadMember.member !== undefined
+                ? this.guildMemberFromRaw(threadMember.member)
+                : undefined,
+        };
+    }
+    threadMemberToRaw(threadMember) {
+        return {
+            id: threadMember.id,
+            user_id: threadMember.userId,
+            join_timestamp: threadMember.joinTimestamp,
+            flags: threadMember.flags,
+            member: threadMember.member !== undefined
+                ? this.guildMemberToRaw(threadMember.member)
+                : undefined,
+        };
+    }
     testEntitlementFromRaw(entitlement) {
         return {
             id: entitlement.id,

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "disgroove",
-    "version": "2.2.0-dev.301452e",
+    "version": "2.2.0-dev.4623b99",
     "description": "A module to interface with Discord",
     "main": "./dist/lib/index.js",
     "types": "./dist/lib/index.d.ts",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "disgroove",
-  "version": "2.2.0-dev.301452e",
+  "version": "2.2.0-dev.4623b99",
   "description": "A module to interface with Discord",
   "main": "./dist/lib/index.js",
   "types": "./dist/lib/index.d.ts",