@satorijs/adapter-discord 4.1.0 → 4.1.2

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)
@@ -1398,11 +1400,11 @@ async function adaptSession(bot, input) {
     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:"))
+    if (!data.custom_id.startsWith("input") && !data.custom_id.includes(":"))
       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
+      type: Interaction.CallbackType.DEFERRED_UPDATE_MESSAGE
     });
     session.type = "interaction/command";
     session.isDirect = !input.d.guild_id;
@@ -1414,19 +1416,19 @@ async function adaptSession(bot, input) {
     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:")) {
+    if (id.startsWith("input") && id.includes(":")) {
       await bot.internal.createInteractionResponse(input.d.id, input.d.token, {
         type: Interaction.CallbackType.MODAL,
         data: {
           custom_id: id,
-          title: "title",
+          title: "Input",
           components: [{
             type: 1 /* ACTION_ROW */,
             components: [{
               custom_id: id,
               type: 4 /* TEXT_INPUT */,
-              label: "auto complete",
-              value: id.slice("input:".length),
+              label: "Command",
+              value: id.slice(id.indexOf(":") + 1),
               style: 1
             }]
           }]
@@ -1434,7 +1436,7 @@ async function adaptSession(bot, input) {
       });
     } else {
       await bot.internal.createInteractionResponse(input.d.id, input.d.token, {
-        type: Interaction.CallbackType.DEFERRED_CHANNEL_MESSAGE_WITH_SOURCE
+        type: Interaction.CallbackType.DEFERRED_UPDATE_MESSAGE
       });
     }
     session.type = "interaction/button";
@@ -1536,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) {
@@ -1559,7 +1561,6 @@ var _DiscordMessageEncoder = class _DiscordMessageEncoder extends import_satori3
   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;
@@ -1606,7 +1607,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();
@@ -1669,7 +1670,8 @@ var _DiscordMessageEncoder = class _DiscordMessageEncoder extends import_satori3
   }
   async flush() {
     const content = this.buffer.trim();
-    if (!content)
+    this.trimButtons();
+    if (!content && !this.rows.length)
       return;
     this.addition.components = this.rows;
     await this.post({ ...this.addition, content });
@@ -1678,29 +1680,57 @@ var _DiscordMessageEncoder = class _DiscordMessageEncoder extends import_satori3
     this.rows = [];
   }
   decodeButton(attrs, label) {
+    let style = 1 /* PRIMARY */;
+    if (attrs.class === "secondary")
+      style = 2 /* SECONDARY */;
+    if (attrs.class === "danger")
+      style = 4 /* DANGER */;
+    if (attrs.class === "success")
+      style = 3 /* SUCCESS */;
     if (attrs.type === "link") {
       return {
         type: 2 /* BUTTON */,
         url: attrs.href,
         label,
-        style: 5
+        style: 5 /* LINK */
       };
-    } else if (attrs.type === "action") {
+    } else if (attrs.type === "input") {
       return {
         type: 2 /* BUTTON */,
-        custom_id: attrs.id,
+        custom_id: `input${attrs.id}:${attrs.text}`,
         label,
-        style: 1
+        style
       };
-    } else if (attrs.type === "input") {
+    } else {
       return {
         type: 2 /* BUTTON */,
-        custom_id: "input:" + attrs.text,
+        custom_id: attrs.id,
         label,
-        style: 1
+        style
       };
     }
   }
+  lastRow() {
+    if (!this.rows.length) {
+      this.rows.push({
+        type: 1 /* ACTION_ROW */,
+        components: []
+      });
+    }
+    let last = this.rows[this.rows.length - 1];
+    if (last.components.length >= 5) {
+      this.rows.push({
+        type: 1 /* ACTION_ROW */,
+        components: []
+      });
+      last = this.rows[this.rows.length - 1];
+    }
+    return last;
+  }
+  trimButtons() {
+    if (this.rows.length && this.rows[this.rows.length - 1].components.length === 0)
+      this.rows.pop();
+  }
   async visit(element) {
     var _a;
     const { type, attrs, children } = element;
@@ -1875,28 +1905,21 @@ var _DiscordMessageEncoder = class _DiscordMessageEncoder extends import_satori3
         }
       }
     } 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(""))
-          ]
-        });
-      }
+      const last = this.lastRow();
+      last.components.push(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;
+      this.rows.push({
+        type: 1 /* ACTION_ROW */,
+        components: []
+      });
     } else if (type === "message" && attrs.forward) {
       this.stack.unshift(new State("forward"));
       await this.render(children);
@@ -1930,7 +1953,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;
@@ -1944,7 +1967,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
@@ -1957,16 +1980,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(parsed);
       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: {
@@ -1991,7 +2014,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) {
@@ -2004,7 +2027,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") {
@@ -2015,7 +2038,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();
       }
     });
@@ -2037,7 +2060,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;
@@ -2199,7 +2222,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);
     }
   }