@satorijs/adapter-discord 3.2.0 → 3.2.2

package/lib/bot.d.ts

@@ -7,13 +7,12 @@ export declare class DiscordBot<C extends Context = Context> extends Bot<C, Disc
     internal: Internal;
     constructor(ctx: C, config: DiscordBot.Config);
     getSelf(): Promise<import("@satorijs/core").User>;
-    private parseQuote;
-    sendMessage(channelId: string, content: string | segment, guildId?: string): Promise<string[]>;
-    sendPrivateMessage(channelId: string, content: string | segment): Promise<string[]>;
+    sendMessage(channelId: string, content: string | segment, guildId?: string): any;
+    sendPrivateMessage(channelId: string, content: string | segment): any;
     deleteMessage(channelId: string, messageId: string): Promise<void>;
     editMessage(channelId: string, messageId: string, content: string | segment): Promise<void>;
     getMessage(channelId: string, messageId: string): Promise<Message>;
-    getMessageList(channelId: string, before?: string): any;
+    getMessageList(channelId: string, before?: string): Promise<Message[]>;
     getUser(userId: string): Promise<import("@satorijs/core").User>;
     getGuildMemberList(guildId: string): Promise<import("@satorijs/core").User[]>;
     getChannel(channelId: string): Promise<import("@satorijs/core").Channel>;

package/lib/index.js

@@ -213,10 +213,8 @@ var Sender = class {
     this.url = url;
     this.results = [];
     this.errors = [];
-  }
-  static from(bot, url) {
-    const sender = new Sender(bot, url);
-    return sender.sendMessage.bind(sender);
+    this.buffer = "";
+    this.addition = {};
   }
   async post(data, headers) {
     try {
@@ -278,52 +276,69 @@ var Sender = class {
       }
     }, sendDownload);
   }
-  async sendMessage(content, addition = {}) {
-    const chain = import_satori2.segment.parse(content);
-    let textBuffer = "";
-    delete addition.content;
-    const sendBuffer = /* @__PURE__ */ __name(async () => {
-      const content2 = textBuffer.trim();
-      if (!content2)
-        return;
-      await this.post({ ...addition, content: content2 });
-      textBuffer = "";
-    }, "sendBuffer");
-    for (const code of chain) {
-      const { type, data } = code;
+  async sendBuffer() {
+    const content = this.buffer.trim();
+    if (!content)
+      return;
+    await this.post({ ...this.addition, content });
+    this.buffer = "";
+    this.addition = {};
+  }
+  async sendMessage(elements) {
+    for (const { type, attrs, children } of elements) {
       if (type === "text") {
-        textBuffer += data.content.trim();
-      } else if (type === "at" && data.id) {
-        textBuffer += `<@${data.id}>`;
-      } else if (type === "at" && data.type === "all") {
-        textBuffer += `@everyone`;
-      } else if (type === "at" && data.type === "here") {
-        textBuffer += `@here`;
-      } else if (type === "sharp" && data.id) {
-        textBuffer += `<#${data.id}>`;
-      } else if (type === "face" && data.name && data.id) {
-        textBuffer += `<:${data.name}:${data.id}>`;
-      } else if ((type === "image" || type === "video") && data.url) {
-        await this.sendAsset(type, data, {
-          ...addition,
-          content: textBuffer.trim()
+        this.buffer += attrs.content;
+      } else if (type === "at") {
+        if (attrs.id) {
+          this.buffer += `<@${attrs.id}>`;
+        } else if (attrs.type === "all") {
+          this.buffer += `@everyone`;
+        } else if (attrs.type === "here") {
+          this.buffer += `@here`;
+        }
+      } else if (type === "sharp" && attrs.id) {
+        this.buffer += `<#${attrs.id}>`;
+      } else if (type === "face" && attrs.name && attrs.id) {
+        this.buffer += `<:${attrs.name}:${attrs.id}>`;
+      } else if ((type === "image" || type === "video") && attrs.url) {
+        await this.sendAsset(type, attrs, {
+          ...this.addition,
+          content: this.buffer.trim()
         });
-        textBuffer = "";
+        this.buffer = "";
       } else if (type === "share") {
-        await sendBuffer();
+        await this.sendBuffer();
         await this.post({
-          ...addition,
-          embeds: [{ ...data }]
+          ...this.addition,
+          embeds: [{ ...attrs }]
         });
       } else if (type === "record") {
-        await this.sendAsset("file", data, {
-          ...addition,
-          content: textBuffer.trim()
+        await this.sendAsset("file", attrs, {
+          ...this.addition,
+          content: this.buffer.trim()
         });
-        textBuffer = "";
+        this.buffer = "";
+      } else if (type === "quote") {
+        await this.sendBuffer();
+        this.addition.message_reference = {
+          message_id: attrs.id
+        };
+      } else if (type === "message") {
+        await this.sendBuffer();
+        if ("quote" in attrs) {
+          this.addition.message_reference = {
+            message_id: attrs.id
+          };
+        } else {
+          await this.sendMessage(children);
+        }
       }
     }
-    await sendBuffer();
+    await this.sendBuffer();
+  }
+  async send(content) {
+    const elements = import_satori2.segment.parse(content);
+    await this.sendMessage(elements);
     if (!this.errors.length)
       return this.results;
     throw new import_es_aggregate_error.default(this.errors);
@@ -1471,11 +1486,6 @@ var DiscordBot = class extends import_satori4.Bot {
     const data = await this.internal.getCurrentUser();
     return adaptUser(data);
   }
-  parseQuote(chain) {
-    if (chain[0].type !== "quote")
-      return;
-    return chain.shift().attrs.id;
-  }
   async sendMessage(channelId, content, guildId) {
     const fragment = import_satori4.segment.normalize(content);
     const elements = fragment.children;
@@ -1491,15 +1501,10 @@ var DiscordBot = class extends import_satori4.Bot {
     });
     if (await this.context.serial(session, "before-send", session))
       return;
-    if (!(session == null ? void 0 : session.content))
+    if (!session.content)
       return [];
-    const chain = import_satori4.segment.parse(session.content);
-    const quote = this.parseQuote(chain);
-    const message_reference = quote ? {
-      message_id: quote
-    } : void 0;
-    const send = Sender.from(this, `/channels/${channelId}/messages`);
-    const results = await send(session.content, { message_reference });
+    const sender = new Sender(this, `/channels/${channelId}/messages`);
+    const results = await sender.send(session.content);
     for (const id of results) {
       session.messageId = id;
       this.context.emit(session, "send", session);