lunibee 0.2.1 → 0.2.2

package/dist/structures/index.js

@@ -739,7 +739,7 @@ var IntentBits = {
   directMessagePolls: 1 << 25
 };
 // packages/types/src/index.ts
-var InteractionResponseType = {
+var InteractionResponseEnum = {
   Pong: 1,
   ChannelMessage: 4,
   DeferredChannelMessage: 5,
@@ -748,10 +748,11 @@ var InteractionResponseType = {
   Autocomplete: 8,
   Modal: 9
 };
+var InteractionResponseType = InteractionResponseEnum;
 // packages/rest/package.json
 var package_default = {
   name: "@lunibee/rest",
-  version: "0.2.1",
+  version: "0.2.2",
   type: "module",
   module: "./src/index.ts",
   types: "./src/index.ts",
@@ -989,7 +990,7 @@ class Invite {
     return this.url;
   }
 }
-var WebhookType = {
+var WebhookEnum = {
   Incoming: 1,
   ChannelFollower: 2,
   Application: 3
@@ -1005,7 +1006,7 @@ class Webhook extends BaseStructure {
   token;
   constructor(data) {
     super(data.id);
-    this.type = data.type ?? WebhookType.Incoming;
+    this.type = data.type ?? WebhookEnum.Incoming;
     this.name = data.name ?? null;
     this.avatarHash = data.avatar ?? null;
     this.channelId = data.channel_id ?? null;
@@ -1170,6 +1171,7 @@ class GuildOnboarding2 extends BaseStructure {
     this.mode = data.mode;
   }
 }
+var WebhookType = WebhookEnum;
 // packages/structures/src/channels.ts
 class NewsChannel extends TextChannel {
 }
@@ -1449,7 +1451,7 @@ class CommandOptions {
   }
 }
 // packages/structures/src/interactions.ts
-var InteractionType = {
+var InteractionEnum = {
   Ping: 1,
   ApplicationCommand: 2,
   MessageComponent: 3,
@@ -1457,8 +1459,17 @@ var InteractionType = {
   ModalSubmit: 5
 };
 var EPHEMERAL = 64;
+var COMMAND_CHAT_INPUT = 1;
+var COMMAND_USER = 2;
+var COMMAND_MESSAGE = 3;
 var TOKEN_LIFETIME_MS = 15 * 60000;
 var DISCORD_EPOCH = 1420070400000n;
+function splitWithResponse(options) {
+  if (typeof options === "string")
+    return { withResponse: false, rest: options };
+  const { withResponse, ...rest } = options;
+  return { withResponse: withResponse === true, rest };
+}
 function toMessageData(options) {
   if (typeof options === "string")
     return { content: options };
@@ -1471,6 +1482,7 @@ function toMessageData(options) {
 class InteractionResponse {
   type;
   data;
+  withResponse = false;
   constructor(type, data) {
     if (!Number.isFinite(type))
       throw new TypeError("Interaction response type must be finite.");
@@ -1481,13 +1493,13 @@ class InteractionResponse {
     return this.data === undefined ? { type: this.type } : { type: this.type, data: this.data };
   }
   static message(options) {
-    return new InteractionResponse(InteractionResponseType.ChannelMessage, toMessageData(options));
+    return new InteractionResponse(InteractionResponseEnum.ChannelMessage, toMessageData(options));
   }
   static defer(ephemeral = false) {
-    return new InteractionResponse(InteractionResponseType.DeferredChannelMessage, ephemeral ? { flags: EPHEMERAL } : undefined);
+    return new InteractionResponse(InteractionResponseEnum.DeferredChannelMessage, ephemeral ? { flags: EPHEMERAL } : undefined);
   }
   static pong() {
-    return new InteractionResponse(InteractionResponseType.Pong);
+    return new InteractionResponse(InteractionResponseEnum.Pong);
   }
 }
 
@@ -1515,8 +1527,30 @@ class Interaction {
     this.type = data.type;
     this.data = data;
   }
+  #commandType() {
+    if (this.type !== InteractionEnum.ApplicationCommand)
+      return 0;
+    const type = this.data.data?.type;
+    return typeof type === "number" ? type : COMMAND_CHAT_INPUT;
+  }
+  isCommand() {
+    return this.type === InteractionEnum.ApplicationCommand;
+  }
   isChatInputCommand() {
-    return this.type === InteractionType.ApplicationCommand;
+    return this.#commandType() === COMMAND_CHAT_INPUT;
+  }
+  isContextMenuCommand() {
+    const type = this.#commandType();
+    return type === COMMAND_USER || type === COMMAND_MESSAGE;
+  }
+  isUserContextMenuCommand() {
+    return this.#commandType() === COMMAND_USER;
+  }
+  isMessageContextMenuCommand() {
+    return this.#commandType() === COMMAND_MESSAGE;
+  }
+  get resourceContext() {
+    return this.#client.resourceContext;
   }
   awaitModalSubmit(options) {
     const collect = this.#client.resourceContext?.collectInteractions;
@@ -1533,13 +1567,13 @@ class Interaction {
     return collector.next();
   }
   isMessageComponent() {
-    return this.type === InteractionType.MessageComponent;
+    return this.type === InteractionEnum.MessageComponent;
   }
   isModalSubmit() {
-    return this.type === InteractionType.ModalSubmit;
+    return this.type === InteractionEnum.ModalSubmit;
   }
   isAutocomplete() {
-    return this.type === InteractionType.ApplicationCommandAutocomplete;
+    return this.type === InteractionEnum.ApplicationCommandAutocomplete;
   }
   #componentType() {
     return this.isMessageComponent() ? this.data.data?.component_type ?? 0 : 0;
@@ -1624,12 +1658,24 @@ class Interaction {
   postResponse(response) {
     return this.#client.postInteractionResponse(this.id, this.token, response);
   }
+  async acknowledgeWith(response, state, withResponse) {
+    response.withResponse = withResponse;
+    const result = await this.acknowledge(response, state);
+    if (!withResponse)
+      return result;
+    const message = result?.resource?.message;
+    return message ? new Message(message, this.#client.resourceContext) : null;
+  }
   async reply(options) {
-    return this.acknowledge(InteractionResponse.message(toMessageData(options)), "replied");
+    const { withResponse, rest } = splitWithResponse(options);
+    return this.acknowledgeWith(InteractionResponse.message(toMessageData(rest)), "replied", withResponse);
   }
   async deferReply(options = false) {
     const ephemeral = typeof options === "boolean" ? options : options.ephemeral === true;
-    await this.acknowledge(InteractionResponse.defer(ephemeral), "deferred");
+    const withResponse = typeof options === "object" && options.withResponse === true;
+    const result = await this.acknowledgeWith(InteractionResponse.defer(ephemeral), "deferred", withResponse);
+    if (withResponse)
+      return result;
   }
   editReply(options) {
     this.assertAcknowledged();
@@ -1643,11 +1689,12 @@ class Interaction {
     return this.#client.followUpInteraction(this.token, toMessageData(options));
   }
   async update(options) {
-    return this.acknowledge(new InteractionResponse(InteractionResponseType.MessageUpdate, toMessageData(options)), "replied");
+    const { withResponse, rest } = splitWithResponse(options);
+    return this.acknowledgeWith(new InteractionResponse(InteractionResponseEnum.MessageUpdate, toMessageData(rest)), "replied", withResponse);
   }
   async showModal(modal) {
     const data = "toJSON" in modal && typeof modal.toJSON === "function" ? modal.toJSON() : modal;
-    return this.acknowledge(new InteractionResponse(InteractionResponseType.Modal, data), "replied");
+    return this.acknowledge(new InteractionResponse(InteractionResponseEnum.Modal, data), "replied");
   }
 }
 
@@ -1664,6 +1711,38 @@ class CommandInteraction extends Interaction {
   }
 }
 
+class ContextMenuCommandInteraction extends CommandInteraction {
+  #resolved() {
+    return this.data.data?.resolved ?? {};
+  }
+  get targetId() {
+    const id = this.data.data?.target_id;
+    return typeof id === "string" ? id : null;
+  }
+  get targetUser() {
+    const id = this.targetId;
+    const raw = id ? this.#resolved().users?.[id] : undefined;
+    return raw ? new User(raw) : null;
+  }
+  get targetMember() {
+    const id = this.targetId;
+    const raw = id ? this.#resolved().members?.[id] : undefined;
+    const user = id ? this.#resolved().users?.[id] : undefined;
+    if (!raw || !user || !this.guildId)
+      return null;
+    return new GuildMember({
+      ...raw,
+      user,
+      guild_id: this.guildId
+    }, this.resourceContext);
+  }
+  get targetMessage() {
+    const id = this.targetId;
+    const raw = id ? this.#resolved().messages?.[id] : undefined;
+    return raw ? new Message(raw, this.resourceContext) : null;
+  }
+}
+
 class ComponentInteraction extends Interaction {
   get customId() {
     return this.data?.data?.custom_id ?? "";
@@ -1677,11 +1756,11 @@ class ComponentInteraction extends Interaction {
   get values() {
     return this.data?.data?.values ?? [];
   }
-  async deferUpdate() {
-    await this.acknowledge(new InteractionResponse(InteractionResponseType.DeferredMessageUpdate), "deferred");
-  }
-  async update(options) {
-    return this.acknowledge(new InteractionResponse(InteractionResponseType.MessageUpdate, toMessageData(options)), "replied");
+  async deferUpdate(options = {}) {
+    const withResponse = options.withResponse === true;
+    const result = await this.acknowledgeWith(new InteractionResponse(InteractionResponseEnum.DeferredMessageUpdate), "deferred", withResponse);
+    if (withResponse)
+      return result;
   }
 }
 
@@ -1723,7 +1802,7 @@ class AutocompleteInteraction extends Interaction {
   async respond(choices) {
     if (!Array.isArray(choices))
       throw new TypeError("Autocomplete choices must be an array.");
-    const response = new InteractionResponse(InteractionResponseType.Autocomplete, { choices });
+    const response = new InteractionResponse(InteractionResponseEnum.Autocomplete, { choices });
     await this.acknowledge(response, "replied");
   }
 }
@@ -1741,18 +1820,21 @@ function findFocused(options) {
 }
 function createInteraction(client, data) {
   switch (data.type) {
-    case InteractionType.ApplicationCommand:
-      return new CommandInteraction(client, data);
-    case InteractionType.ApplicationCommandAutocomplete:
+    case InteractionEnum.ApplicationCommand: {
+      const commandType = data.data?.type;
+      return commandType === COMMAND_USER || commandType === COMMAND_MESSAGE ? new ContextMenuCommandInteraction(client, data) : new CommandInteraction(client, data);
+    }
+    case InteractionEnum.ApplicationCommandAutocomplete:
       return new AutocompleteInteraction(client, data);
-    case InteractionType.MessageComponent:
+    case InteractionEnum.MessageComponent:
       return new ComponentInteraction(client, data);
-    case InteractionType.ModalSubmit:
+    case InteractionEnum.ModalSubmit:
       return new ModalSubmitInteraction(client, data);
     default:
       return new Interaction(client, data);
   }
 }
+var InteractionType = InteractionEnum;
 // packages/structures/src/embed.ts
 class Embed {
   #data;
@@ -1942,6 +2024,9 @@ class Message extends BaseStructure {
   reference;
   components;
   referencedMessage;
+  stickers;
+  poll;
+  messageSnapshots;
   member;
   #context;
   constructor(data, context) {
@@ -1963,6 +2048,13 @@ class Message extends BaseStructure {
     this.mentionEveryone = data.mention_everyone ?? false;
     this.type = data.type ?? 0;
     this.reference = data.message_reference;
+    this.stickers = data.sticker_items ?? (data.stickers ?? []).map(({ id, name, format_type }) => ({
+      id,
+      name,
+      format_type
+    }));
+    this.poll = data.poll ?? null;
+    this.messageSnapshots = data.message_snapshots ?? [];
     this.referencedMessage = data.referenced_message ? new Message(data.referenced_message, context) : data.referenced_message === null ? null : undefined;
     this.#context = context;
     this.member = data.member && data.guild_id ? new GuildMember({
@@ -2101,11 +2193,13 @@ export {
   AutoModerationRule,
   AutocompleteInteraction,
   BaseStructure,
+  CDN_BASE,
   CategoryChannel,
   Channel,
   CommandInteraction,
   CommandOptions,
   ComponentInteraction,
+  ContextMenuCommandInteraction,
   DMChannel,
   Embed,
   Emoji,
@@ -2115,7 +2209,9 @@ export {
   GuildOnboarding2 as GuildOnboarding,
   GuildWelcomeScreen2 as GuildWelcomeScreen,
   Interaction,
+  InteractionEnum,
   InteractionResponse,
+  InteractionResponseEnum,
   InteractionResponseType,
   InteractionType,
   Invite,
@@ -2133,10 +2229,12 @@ export {
   User,
   VoiceChannel,
   Webhook,
+  WebhookEnum,
   WebhookType,
   WelcomeScreenChannel,
+  cdnURL,
   createChannel,
   createInteraction
 };
 
-//# debugId=56391DD25556C30C64756E2164756E21
+//# debugId=1DD80FEE9EB768DF64756E2164756E21