lunibee 0.2.1 → 0.2.3

package/dist/structures/index.js

@@ -88,13 +88,13 @@ class Channel extends BaseStructure {
     this.permissionOverwrites = (data.permission_overwrites ?? []).map((overwrite) => ({ ...overwrite }));
     this.#context = context;
   }
-  sendMessage(options) {
+  send(options) {
     if (!this.#context)
       throw new Error("This channel is not attached to a client.");
     return this.#context.sendMessage(this.id, options);
   }
-  send(options) {
-    return this.sendMessage(options);
+  sendMessage(options) {
+    return this.send(options);
   }
   edit(options) {
     if (!this.#context?.editChannel)
@@ -117,10 +117,10 @@ class Channel extends BaseStructure {
   editParent(parentId) {
     return this.edit({ parent_id: parentId });
   }
-  delete() {
+  delete(reason) {
     if (!this.#context?.deleteChannel)
       throw new Error("This channel is not attached to a client.");
-    return this.#context.deleteChannel(this.id);
+    return this.#context.deleteChannel(this.id, reason);
   }
   update(options) {
     return this.edit(options);
@@ -167,6 +167,15 @@ class Guild extends BaseStructure {
   mfaLevel;
   explicitContentFilter;
   defaultMessageNotifications;
+  afkChannelId;
+  afkTimeout;
+  widgetEnabled;
+  widgetChannelId;
+  applicationId;
+  publicUpdatesChannelId;
+  safetyAlertsChannelId;
+  maxPresences;
+  maxVideoChannelUsers;
   constructor(data) {
     super(data.id);
     if (!data.name)
@@ -188,14 +197,22 @@ class Guild extends BaseStructure {
     this.vanityUrlCode = data.vanity_url_code ?? null;
     this.nsfwLevel = data.nsfw_level ?? 0;
     this.discoverySplash = data.discovery_splash ?? null;
-    const d = data;
-    this.rulesChannelId = d.rules_channel_id ?? null;
-    this.systemChannelId = d.system_channel_id ?? null;
-    this.systemChannelFlags = d.system_channel_flags ?? 0;
-    this.maxMembers = d.max_members ?? 0;
-    this.mfaLevel = d.mfa_level ?? 0;
-    this.explicitContentFilter = d.explicit_content_filter ?? 0;
-    this.defaultMessageNotifications = d.default_message_notifications ?? 0;
+    this.rulesChannelId = data.rules_channel_id ?? null;
+    this.systemChannelId = data.system_channel_id ?? null;
+    this.systemChannelFlags = data.system_channel_flags ?? 0;
+    this.maxMembers = data.max_members ?? 0;
+    this.mfaLevel = data.mfa_level ?? 0;
+    this.explicitContentFilter = data.explicit_content_filter ?? 0;
+    this.defaultMessageNotifications = data.default_message_notifications ?? 0;
+    this.afkChannelId = data.afk_channel_id ?? null;
+    this.afkTimeout = data.afk_timeout;
+    this.widgetEnabled = data.widget_enabled ?? false;
+    this.widgetChannelId = data.widget_channel_id ?? null;
+    this.applicationId = data.application_id ?? null;
+    this.publicUpdatesChannelId = data.public_updates_channel_id ?? null;
+    this.safetyAlertsChannelId = data.safety_alerts_channel_id ?? null;
+    this.maxPresences = data.max_presences ?? null;
+    this.maxVideoChannelUsers = data.max_video_channel_users;
   }
   iconURL(options = {}) {
     if (!this.icon)
@@ -739,7 +756,7 @@ var IntentBits = {
   directMessagePolls: 1 << 25
 };
 // packages/types/src/index.ts
-var InteractionResponseType = {
+var InteractionResponseEnum = {
   Pong: 1,
   ChannelMessage: 4,
   DeferredChannelMessage: 5,
@@ -748,22 +765,26 @@ 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.3",
   type: "module",
   module: "./src/index.ts",
   types: "./src/index.ts",
   exports: {
     ".": "./src/index.ts"
+  },
+  dependencies: {
+    "@lunibee/types": "workspace:*"
   }
 };
 
 // packages/rest/src/index.ts
 var LIBRARY_VERSION = package_default.version;
 var LIBRARY_URL = "https://github.com/Ekretos/lunibee";
-var USER_AGENT = `DiscordBot (${LIBRARY_URL}, ${package_default.version})`;
+var USER_AGENT = `DiscordBot (${LIBRARY_URL}, ${LIBRARY_VERSION})`;
 var REQUEST_DATA_KEYS = new Set([
   "body",
   "files",
@@ -989,7 +1010,7 @@ class Invite {
     return this.url;
   }
 }
-var WebhookType = {
+var WebhookEnum = {
   Incoming: 1,
   ChannelFollower: 2,
   Application: 3
@@ -1005,7 +1026,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;
@@ -1114,7 +1135,7 @@ class WelcomeScreenChannel {
   }
 }
 
-class GuildWelcomeScreen2 {
+class GuildWelcomeScreen {
   description;
   channels;
   constructor(data) {
@@ -1157,7 +1178,7 @@ class OnboardingPrompt extends BaseStructure {
   }
 }
 
-class GuildOnboarding2 extends BaseStructure {
+class GuildOnboarding extends BaseStructure {
   prompts;
   defaultChannelIds;
   enabled;
@@ -1170,6 +1191,7 @@ class GuildOnboarding2 extends BaseStructure {
     this.mode = data.mode;
   }
 }
+var WebhookType = WebhookEnum;
 // packages/structures/src/channels.ts
 class NewsChannel extends TextChannel {
 }
@@ -1288,6 +1310,13 @@ var OptionType = {
 class CommandOptions {
   #options;
   #resolved;
+  #lookup(kind, id) {
+    const group = this.#resolved?.[kind];
+    if (typeof group !== "object" || group === null)
+      return;
+    const entry = group[id];
+    return typeof entry === "object" && entry !== null ? entry : undefined;
+  }
   constructor(options, resolved = {}) {
     let currentOptions = options;
     let group = null;
@@ -1376,7 +1405,7 @@ class CommandOptions {
       return null;
     }
     const userId = String(opt.value);
-    const resolved = this.#resolved?.users?.[userId] ?? null;
+    const resolved = this.#lookup("users", userId) ?? null;
     if (!resolved && required)
       throw new TypeError(`Resolved user for option "${name}" is missing.`);
     return resolved;
@@ -1389,7 +1418,7 @@ class CommandOptions {
       return null;
     }
     const channelId = String(opt.value);
-    const resolved = this.#resolved?.channels?.[channelId] ?? null;
+    const resolved = this.#lookup("channels", channelId) ?? null;
     if (!resolved && required)
       throw new TypeError(`Resolved channel for option "${name}" is missing.`);
     return resolved;
@@ -1402,7 +1431,7 @@ class CommandOptions {
       return null;
     }
     const roleId = String(opt.value);
-    const resolved = this.#resolved?.roles?.[roleId] ?? null;
+    const resolved = this.#lookup("roles", roleId) ?? null;
     if (!resolved && required)
       throw new TypeError(`Resolved role for option "${name}" is missing.`);
     return resolved;
@@ -1415,7 +1444,7 @@ class CommandOptions {
       return null;
     }
     const id = String(opt.value);
-    const resolved = this.#resolved?.users?.[id] ?? this.#resolved?.roles?.[id] ?? null;
+    const resolved = this.#lookup("users", id) ?? this.#lookup("roles", id) ?? null;
     if (!resolved && required)
       throw new TypeError(`Resolved mentionable for option "${name}" is missing.`);
     return resolved;
@@ -1425,9 +1454,9 @@ class CommandOptions {
     if (!opt || opt.type !== OptionType.Mentionable)
       return null;
     const id = String(opt.value);
-    if (this.#resolved?.users?.[id])
+    if (this.#lookup("users", id))
       return "user";
-    if (this.#resolved?.roles?.[id])
+    if (this.#lookup("roles", id))
       return "role";
     return null;
   }
@@ -1439,7 +1468,7 @@ class CommandOptions {
       return null;
     }
     const attachmentId = String(opt.value);
-    const resolved = this.#resolved?.attachments?.[attachmentId] ?? null;
+    const resolved = this.#lookup("attachments", attachmentId) ?? null;
     if (!resolved && required)
       throw new TypeError(`Resolved attachment for option "${name}" is missing.`);
     return resolved;
@@ -1449,7 +1478,7 @@ class CommandOptions {
   }
 }
 // packages/structures/src/interactions.ts
-var InteractionType = {
+var InteractionEnum = {
   Ping: 1,
   ApplicationCommand: 2,
   MessageComponent: 3,
@@ -1457,8 +1486,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 +1509,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 +1520,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 +1554,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 +1594,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 +1685,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 +1716,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,33 +1738,69 @@ 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 ?? "";
+    const id = this.data.data?.custom_id;
+    return typeof id === "string" ? id : "";
   }
   get messageId() {
-    return this.data?.message?.id;
+    return this.data.message?.id;
   }
   get componentType() {
-    return this.data?.data?.component_type ?? 0;
+    const type = this.data.data?.component_type;
+    return typeof type === "number" ? type : 0;
   }
   get values() {
-    return this.data?.data?.values ?? [];
-  }
-  async deferUpdate() {
-    await this.acknowledge(new InteractionResponse(InteractionResponseType.DeferredMessageUpdate), "deferred");
+    const values = this.data.data?.values;
+    return Array.isArray(values) ? values : [];
   }
-  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;
   }
 }
 
 class ModalSubmitInteraction extends Interaction {
   get customId() {
-    return this.data?.data?.custom_id ?? "";
+    const id = this.data.data?.custom_id;
+    return typeof id === "string" ? id : "";
   }
   getInputValue(customId) {
-    const rows = this.data?.data?.components ?? [];
+    const rows = this.data.data?.components ?? [];
     for (const row of rows) {
       for (const comp of row.components ?? []) {
         if (comp.custom_id === customId)
@@ -1714,16 +1824,17 @@ class AutocompleteInteraction extends Interaction {
     this.options = new CommandOptions(data.data?.options ?? []);
   }
   get commandName() {
-    return this.data?.data?.name ?? "";
+    const name = this.data.data?.name;
+    return typeof name === "string" ? name : "";
   }
   get focusedOption() {
-    const options = this.data?.data?.options ?? [];
-    return findFocused(options);
+    const options = this.data.data?.options;
+    return findFocused(Array.isArray(options) ? options : []);
   }
   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 +1852,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 +2056,9 @@ class Message extends BaseStructure {
   reference;
   components;
   referencedMessage;
+  stickers;
+  poll;
+  messageSnapshots;
   member;
   #context;
   constructor(data, context) {
@@ -1963,6 +2080,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({
@@ -1989,10 +2113,10 @@ class Message extends BaseStructure {
   update(options) {
     return this.edit(options);
   }
-  delete() {
+  delete(reason) {
     if (!this.#context)
       throw new Error("This message is not attached to a client.");
-    return this.#context.deleteMessage(this.channelId, this.id);
+    return this.#context.deleteMessage(this.channelId, this.id, reason);
   }
   reply(options) {
     if (!this.#context)
@@ -2039,15 +2163,15 @@ class Message extends BaseStructure {
       throw new Error("This message is not attached to a client.");
     return this.#context.removeAllReactions(this.channelId, this.id);
   }
-  pin() {
+  pin(reason) {
     if (!this.#context?.pinMessage)
       throw new Error("This message is not attached to a client.");
-    return this.#context.pinMessage(this.channelId, this.id);
+    return this.#context.pinMessage(this.channelId, this.id, reason);
   }
-  unpin() {
+  unpin(reason) {
     if (!this.#context?.unpinMessage)
       throw new Error("This message is not attached to a client.");
-    return this.#context.unpinMessage(this.channelId, this.id);
+    return this.#context.unpinMessage(this.channelId, this.id, reason);
   }
   get isEphemeral() {
     return (this.flags & 64) !== 0;
@@ -2101,21 +2225,25 @@ export {
   AutoModerationRule,
   AutocompleteInteraction,
   BaseStructure,
+  CDN_BASE,
   CategoryChannel,
   Channel,
   CommandInteraction,
   CommandOptions,
   ComponentInteraction,
+  ContextMenuCommandInteraction,
   DMChannel,
   Embed,
   Emoji,
   ForumChannel,
   Guild,
   GuildMember,
-  GuildOnboarding2 as GuildOnboarding,
-  GuildWelcomeScreen2 as GuildWelcomeScreen,
+  GuildOnboarding,
+  GuildWelcomeScreen,
   Interaction,
+  InteractionEnum,
   InteractionResponse,
+  InteractionResponseEnum,
   InteractionResponseType,
   InteractionType,
   Invite,
@@ -2133,10 +2261,12 @@ export {
   User,
   VoiceChannel,
   Webhook,
+  WebhookEnum,
   WebhookType,
   WelcomeScreenChannel,
+  cdnURL,
   createChannel,
   createInteraction
 };
 
-//# debugId=56391DD25556C30C64756E2164756E21
+//# debugId=07D330C2B35D9E3E64756E2164756E21