lunibee 0.2.0 → 0.2.1

package/dist/core/index.js

@@ -396,6 +396,11 @@ class PermissionSet {
   toArray() {
     return Object.keys(Permission).filter((permission) => this.has(permission));
   }
+  static #renamed = {
+    ManageEmojisAndStickers: "ManageGuildExpressions",
+    ManageEmojis: "ManageGuildExpressions",
+    UseSlashCommands: "UseApplicationCommands"
+  };
   #resolve(permission) {
     if (typeof permission === "bigint")
       return permission;
@@ -410,6 +415,9 @@ class PermissionSet {
       return bit;
     }
     if (typeof permission === "string") {
+      const renamed = PermissionSet.#renamed[permission];
+      if (renamed)
+        return this.#resolve(renamed);
       if (permission in Permission)
         return Permission[permission];
       if (permission in Permissions)
@@ -1455,7 +1463,7 @@ class ResourceManager extends Manager {
 // packages/rest/package.json
 var package_default = {
   name: "@lunibee/rest",
-  version: "0.2.0",
+  version: "0.2.1",
   type: "module",
   module: "./src/index.ts",
   types: "./src/index.ts",
@@ -2263,6 +2271,11 @@ class Channel extends BaseStructure {
   editTopic(topic) {
     return this.edit({ topic });
   }
+  editPermissionOverwrite(targetId, changes, options) {
+    if (!this.#context?.editPermissionOverwrite)
+      throw new Error("This channel is not attached to a client.");
+    return this.#context.editPermissionOverwrite(this.id, targetId, changes, options);
+  }
   editParent(parentId) {
     return this.edit({ parent_id: parentId });
   }
@@ -2397,6 +2410,7 @@ class Guild extends BaseStructure {
     return this.name;
   }
 }
+
 // packages/structures/src/resources.ts
 function toDateOrNull(value) {
   if (!value)
@@ -2412,13 +2426,15 @@ class GuildMember {
   roleIds;
   pending;
   joinedAt;
-  permissions;
   avatarHash;
   premiumSince;
   timedOutUntil;
   flags;
-  constructor(data) {
+  #suppliedPermissions;
+  #context;
+  constructor(data, context) {
     this.user = new User(data.user);
+    this.#context = context;
     if (!/^\d{1,20}$/.test(data.guild_id))
       throw new TypeError("Member guild_id must be a valid snowflake.");
     this.guildId = data.guild_id;
@@ -2428,12 +2444,53 @@ class GuildMember {
     this.joinedAt = data.joined_at ? new Date(data.joined_at) : undefined;
     if (this.joinedAt?.toString() === "Invalid Date")
       throw new RangeError("Member joined_at must be a valid date.");
-    this.permissions = new PermissionsBitField(data.permissions ?? 0n);
+    if (data.permissions !== undefined)
+      this.#suppliedPermissions = new PermissionsBitField(data.permissions);
     this.avatarHash = data.avatar ?? null;
     this.premiumSince = toDateOrNull(data.premium_since);
     this.timedOutUntil = toDateOrNull(data.communication_disabled_until);
     this.flags = data.flags ?? 0;
   }
+  get permissions() {
+    if (this.#suppliedPermissions)
+      return this.#suppliedPermissions;
+    return new PermissionsBitField(this.#context?.memberPermissions?.(this.guildId, this.user.id, this.roleIds) ?? 0n);
+  }
+  permissionsIn(channelId) {
+    const computed = this.#context?.memberPermissions?.(this.guildId, this.user.id, this.roleIds, channelId);
+    return computed ? new PermissionsBitField(computed) : null;
+  }
+  #action(name) {
+    const action = this.#context?.[name];
+    if (!action)
+      throw new Error("This member is not attached to a client.");
+    return action;
+  }
+  kick(reason) {
+    return this.#action("kickMember")(this.guildId, this.user.id, reason);
+  }
+  ban(options = {}) {
+    return this.#action("banMember")(this.guildId, this.user.id, options);
+  }
+  edit(options, reason) {
+    return this.#action("editMember")(this.guildId, this.user.id, options, reason);
+  }
+  timeout(milliseconds, reason) {
+    if (milliseconds !== null && !(milliseconds > 0))
+      throw new RangeError("Timeout length must be a positive number of milliseconds.");
+    return this.edit({
+      communication_disabled_until: milliseconds === null ? null : new Date(Date.now() + milliseconds).toISOString()
+    }, reason);
+  }
+  setNickname(nickname, reason) {
+    return this.edit({ nick: nickname }, reason);
+  }
+  addRole(roleId, reason) {
+    return this.#action("addMemberRole")(this.guildId, this.user.id, roleId, reason);
+  }
+  removeRole(roleId, reason) {
+    return this.#action("removeMemberRole")(this.guildId, this.user.id, roleId, reason);
+  }
   get displayName() {
     return this.nickname ?? this.user.displayName;
   }
@@ -2827,6 +2884,17 @@ class CommandOptions {
       throw new TypeError(`Resolved mentionable for option "${name}" is missing.`);
     return resolved;
   }
+  getMentionableType(name) {
+    const opt = this.#get(name);
+    if (!opt || opt.type !== OptionType.Mentionable)
+      return null;
+    const id = String(opt.value);
+    if (this.#resolved?.users?.[id])
+      return "user";
+    if (this.#resolved?.roles?.[id])
+      return "role";
+    return null;
+  }
   getAttachment(name, required = false) {
     const opt = this.#get(name);
     if (!opt || opt.type !== OptionType.Attachment) {
@@ -2914,6 +2982,20 @@ class Interaction {
   isChatInputCommand() {
     return this.type === InteractionType.ApplicationCommand;
   }
+  awaitModalSubmit(options) {
+    const collect = this.#client.resourceContext?.collectInteractions;
+    if (!collect)
+      return Promise.reject(new Error("This interaction is not attached to a client."));
+    if (!(options.time > 0))
+      return Promise.reject(new RangeError("awaitModalSubmit needs a positive time."));
+    const userId = this.user?.id;
+    const collector = collect({
+      time: options.time,
+      max: 1,
+      filter: async (interaction) => interaction.isModalSubmit() && interaction.user?.id === userId && (options.customId === undefined || interaction.customId === options.customId) && (options.filter ? await options.filter(interaction) : true)
+    });
+    return collector.next();
+  }
   isMessageComponent() {
     return this.type === InteractionType.MessageComponent;
   }
@@ -2973,7 +3055,7 @@ class Interaction {
     return new GuildMember({
       ...raw,
       guild_id: this.guildId
-    });
+    }, this.#client.resourceContext);
   }
   get createdTimestamp() {
     return Number((BigInt(this.id) >> 22n) + DISCORD_EPOCH);
@@ -3009,7 +3091,8 @@ class Interaction {
   async reply(options) {
     return this.acknowledge(InteractionResponse.message(toMessageData(options)), "replied");
   }
-  async deferReply(ephemeral = false) {
+  async deferReply(options = false) {
+    const ephemeral = typeof options === "boolean" ? options : options.ephemeral === true;
     await this.acknowledge(InteractionResponse.defer(ephemeral), "deferred");
   }
   editReply(options) {
@@ -3027,7 +3110,8 @@ class Interaction {
     return this.acknowledge(new InteractionResponse(InteractionResponseType.MessageUpdate, toMessageData(options)), "replied");
   }
   async showModal(modal) {
-    return this.acknowledge(new InteractionResponse(InteractionResponseType.Modal, modal), "replied");
+    const data = "toJSON" in modal && typeof modal.toJSON === "function" ? modal.toJSON() : modal;
+    return this.acknowledge(new InteractionResponse(InteractionResponseType.Modal, data), "replied");
   }
 }
 
@@ -3048,6 +3132,9 @@ class ComponentInteraction extends Interaction {
   get customId() {
     return this.data?.data?.custom_id ?? "";
   }
+  get messageId() {
+    return this.data?.message?.id;
+  }
   get componentType() {
     return this.data?.data?.component_type ?? 0;
   }
@@ -3132,6 +3219,7 @@ function createInteraction(client, data) {
 }
 
 // packages/structures/src/index.ts
+var COMPONENT_COLLECTOR_DEFAULT_TIME = 15 * 60000;
 var NON_SYSTEM_MESSAGE_TYPES = new Set([0, 19, 20, 23]);
 
 class Message extends BaseStructure {
@@ -3152,6 +3240,7 @@ class Message extends BaseStructure {
   reference;
   components;
   referencedMessage;
+  member;
   #context;
   constructor(data, context) {
     super(data.id);
@@ -3174,6 +3263,11 @@ class Message extends BaseStructure {
     this.reference = data.message_reference;
     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({
+      ...data.member,
+      user: data.member.user ?? data.author,
+      guild_id: data.guild_id
+    }, context) : null;
     this.channel = new Channel({ id: data.channel_id, type: 0, guild_id: data.guild_id }, context);
   }
   get embedsSuppressed() {
@@ -3214,6 +3308,20 @@ class Message extends BaseStructure {
       throw new Error("This message is not attached to a client.");
     return this.#context.crosspostMessage(this.channelId, this.id);
   }
+  createComponentCollector(options = {}) {
+    const collect = this.#context?.collectInteractions;
+    if (!collect)
+      throw new Error("This message is not attached to a client.");
+    const { componentType, filter, ...rest } = options;
+    return collect({
+      ...rest,
+      time: rest.time ?? (rest.idle ? undefined : COMPONENT_COLLECTOR_DEFAULT_TIME),
+      filter: async (interaction) => interaction.isMessageComponent() && interaction.messageId === this.id && (componentType === undefined || interaction.componentType === componentType) && (filter ? await filter(interaction) : true)
+    });
+  }
+  awaitComponent(options = {}) {
+    return this.createComponentCollector({ ...options, max: 1 }).next();
+  }
   react(emoji) {
     if (!this.#context?.addReaction)
       throw new Error("This message is not attached to a client.");
@@ -3287,6 +3395,20 @@ class Message extends BaseStructure {
 }
 
 // packages/managers/src/message.ts
+function toRequest(options) {
+  const { files, ...body } = options;
+  if (!files?.length)
+    return body;
+  return {
+    body,
+    files: files.map((file) => ({
+      name: file.name,
+      data: typeof file.data === "string" ? new TextEncoder().encode(file.data) : file.data,
+      contentType: file.contentType
+    }))
+  };
+}
+
 class MessageManager {
   cache;
   #caching;
@@ -3309,7 +3431,7 @@ class MessageManager {
     return this.cache.get(messageId) ?? this.fetch(messageId);
   }
   async send(options) {
-    const data = await this.#rest.post(Routes.channelMessages(this.#channelId), options);
+    const data = await this.#rest.post(Routes.channelMessages(this.#channelId), toRequest(options));
     return this.upsert(data);
   }
   async fetch(messageId) {
@@ -3590,14 +3712,20 @@ class MonetizationManager extends Manager {
 // packages/managers/src/member.ts
 class GuildMemberManager extends ResourceManager {
   #rest;
+  #context;
   guildId;
-  constructor(guildId, rest) {
-    super((id) => rest.get(Routes.guildMember(guildId, id)).then((data) => new GuildMember({ ...data, guild_id: guildId })), (member) => member.user.id);
+  constructor(guildId, rest, context = () => {
+    return;
+  }) {
+    super((id) => rest.get(Routes.guildMember(guildId, id)).then((data) => new GuildMember({ ...data, guild_id: guildId }, context())), (member) => member.user.id);
     this.guildId = guildId;
     this.#rest = rest;
+    this.#context = context;
   }
-  async kick(userId) {
-    await this.#rest.delete(Routes.guildMember(this.guildId, userId));
+  async kick(userId, reason) {
+    await this.#rest.delete(Routes.guildMember(this.guildId, userId), {
+      reason
+    });
     this.delete(userId);
   }
   async ban(userId, options = {}) {
@@ -3607,21 +3735,21 @@ class GuildMemberManager extends ResourceManager {
   async unban(userId) {
     await this.#rest.delete(Routes.guildBan(this.guildId, userId));
   }
-  async edit(userId, options) {
-    const data = await this.#rest.patch(Routes.guildMember(this.guildId, userId), options);
-    const member = new GuildMember({ ...data, guild_id: this.guildId });
+  async edit(userId, options, reason) {
+    const data = await this.#rest.patch(Routes.guildMember(this.guildId, userId), options, { reason });
+    const member = new GuildMember({ ...data, guild_id: this.guildId }, this.#context());
     this.set(member.user.id, member);
     return member;
   }
-  async addRole(userId, roleId) {
-    await this.#rest.put(Routes.guildMemberRole(this.guildId, userId, roleId));
+  async addRole(userId, roleId, reason) {
+    await this.#rest.put(Routes.guildMemberRole(this.guildId, userId, roleId), undefined, { reason });
   }
-  async removeRole(userId, roleId) {
-    await this.#rest.delete(Routes.guildMemberRole(this.guildId, userId, roleId));
+  async removeRole(userId, roleId, reason) {
+    await this.#rest.delete(Routes.guildMemberRole(this.guildId, userId, roleId), { reason });
   }
-  async timeout(userId, milliseconds) {
+  async timeout(userId, milliseconds, reason) {
     const timeoutDate = milliseconds === null ? null : new Date(Date.now() + milliseconds).toISOString();
-    return this.edit(userId, { communication_disabled_until: timeoutDate });
+    return this.edit(userId, { communication_disabled_until: timeoutDate }, reason);
   }
 }
 
@@ -3792,10 +3920,25 @@ class StageInstanceManager extends Manager {
 
 class PermissionOverwriteManager {
   #rest;
+  #current;
   channelId;
-  constructor(rest, channelId) {
+  constructor(rest, channelId, current = () => {
+    return;
+  }) {
     this.#rest = rest;
     this.channelId = channelId;
+    this.#current = current;
+  }
+  async update(overwriteId, changes, options = {}) {
+    const overwrites = this.#current() ?? (await this.#rest.get(Routes.channel(this.channelId))).permission_overwrites ?? [];
+    const existing = overwrites.find((entry) => entry.id === overwriteId);
+    const type = existing?.type ?? options.type;
+    if (type !== 0 && type !== 1)
+      throw new TypeError("A new permission overwrite needs a type: 0 for a role, 1 for a member.");
+    const touched = (changes.allow ?? 0n) | (changes.deny ?? 0n) | (changes.inherit ?? 0n);
+    const allow = BigInt(existing?.allow ?? 0) & ~touched | (changes.allow ?? 0n);
+    const deny = BigInt(existing?.deny ?? 0) & ~touched | (changes.deny ?? 0n);
+    await this.edit(overwriteId, { type, allow, deny }, options.reason);
   }
   async edit(overwriteId, options, reason) {
     await this.#rest.put(Routes.channelPermission(this.channelId, overwriteId), {
@@ -3827,6 +3970,10 @@ class GuildManager extends ResourceManager {
   #voiceStates = new Map;
   #autoModerationRules = new Map;
   #invites = new Map;
+  #context;
+  attachContext(context) {
+    this.#context = context;
+  }
   #perGuild(map, guildId, create) {
     let manager = map.get(guildId);
     if (!manager)
@@ -3852,7 +3999,7 @@ class GuildManager extends ResourceManager {
   members(guildId) {
     let manager = this.#members.get(guildId);
     if (!manager)
-      this.#members.set(guildId, manager = new GuildMemberManager(guildId, this.#rest));
+      this.#members.set(guildId, manager = new GuildMemberManager(guildId, this.#rest, () => this.#context));
     return manager;
   }
   roles(guildId) {
@@ -4055,7 +4202,7 @@ class ChannelManager extends Manager {
     return manager;
   }
   permissionOverwrites(channelId) {
-    return new PermissionOverwriteManager(this.#rest, channelId);
+    return new PermissionOverwriteManager(this.#rest, channelId, () => this.get(channelId)?.permissionOverwrites);
   }
   threads(channelId) {
     return new ThreadManager(this.#rest, this.#context, channelId);
@@ -4155,7 +4302,7 @@ class ChannelManager extends Manager {
     return this.messages(data.channel_id).upsert(data);
   }
   async editMessage(channelId, messageId, options) {
-    return this.messages(channelId).upsert(await this.#rest.patch(Routes.message(channelId, messageId), options));
+    return this.messages(channelId).upsert(await this.#rest.patch(Routes.message(channelId, messageId), toRequest(options)));
   }
   async deleteMessage(channelId, messageId) {
     await this.#rest.delete(Routes.message(channelId, messageId));
@@ -5477,8 +5624,32 @@ class Client extends EventEmitter2 {
       removeReaction: (channelId, messageId, emoji, userId) => this.channels.removeReaction(channelId, messageId, emoji, userId),
       removeAllReactions: (channelId, messageId) => this.channels.removeAllReactions(channelId, messageId),
       pinMessage: (channelId, messageId) => this.channels.pinMessage(channelId, messageId),
-      unpinMessage: (channelId, messageId) => this.channels.unpinMessage(channelId, messageId)
+      unpinMessage: (channelId, messageId) => this.channels.unpinMessage(channelId, messageId),
+      collectInteractions: (options) => this.createCollector("interactionCreate" /* InteractionCreate */, options),
+      memberPermissions: (guildId, memberId, roleIds, channelId) => this.#memberPermissions(guildId, memberId, roleIds, channelId),
+      kickMember: (guildId, userId, reason) => this.guilds.members(guildId).kick(userId, reason),
+      banMember: (guildId, userId, options) => this.guilds.members(guildId).ban(userId, options),
+      editMember: (guildId, userId, options, reason) => this.guilds.members(guildId).edit(userId, options, reason),
+      addMemberRole: (guildId, userId, roleId, reason) => this.guilds.members(guildId).addRole(userId, roleId, reason),
+      removeMemberRole: (guildId, userId, roleId, reason) => this.guilds.members(guildId).removeRole(userId, roleId, reason),
+      editPermissionOverwrite: async (channelId, targetId, changes, options) => {
+        const bits = { allow: 0n, deny: 0n, inherit: 0n };
+        for (const [name, value] of Object.entries(changes)) {
+          if (!/^[A-Za-z]+$/.test(name))
+            throw new TypeError(`Unknown permission: ${name}`);
+          let bit;
+          try {
+            bit = new PermissionSet(name).bitfield;
+          } catch {
+            throw new TypeError(`Unknown permission: ${name}`);
+          }
+          const key = value === true ? "allow" : value === false ? "deny" : "inherit";
+          bits[key] |= bit;
+        }
+        return this.channels.permissionOverwrites(channelId).update(targetId, bits, options);
+      }
     };
+    this.guilds.attachContext(this.#resourceContext);
     this.#gateway = new Gateway({
       token: options.token,
       intents: options.intents,
@@ -5510,8 +5681,14 @@ class Client extends EventEmitter2 {
       this.emit("close" /* Close */, data);
     });
     this.#gateway.on("MESSAGE_CREATE", (data) => {
-      const message = new Message(data, this.#resourceContext);
+      const payload = data;
+      const message = new Message(payload, this.#resourceContext);
       this.#observeMessage(message);
+      if (payload.member && payload.guild_id && this.guilds.has(payload.guild_id))
+        this.#upsertMember(payload.guild_id, {
+          ...payload.member,
+          user: payload.member.user ?? payload.author
+        });
       const cached = this.options.messageCache ? this.channels.messages(message.channelId).upsert(data) : message;
       this.emit("messageCreate" /* MessageCreate */, cached);
     });
@@ -5816,7 +5993,7 @@ class Client extends EventEmitter2 {
       this.#merge(this.users, message.author.id, message.author);
   }
   #upsertMember(guildId, data) {
-    const member = new GuildMember({ ...data, guild_id: guildId });
+    const member = new GuildMember({ ...data, guild_id: guildId }, this.#resourceContext);
     if (this.#cache.users)
       this.#merge(this.users, member.user.id, member.user);
     if (!this.#cache.members)
@@ -5859,6 +6036,29 @@ class Client extends EventEmitter2 {
     collector.onDispose(() => this.off(event, listener));
     return collector;
   }
+  get resourceContext() {
+    return this.#resourceContext;
+  }
+  #memberPermissions(guildId, memberId, roleIds, channelId) {
+    const guild = this.guilds.get(guildId);
+    if (!guild)
+      return null;
+    let channel = channelId ? this.channels.get(channelId) : undefined;
+    if (channelId) {
+      if (channel?.isThread())
+        channel = channel.parentId ? this.channels.get(channel.parentId) : undefined;
+      if (!channel || channel.guildId !== guildId)
+        return null;
+    }
+    return computePermissions({
+      guildId,
+      ownerId: guild.ownerId,
+      memberId,
+      memberRoleIds: [...roleIds],
+      roles: this.guilds.roles(guildId).values(),
+      overwrites: channel?.permissionOverwrites
+    });
+  }
   permissionsFor(memberId, guildOrChannelId) {
     let channel = this.channels.get(guildOrChannelId);
     if (channel?.isThread()) {
@@ -5902,12 +6102,21 @@ class Client extends EventEmitter2 {
     this.#gateway.close();
   }
   postInteractionResponse(id, token, response) {
-    return this.rest.post(Routes.interactionCallback(id, token), response.toJSON());
+    const json = response.toJSON();
+    const upload = json.data ? toRequest(json.data) : undefined;
+    if (upload && typeof upload === "object" && "files" in upload) {
+      const { body, files } = upload;
+      return this.rest.post(Routes.interactionCallback(id, token), {
+        body: { ...json, data: body },
+        files
+      });
+    }
+    return this.rest.post(Routes.interactionCallback(id, token), json);
   }
   editInteractionReply(token, data) {
     if (!this.user)
       return Promise.reject(new Error("Client is unauthenticated."));
-    return this.rest.patch(Routes.interactionOriginalResponse(this.user.id, token), data);
+    return this.rest.patch(Routes.interactionOriginalResponse(this.user.id, token), toRequest(data));
   }
   deleteInteractionReply(token) {
     if (!this.user)
@@ -5917,7 +6126,7 @@ class Client extends EventEmitter2 {
   followUpInteraction(token, data) {
     if (!this.user)
       return Promise.reject(new Error("Client is unauthenticated."));
-    return this.rest.post(`/webhooks/${this.user.id}/${token}`, data);
+    return this.rest.post(`/webhooks/${this.user.id}/${token}`, toRequest(data));
   }
   interactionWebhookMessage(method, applicationId, token, messageId, data) {
     const path = messageId === "@original" ? Routes.interactionOriginalResponse(applicationId, token) : Routes.webhookMessage(applicationId, token, messageId);
@@ -5988,4 +6197,4 @@ export {
   resolveGatewayIntents
 };
 
-//# debugId=29BD1D4A42C8D39264756E2164756E21
+//# debugId=C58DF09843ED07E364756E2164756E21