@satorijs/adapter-discord 4.0.4 → 4.1.1

package/lib/index.js

@@ -100,6 +100,7 @@ var import_satori2 = require("@satorijs/satori");
 
 // satori/adapters/discord/src/types/internal.ts
 var import_satori = require("@satorijs/satori");
+var logger = new import_satori.Logger("discord");
 var _Internal = class _Internal {
   constructor(http) {
     this.http = http;
@@ -130,6 +131,7 @@ var _Internal = class _Internal {
               throw new Error(`too many arguments for ${path}, received ${raw}`);
             }
             try {
+              logger.debug(`${method} ${url}`, config);
               return await this.http(method, url, config);
             } catch (error) {
               if (!import_satori.Quester.isAxiosError(error) || !error.response)
@@ -312,7 +314,7 @@ Internal.define({
 
 // satori/adapters/discord/src/types/channel.ts
 var Channel2;
-((Channel10) => {
+((Channel11) => {
   let Type;
   ((Type2) => {
     Type2[Type2["GUILD_TEXT"] = 0] = "GUILD_TEXT";
@@ -328,7 +330,7 @@ var Channel2;
     Type2[Type2["GUILD_STAGE_VOICE"] = 13] = "GUILD_STAGE_VOICE";
     Type2[Type2["GUILD_DIRECTORY"] = 14] = "GUILD_DIRECTORY";
     Type2[Type2["GUILD_FORUM"] = 15] = "GUILD_FORUM";
-  })(Type = Channel10.Type || (Channel10.Type = {}));
+  })(Type = Channel11.Type || (Channel11.Type = {}));
 })(Channel2 || (Channel2 = {}));
 var OverwriteType = /* @__PURE__ */ ((OverwriteType2) => {
   OverwriteType2[OverwriteType2["ROLE"] = 0] = "ROLE";
@@ -749,7 +751,7 @@ Internal.define({
 
 // satori/adapters/discord/src/types/message.ts
 var Message2;
-((Message4) => {
+((Message5) => {
   let Type;
   ((Type2) => {
     Type2[Type2["DEFAULT"] = 0] = "DEFAULT";
@@ -779,14 +781,14 @@ var Message2;
     Type2[Type2["ROLE_SUBSCRIPTION_PURCHASE"] = 25] = "ROLE_SUBSCRIPTION_PURCHASE";
     Type2[Type2["INTERACTION_PREMIUM_UPSELL"] = 26] = "INTERACTION_PREMIUM_UPSELL";
     Type2[Type2["GUILD_APPLICATION_PREMIUM_SUBSCRIPTION"] = 32] = "GUILD_APPLICATION_PREMIUM_SUBSCRIPTION";
-  })(Type = Message4.Type || (Message4.Type = {}));
+  })(Type = Message5.Type || (Message5.Type = {}));
   let ActivityType2;
   ((ActivityType3) => {
     ActivityType3[ActivityType3["JOIN"] = 1] = "JOIN";
     ActivityType3[ActivityType3["SPECTATE"] = 2] = "SPECTATE";
     ActivityType3[ActivityType3["LISTEN"] = 3] = "LISTEN";
     ActivityType3[ActivityType3["JOIN_REQUEST"] = 5] = "JOIN_REQUEST";
-  })(ActivityType2 = Message4.ActivityType || (Message4.ActivityType = {}));
+  })(ActivityType2 = Message5.ActivityType || (Message5.ActivityType = {}));
   let Flag;
   ((Flag2) => {
     Flag2[Flag2["CROSSPOSTED"] = 1] = "CROSSPOSTED";
@@ -798,7 +800,7 @@ var Message2;
     Flag2[Flag2["EPHEMERAL"] = 64] = "EPHEMERAL";
     Flag2[Flag2["LOADING"] = 128] = "LOADING";
     Flag2[Flag2["FAILED_TO_MENTION_SOME_ROLES_IN_THREAD"] = 256] = "FAILED_TO_MENTION_SOME_ROLES_IN_THREAD";
-  })(Flag = Message4.Flag || (Message4.Flag = {}));
+  })(Flag = Message5.Flag || (Message5.Flag = {}));
 })(Message2 || (Message2 = {}));
 Internal.define({
   "/channels/{channel.id}/messages": {
@@ -1396,6 +1398,57 @@ async function adaptSession(bot, input) {
     session.messageId = input.d.id;
     session.content = "";
     session.event.argv = decodeArgv(data, command);
+  } else if (input.t === "INTERACTION_CREATE" && input.d.type === Interaction.Type.MODAL_SUBMIT) {
+    const data = input.d.data;
+    if (!data.custom_id.startsWith("input:"))
+      return;
+    const user_input = data.components[0].components[0].value;
+    await bot.internal.createInteractionResponse(input.d.id, input.d.token, {
+      type: Interaction.CallbackType.DEFERRED_CHANNEL_MESSAGE_WITH_SOURCE
+    });
+    session.type = "interaction/command";
+    session.isDirect = !input.d.guild_id;
+    session.subtype = input.d.guild_id ? "group" : "private";
+    session.channelId = input.d.channel_id;
+    session.guildId = input.d.guild_id;
+    session.userId = session.isDirect ? input.d.user.id : input.d.member.user.id;
+    session.messageId = input.d.id;
+    session.content = user_input;
+  } else if (input.t === "INTERACTION_CREATE" && input.d.type === Interaction.Type.MESSAGE_COMPONENT) {
+    const id = input.d.data.custom_id;
+    if (id.startsWith("input:")) {
+      await bot.internal.createInteractionResponse(input.d.id, input.d.token, {
+        type: Interaction.CallbackType.MODAL,
+        data: {
+          custom_id: id,
+          title: "title",
+          components: [{
+            type: 1 /* ACTION_ROW */,
+            components: [{
+              custom_id: id,
+              type: 4 /* TEXT_INPUT */,
+              label: "auto complete",
+              value: id.slice("input:".length),
+              style: 1
+            }]
+          }]
+        }
+      });
+    } else {
+      await bot.internal.createInteractionResponse(input.d.id, input.d.token, {
+        type: Interaction.CallbackType.DEFERRED_CHANNEL_MESSAGE_WITH_SOURCE
+      });
+    }
+    session.type = "interaction/button";
+    session.isDirect = !input.d.guild_id;
+    session.channelId = input.d.channel_id;
+    session.guildId = input.d.guild_id;
+    session.userId = session.isDirect ? input.d.user.id : input.d.member.user.id;
+    session.messageId = input.d.id;
+    session.content = "";
+    session.event.button = {
+      id
+    };
   } else if (input.t === "CHANNEL_UPDATE") {
     session.type = "channel-updated";
     session.guildId = input.d.guild_id;
@@ -1485,7 +1538,7 @@ __name(encodeCommandOptions, "encodeCommandOptions");
 // satori/adapters/discord/src/message.ts
 var import_satori3 = require("@satorijs/satori");
 var import_form_data = __toESM(require("form-data"));
-var logger = new import_satori3.Logger("discord");
+var logger2 = new import_satori3.Logger("discord");
 var _State = class _State {
   // forward: send the first message and create a thread
   constructor(type) {
@@ -1507,6 +1560,8 @@ var _DiscordMessageEncoder = class _DiscordMessageEncoder extends import_satori3
   figure = null;
   mode = "default";
   listType = null;
+  rows = [];
+  buttonGroupState = false;
   async getUrl() {
     var _a, _b, _c, _d;
     const input = (_b = (_a = this.options) == null ? void 0 : _a.session) == null ? void 0 : _b.discord;
@@ -1553,7 +1608,7 @@ var _DiscordMessageEncoder = class _DiscordMessageEncoder extends import_satori3
     } catch (e) {
       if (import_satori3.Quester.isAxiosError(e) && e.response) {
         if (((_a = e.response.data) == null ? void 0 : _a.code) === 10015) {
-          logger.debug("webhook has been deleted, recreating..., %o", e.response.data);
+          logger2.debug("webhook has been deleted, recreating..., %o", e.response.data);
           if (!this.bot.webhookLock[this.channelId])
             this.bot.webhooks[this.channelId] = null;
           await this.ensureWebhook();
@@ -1618,9 +1673,35 @@ var _DiscordMessageEncoder = class _DiscordMessageEncoder extends import_satori3
     const content = this.buffer.trim();
     if (!content)
       return;
+    this.addition.components = this.rows;
     await this.post({ ...this.addition, content });
     this.buffer = "";
     this.addition = {};
+    this.rows = [];
+  }
+  decodeButton(attrs, label) {
+    if (attrs.type === "link") {
+      return {
+        type: 2 /* BUTTON */,
+        url: attrs.href,
+        label,
+        style: 5
+      };
+    } else if (attrs.type === "action") {
+      return {
+        type: 2 /* BUTTON */,
+        custom_id: attrs.id,
+        label,
+        style: 1
+      };
+    } else if (attrs.type === "input") {
+      return {
+        type: 2 /* BUTTON */,
+        custom_id: "input:" + attrs.text,
+        label,
+        style: 1
+      };
+    }
   }
   async visit(element) {
     var _a;
@@ -1795,6 +1876,29 @@ var _DiscordMessageEncoder = class _DiscordMessageEncoder extends import_satori3
           this.stack[1].author = {};
         }
       }
+    } else if (type === "button") {
+      if (this.buttonGroupState) {
+        const last = this.rows[this.rows.length - 1];
+        last.components.push(this.decodeButton(
+          attrs,
+          children.join("")
+        ));
+      } else {
+        this.rows.push({
+          type: 1 /* ACTION_ROW */,
+          components: [
+            this.decodeButton(attrs, children.join(""))
+          ]
+        });
+      }
+    } else if (type === "button-group") {
+      this.buttonGroupState = true;
+      this.rows.push({
+        type: 1 /* ACTION_ROW */,
+        components: []
+      });
+      await this.render(children);
+      this.buttonGroupState = false;
     } else if (type === "message" && attrs.forward) {
       this.stack.unshift(new State("forward"));
       await this.render(children);
@@ -1828,7 +1932,7 @@ var DiscordMessageEncoder = _DiscordMessageEncoder;
 
 // satori/adapters/discord/src/ws.ts
 var import_satori4 = require("@satorijs/satori");
-var logger2 = new import_satori4.Logger("discord");
+var logger3 = new import_satori4.Logger("discord");
 var _WsClient = class _WsClient extends import_satori4.Adapter.WsClient {
   _d = 0;
   _ping;
@@ -1842,7 +1946,7 @@ var _WsClient = class _WsClient extends import_satori4.Adapter.WsClient {
     return this.bot.http.ws(url + "/?v=10&encoding=json");
   }
   heartbeat() {
-    logger2.debug(`heartbeat d ${this._d}`);
+    logger3.debug(`heartbeat d ${this._d}`);
     this.socket.send(JSON.stringify({
       op: Gateway.Opcode.HEARTBEAT,
       d: this._d
@@ -1855,16 +1959,16 @@ var _WsClient = class _WsClient extends import_satori4.Adapter.WsClient {
       try {
         parsed = JSON.parse(data.toString());
       } catch (error) {
-        return logger2.warn("cannot parse message", data);
+        return logger3.warn("cannot parse message", data);
       }
-      logger2.debug(require("util").inspect(parsed, false, null, true));
+      logger3.debug(require("util").inspect(parsed, false, null, true));
       if (parsed.s) {
         this._d = parsed.s;
       }
       if (parsed.op === Gateway.Opcode.HELLO) {
         this._ping = setInterval(() => this.heartbeat(), parsed.d.heartbeat_interval);
         if (this._sessionId) {
-          logger2.debug("resuming");
+          logger3.debug("resuming");
           this.socket.send(JSON.stringify({
             op: Gateway.Opcode.RESUME,
             d: {
@@ -1889,7 +1993,7 @@ var _WsClient = class _WsClient extends import_satori4.Adapter.WsClient {
         if (parsed.d)
           return;
         this._sessionId = "";
-        logger2.warn("offline: invalid session");
+        logger3.warn("offline: invalid session");
         (_a = this.socket) == null ? void 0 : _a.close();
       }
       if (parsed.op === Gateway.Opcode.DISPATCH) {
@@ -1902,7 +2006,7 @@ var _WsClient = class _WsClient extends import_satori4.Adapter.WsClient {
           this._sessionId = parsed.d.session_id;
           this._resumeUrl = parsed.d.resume_gateway_url;
           this.bot.user = decodeUser(parsed.d.user);
-          logger2.debug("session_id " + this._sessionId);
+          logger3.debug("session_id " + this._sessionId);
           return this.bot.online();
         }
         if (parsed.t === "RESUMED") {
@@ -1913,7 +2017,7 @@ var _WsClient = class _WsClient extends import_satori4.Adapter.WsClient {
           this.bot.dispatch(session);
       }
       if (parsed.op === Gateway.Opcode.RECONNECT) {
-        logger2.warn("offline: discord request reconnect");
+        logger3.warn("offline: discord request reconnect");
         (_b = this.socket) == null ? void 0 : _b.close();
       }
     });
@@ -1935,7 +2039,7 @@ var WsClient = _WsClient;
 
 // satori/adapters/discord/src/bot.ts
 var import_package = require("../package.json");
-var logger3 = new import_satori5.Logger("discord");
+var logger4 = new import_satori5.Logger("discord");
 var _DiscordBot = class _DiscordBot extends import_satori5.Bot {
   http;
   internal;
@@ -2097,7 +2201,7 @@ var _DiscordBot = class _DiscordBot extends import_satori5.Bot {
     this.commands = commands;
     const updates = commands.map(encodeCommand);
     if (updates.length) {
-      logger3.debug("update %d command(s)", updates.length);
+      logger4.debug("update %d command(s)", updates.length);
       await this.internal.bulkOverwriteGlobalApplicationCommands(this.selfId, updates);
     }
   }