lunibee 0.2.0 → 0.2.2

package/dist/managers/guild-resources.d.ts

@@ -1,6 +1,6 @@
 import { Manager } from "./base.js";
 import { type REST } from "@lunibee/rest";
-import type { APIGuildScheduledEvent, APIStageInstance, UserData } from "@lunibee/types";
+import type { APIOverwrite, APIGuildScheduledEvent, APIStageInstance, UserData } from "@lunibee/types";
 /** Raw Discord ban object. */
 export interface APIBan {
     user: UserData;
@@ -97,11 +97,31 @@ export interface PermissionOverwriteOptions {
     /** Denied permission bits. */
     deny?: bigint | number | string;
 }
+/** Bits to change on one overwrite by {@link PermissionOverwriteManager.update}; bits in none of them keep their state. */
+export interface PermissionOverwriteUpdate {
+    /** Bits to allow. */
+    allow?: bigint;
+    /** Bits to deny. */
+    deny?: bigint;
+    /** Bits to reset to inherited (neither allowed nor denied). */
+    inherit?: bigint;
+}
 /** Manages a channel's permission overwrites. Discord.js-familiar. */
 export declare class PermissionOverwriteManager {
     #private;
     readonly channelId: string;
-    constructor(rest: REST, channelId: string);
+    /** @param current The channel's cached overwrites, read by {@link update}; the channel is fetched when they are unknown. */
+    constructor(rest: REST, channelId: string, current?: () => readonly APIOverwrite[] | undefined);
+    /**
+     * Changes some bits of one overwrite and keeps the rest -- unlike
+     * {@link edit}, which replaces the whole overwrite. Creates the overwrite
+     * when there is none (then `options.type` is required).
+     * @throws {TypeError} When the overwrite does not exist and no type is given.
+     */
+    update(overwriteId: string, changes: PermissionOverwriteUpdate, options?: {
+        type?: PermissionOverwriteTargetType;
+        reason?: string;
+    }): Promise<void>;
     /** Creates or replaces the overwrite for a role or member. */
     edit(overwriteId: string, options: PermissionOverwriteOptions, reason?: string): Promise<void>;
     /** Deletes the overwrite for a role or member. */

package/dist/managers/guild.d.ts

@@ -4,7 +4,7 @@ import { GuildSoundboardManager, GuildStickerManager } from "./advanced.js";
 import { GuildMemberManager } from "./member.js";
 import { RoleManager } from "./role.js";
 import { GuildBanManager, GuildScheduledEventManager } from "./guild-resources.js";
-import { Guild, AutoModerationRule } from "@lunibee/structures";
+import { Guild, AutoModerationRule, type ResourceContext } from "@lunibee/structures";
 import { type REST } from "@lunibee/rest";
 import { type APIChannel, type APIGuildPreview, type APIInvite, type APIWebhook, type APIAutoModerationRule, type APIInviteCreate, type APIVoiceState } from "@lunibee/types";
 type GuildData = ConstructorParameters<typeof Guild>[0];
@@ -15,6 +15,8 @@ export interface GuildEditOptions extends Record<string, unknown> {
 }
 export declare class GuildManager extends ResourceManager<string, Guild> {
     #private;
+    /** Lets members from this manager act through a client (`member.kick()`...). Called by the client. */
+    attachContext(context: ResourceContext): void;
     constructor(rest: REST);
     /** Ban manager for a guild (one instance per guild). */
     bans(guildId: string): GuildBanManager;

package/dist/managers/index.d.ts

@@ -42,9 +42,13 @@ export type ChannelEditOptions = Record<string, unknown>;
 import { PermissionOverwriteManager } from "./guild-resources.js";
 export declare class ChannelManager extends Manager<string, Channel> {
     #private;
-    /** @param options.messageCache Enables a bounded per-channel message cache; messages are not cached by default. */
+    /**
+     * @param options.messageCache Enables a bounded per-channel message cache; messages are not cached by default.
+     * @param options.allowedMentions Default `allowed_mentions` for sends and edits without their own.
+     */
     constructor(rest: REST, options?: {
         messageCache?: MessageCacheOptions;
+        allowedMentions?: unknown;
     });
     messages(channelId: string): MessageManager;
     /** Permission overwrite manager for a channel. */
@@ -135,11 +139,11 @@ export declare class ChannelManager extends Manager<string, Channel> {
     clear(): void;
 }
 export type CreateMessageOptions = MessageCreateOptions;
-export { MessageManager, type MessageCacheOptions } from "./message.js";
+export { MessageManager, toRequest, type MessageCacheOptions, type MessageFile, } from "./message.js";
 export { ThreadManager } from "./thread.js";
 export { RoleManager, type RoleCreateOptions, type RoleEditOptions, } from "./role.js";
 export { GuildMemberManager, type MemberEditOptions, type BanOptions, } from "./member.js";
 export { ApplicationCommandManager } from "./application.js";
-export { GuildBanManager, GuildScheduledEventManager, StageInstanceManager, PermissionOverwriteManager, type APIBan, type GuildBanCreateOptions, type GuildScheduledEventOptions, type StageInstanceCreateOptions, type PermissionOverwriteOptions, type PermissionOverwriteTargetType, } from "./guild-resources.js";
+export { GuildBanManager, GuildScheduledEventManager, StageInstanceManager, PermissionOverwriteManager, type APIBan, type GuildBanCreateOptions, type GuildScheduledEventOptions, type StageInstanceCreateOptions, type PermissionOverwriteOptions, type PermissionOverwriteTargetType, type PermissionOverwriteUpdate, } from "./guild-resources.js";
 export { EmojiManager, type EmojiCreateOptions, type EmojiEditOptions, } from "./emoji.js";
 export { GuildStickerManager, GuildSoundboardManager, MonetizationManager, type APIEntitlement, type APISKU, type APISoundboardSound, type APISubscription, type EntitlementQuery, type GuildStickerCreateOptions, type SoundboardSoundCreateOptions, } from "./advanced.js";

package/dist/managers/index.js

@@ -651,7 +651,7 @@ class ResourceManager extends Manager {
 // packages/rest/package.json
 var package_default = {
   name: "@lunibee/rest",
-  version: "0.2.0",
+  version: "0.2.2",
   type: "module",
   module: "./src/index.ts",
   types: "./src/index.ts",
@@ -865,6 +865,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 });
   }
@@ -999,6 +1004,7 @@ class Guild extends BaseStructure {
     return this.name;
   }
 }
+
 // packages/core/src/permissions.ts
 var Permission = {
   createInstantInvite: 1n << 0n,
@@ -1391,6 +1397,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;
@@ -1405,6 +1416,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)
@@ -1526,13 +1540,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;
@@ -1542,12 +1558,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;
   }
@@ -1617,7 +1674,7 @@ class TextChannel extends Channel {
     return `<#${this.id}>`;
   }
 }
-class Emoji extends BaseStructure {
+class Emoji2 extends BaseStructure {
   name;
   roleIds;
   user;
@@ -1764,7 +1821,7 @@ class ForumChannel extends Channel {
 
 class MediaChannel extends ForumChannel {
 }
-function createChannel2(data, context) {
+function createChannel(data, context) {
   switch (data.type) {
     case 0:
       return new TextChannel(data, context);
@@ -1795,6 +1852,7 @@ function createChannel2(data, context) {
 var TOKEN_LIFETIME_MS = 15 * 60000;
 
 // 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 {
@@ -1815,6 +1873,10 @@ class Message extends BaseStructure {
   reference;
   components;
   referencedMessage;
+  stickers;
+  poll;
+  messageSnapshots;
+  member;
   #context;
   constructor(data, context) {
     super(data.id);
@@ -1835,8 +1897,20 @@ 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({
+      ...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() {
@@ -1877,6 +1951,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.");
@@ -1950,15 +2038,33 @@ class Message extends BaseStructure {
 }
 
 // packages/managers/src/message.ts
+function toRequest(options, allowedMentions) {
+  const { files, ...body } = options;
+  if (allowedMentions !== undefined && body.allowed_mentions === undefined)
+    body.allowed_mentions = allowedMentions;
+  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;
   #rest;
   #context;
   #channelId;
-  constructor(rest, context, channelId, cache) {
+  #allowedMentions;
+  constructor(rest, context, channelId, cache, allowedMentions) {
     if (!channelId)
       throw new TypeError("Channel ID is required.");
+    this.#allowedMentions = allowedMentions;
     this.#rest = rest;
     this.#context = context;
     this.#channelId = channelId;
@@ -1972,7 +2078,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, this.#allowedMentions));
     return this.upsert(data);
   }
   async fetch(messageId) {
@@ -2016,7 +2122,7 @@ class ThreadManager {
       auto_archive_duration: options.autoArchiveDuration,
       rate_limit_per_user: options.rateLimitPerUser
     });
-    return createChannel2(data, this.#context);
+    return createChannel(data, this.#context);
   }
 }
 
@@ -2054,7 +2160,7 @@ class EmojiManager extends Manager {
     this.#guildId = guildId;
   }
   fetch(emojiId) {
-    return this.fetchOnce(emojiId, async () => new Emoji(await this.#rest.get(Routes.guildEmoji(this.#guildId, emojiId))), (emoji) => this.#merge(emojiId, emoji));
+    return this.fetchOnce(emojiId, async () => new Emoji2(await this.#rest.get(Routes.guildEmoji(this.#guildId, emojiId))), (emoji) => this.#merge(emojiId, emoji));
   }
   async fetchAll() {
     const data = await this.#rest.get(Routes.guildEmoji(this.#guildId));
@@ -2072,7 +2178,7 @@ class EmojiManager extends Manager {
   }
   upsert(data) {
     const key = data.id != null ? data.id : `unicode:${data.name ?? ""}`;
-    return this.#merge(key, new Emoji(data));
+    return this.#merge(key, new Emoji2(data));
   }
   #merge(key, emoji) {
     const existing = this.get(key);
@@ -2253,14 +2359,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 = {}) {
@@ -2270,21 +2382,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);
   }
 }
 
@@ -2455,10 +2567,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), {
@@ -2490,6 +2617,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)
@@ -2515,7 +2646,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) {
@@ -2743,10 +2874,12 @@ class ChannelManager extends Manager {
   #context;
   #messageManagers = new Map;
   #messageCache;
+  #allowedMentions;
   constructor(rest, options = {}) {
     super();
     this.#rest = rest;
     this.#messageCache = options.messageCache;
+    this.#allowedMentions = options.allowedMentions;
     this.#context = {
       sendMessage: (channelId, options) => this.send(channelId, options),
       editMessage: (channelId, messageId, options) => this.editMessage(channelId, messageId, options),
@@ -2765,25 +2898,25 @@ class ChannelManager extends Manager {
   messages(channelId) {
     let manager = this.#messageManagers.get(channelId);
     if (!manager) {
-      manager = new MessageManager(this.#rest, this.#context, channelId, this.#messageCache);
+      manager = new MessageManager(this.#rest, this.#context, channelId, this.#messageCache, this.#allowedMentions);
       this.#messageManagers.set(channelId, 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);
   }
   fetch(channelId) {
-    return this.fetchOnce(channelId, async () => createChannel2(await this.#rest.get(Routes.channel(channelId)), this.#context), (channel) => this.#merge(channel));
+    return this.fetchOnce(channelId, async () => createChannel(await this.#rest.get(Routes.channel(channelId)), this.#context), (channel) => this.#merge(channel));
   }
   async resolve(channelId) {
     return this.get(channelId) ?? this.fetch(channelId);
   }
   upsert(data) {
-    return this.#merge(createChannel2(data, this.#context));
+    return this.#merge(createChannel(data, this.#context));
   }
   #merge(channel) {
     const existing = this.get(channel.id);
@@ -2871,7 +3004,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, this.#allowedMentions)));
   }
   async deleteMessage(channelId, messageId) {
     await this.#rest.delete(Routes.message(channelId, messageId));
@@ -2994,7 +3127,8 @@ export {
   RoleManager,
   StageInstanceManager,
   ThreadManager,
-  UserManager
+  UserManager,
+  toRequest
 };
 
-//# debugId=DAACDF8C2AA7984564756E2164756E21
+//# debugId=EB58705923B2D19264756E2164756E21