lunibee 0.2.0 → 0.2.2

package/dist/structures/index.d.ts

@@ -1,8 +1,16 @@
 /** Resource structures for Discord messages and related entities. */
 import { BaseStructure, Channel, User } from "./base.js";
+import { GuildMember } from "./resources.js";
+import type { ComponentInteraction } from "./interactions.js";
+import type { Collector, CollectorOptions } from "@lunibee/core";
+/** Options for {@link Message.createComponentCollector}. */
+export interface ComponentCollectorOptions extends CollectorOptions<ComponentInteraction> {
+    /** Only this component type (2 button, 3 string select...). */
+    componentType?: number;
+}
 import type { ResourceContext } from "./base.js";
-export { BaseStructure, Channel, Guild, User } from "./base.js";
-export type { ResourceContext } from "./base.js";
+export { BaseStructure, Channel, Guild, User, CDN_BASE, cdnURL, } from "./base.js";
+export type { ResourceContext, ImageURLOptions } from "./base.js";
 export declare class Message extends BaseStructure {
     #private;
     content: string;
@@ -23,6 +31,18 @@ export declare class Message extends BaseStructure {
     readonly reference?: import("@lunibee/types").APIMessageReference;
     readonly components: import("@lunibee/types").APIMessageComponent[];
     readonly referencedMessage?: Message | null;
+    /** Stickers sent with the message (`sticker_items`). */
+    readonly stickers: import("@lunibee/types").APIStickerItem[];
+    /** The poll, when the message is one. */
+    readonly poll: import("@lunibee/types").APIPoll | null;
+    /** For a forwarded message, the snapshot of the original. */
+    readonly messageSnapshots: import("@lunibee/types").APIMessageSnapshot[];
+    /**
+     * The author as a guild member, on guild messages from the Gateway. Its
+     * `permissions` are computed from the cached roles; `member.kick()` and the
+     * other member actions work when the message came from a client.
+     */
+    member: GuildMember | null;
     /** Creates a message structure from Discord message data. */
     constructor(data: import("@lunibee/types").APIMessage, context?: ResourceContext);
     /** Whether embeds are suppressed on this message. */
@@ -49,6 +69,21 @@ export declare class Message extends BaseStructure {
     })): Promise<Message>;
     /** Crossposts this message. @returns The resulting message. @throws {Error} If the message is not attached to a client. */
     crosspost(): Promise<Message>;
+    /**
+     * Collects clicks and picks on this message's components. It always ends:
+     * after `time`, or 15 minutes (an interaction token's life) when neither
+     * `time` nor `idle` is set.
+     * @example
+     * const collector = message.createComponentCollector({ filter: (i) => i.user?.id === authorId, time: 60_000 });
+     * collector.on("collect", (i) => i.update({ content: `Picked ${i.customId}` }));
+     */
+    createComponentCollector(options?: ComponentCollectorOptions): Collector<string, ComponentInteraction>;
+    /**
+     * Waits for the next click or pick on this message's components.
+     * @param options `time` (default 15 minutes), `filter`, `componentType`.
+     * @returns The interaction. @throws {Error} When time runs out first.
+     */
+    awaitComponent(options?: Omit<ComponentCollectorOptions, "max">): Promise<ComponentInteraction>;
     /** Adds a reaction to this message. @param emoji Emoji identifier. @returns A promise fulfilled when the reaction is added. @throws {Error} If reactions are unavailable. */
     react(emoji: string): Promise<void>;
     /** Removes a reaction from this message. @param emoji Emoji identifier. @param userId User whose reaction should be removed; omit to remove the current user's reaction. @returns A promise fulfilled when the reaction is removed. @throws {Error} If reaction operations are unavailable. */
@@ -80,7 +115,7 @@ export declare class Message extends BaseStructure {
     /** Returns a plain-object snapshot of all message fields. */
     toJSON(): Record<string, unknown>;
 }
-export { GuildMember, Role, TextChannel, Invite, Webhook, WebhookType, Emoji, AutoModerationRule, WelcomeScreenChannel, GuildWelcomeScreen, OnboardingPromptOption, OnboardingPrompt, GuildOnboarding, } from "./resources.js";
+export { GuildMember, Role, TextChannel, Invite, Webhook, WebhookEnum, WebhookType, Emoji, AutoModerationRule, WelcomeScreenChannel, GuildWelcomeScreen, OnboardingPromptOption, OnboardingPrompt, GuildOnboarding, } from "./resources.js";
 export { NewsChannel, DMChannel, VoiceChannel, StageChannel, CategoryChannel, ThreadChannel, ForumChannel, MediaChannel, createChannel, } from "./channels.js";
 export * from "./interactions.js";
 export { Embed } from "./embed.js";

package/dist/structures/index.js

@@ -109,6 +109,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 });
   }
@@ -243,6 +248,7 @@ class Guild extends BaseStructure {
     return this.name;
   }
 }
+
 // packages/core/src/permissions.ts
 var Permission = {
   createInstantInvite: 1n << 0n,
@@ -635,6 +641,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;
@@ -649,6 +660,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)
@@ -725,7 +739,7 @@ var IntentBits = {
   directMessagePolls: 1 << 25
 };
 // packages/types/src/index.ts
-var InteractionResponseType = {
+var InteractionResponseEnum = {
   Pong: 1,
   ChannelMessage: 4,
   DeferredChannelMessage: 5,
@@ -734,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.0",
+  version: "0.2.2",
   type: "module",
   module: "./src/index.ts",
   types: "./src/index.ts",
@@ -808,13 +823,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;
@@ -824,12 +841,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;
   }
@@ -932,7 +990,7 @@ class Invite {
     return this.url;
   }
 }
-var WebhookType = {
+var WebhookEnum = {
   Incoming: 1,
   ChannelFollower: 2,
   Application: 3
@@ -948,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;
@@ -1113,6 +1171,7 @@ class GuildOnboarding2 extends BaseStructure {
     this.mode = data.mode;
   }
 }
+var WebhookType = WebhookEnum;
 // packages/structures/src/channels.ts
 class NewsChannel extends TextChannel {
 }
@@ -1363,6 +1422,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) {
@@ -1381,7 +1451,7 @@ class CommandOptions {
   }
 }
 // packages/structures/src/interactions.ts
-var InteractionType = {
+var InteractionEnum = {
   Ping: 1,
   ApplicationCommand: 2,
   MessageComponent: 3,
@@ -1389,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 };
@@ -1403,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.");
@@ -1413,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);
   }
 }
 
@@ -1447,17 +1527,53 @@ 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;
+    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;
+    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;
@@ -1509,7 +1625,7 @@ class Interaction {
     return new GuildMember({
       ...raw,
       guild_id: this.guildId
-    });
+    }, this.#client.resourceContext);
   }
   get createdTimestamp() {
     return Number((BigInt(this.id) >> 22n) + DISCORD_EPOCH);
@@ -1542,11 +1658,24 @@ class Interaction {
   postResponse(response) {
     return this.#client.postInteractionResponse(this.id, this.token, response);
   }
-  async reply(options) {
-    return this.acknowledge(InteractionResponse.message(toMessageData(options)), "replied");
+  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 deferReply(ephemeral = false) {
-    await this.acknowledge(InteractionResponse.defer(ephemeral), "deferred");
+  async reply(options) {
+    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;
+    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();
@@ -1560,10 +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) {
-    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(InteractionResponseEnum.Modal, data), "replied");
   }
 }
 
@@ -1580,21 +1711,56 @@ 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 ?? "";
   }
+  get messageId() {
+    return this.data?.message?.id;
+  }
   get componentType() {
     return this.data?.data?.component_type ?? 0;
   }
   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;
   }
 }
 
@@ -1636,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");
   }
 }
@@ -1654,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;
@@ -1834,6 +2003,7 @@ class AuditLog {
 }
 
 // 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 {
@@ -1854,6 +2024,10 @@ class Message extends BaseStructure {
   reference;
   components;
   referencedMessage;
+  stickers;
+  poll;
+  messageSnapshots;
+  member;
   #context;
   constructor(data, context) {
     super(data.id);
@@ -1874,8 +2048,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() {
@@ -1916,6 +2102,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.");
@@ -1993,11 +2193,13 @@ export {
   AutoModerationRule,
   AutocompleteInteraction,
   BaseStructure,
+  CDN_BASE,
   CategoryChannel,
   Channel,
   CommandInteraction,
   CommandOptions,
   ComponentInteraction,
+  ContextMenuCommandInteraction,
   DMChannel,
   Embed,
   Emoji,
@@ -2007,7 +2209,9 @@ export {
   GuildOnboarding2 as GuildOnboarding,
   GuildWelcomeScreen2 as GuildWelcomeScreen,
   Interaction,
+  InteractionEnum,
   InteractionResponse,
+  InteractionResponseEnum,
   InteractionResponseType,
   InteractionType,
   Invite,
@@ -2025,10 +2229,12 @@ export {
   User,
   VoiceChannel,
   Webhook,
+  WebhookEnum,
   WebhookType,
   WelcomeScreenChannel,
+  cdnURL,
   createChannel,
   createInteraction
 };
 
-//# debugId=39460C3E91D6CD3564756E2164756E21
+//# debugId=1DD80FEE9EB768DF64756E2164756E21