@satorijs/adapter-discord 4.1.1 → 4.1.3

package/lib/bot.d.ts

@@ -3,14 +3,14 @@ import * as Discord from './utils';
 import { DiscordMessageEncoder } from './message';
 import { Internal, Webhook } from './types';
 import { WsClient } from './ws';
-export declare class DiscordBot extends Bot<DiscordBot.Config> {
+export declare class DiscordBot<C extends Context = Context> extends Bot<C, DiscordBot.Config> {
     static MessageEncoder: typeof DiscordMessageEncoder;
     http: Quester;
     internal: Internal;
     webhooks: Record<string, Webhook>;
     webhookLock: Record<string, Promise<Webhook>>;
     commands: Universal.Command[];
-    constructor(ctx: Context, config: DiscordBot.Config);
+    constructor(ctx: C, config: DiscordBot.Config);
     private _ensureWebhook;
     ensureWebhook(channelId: string): Promise<Discord.Webhook>;
     getLogin(): Promise<Universal.Login>;

package/lib/index.js

@@ -1201,7 +1201,7 @@ var decodeUser = /* @__PURE__ */ __name((user) => ({
 }), "decodeUser");
 var decodeGuildMember = /* @__PURE__ */ __name((member) => ({
   user: member.user && decodeUser(member.user),
-  name: member.nick,
+  nick: member.nick,
   roles: member.roles,
   joinedAt: member.joined_at && new Date(member.joined_at).valueOf()
 }), "decodeGuildMember");
@@ -1400,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;
@@ -1416,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
             }]
           }]
@@ -1436,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";
@@ -1561,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;
@@ -1671,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 });
@@ -1680,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;
@@ -1877,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);
@@ -1961,7 +1982,7 @@ var _WsClient = class _WsClient extends import_satori4.Adapter.WsClient {
       } catch (error) {
         return logger3.warn("cannot parse message", data);
       }
-      logger3.debug(require("util").inspect(parsed, false, null, true));
+      logger3.debug(parsed);
       if (parsed.s) {
         this._d = parsed.s;
       }