@satorijs/adapter-discord 3.2.4 → 3.2.6

package/lib/index.js

@@ -202,8 +202,6 @@ __name(adaptSession, "adaptSession");
 
 // satori/adapters/discord/src/sender.ts
 var import_satori2 = require("@satorijs/satori");
-var import_fs = require("fs");
-var import_path = require("path");
 var import_file_type = require("file-type");
 var import_form_data = __toESM(require("form-data"));
 var AggregateError = class extends Error {
@@ -221,6 +219,8 @@ var Sender = class {
     this.errors = [];
     this.buffer = "";
     this.addition = {};
+    this.figure = null;
+    this.mode = "default";
   }
   async post(data, headers) {
     try {
@@ -233,7 +233,7 @@ var Sender = class {
   async sendEmbed(fileBuffer, payload_json, filename) {
     const fd = new import_form_data.default();
     filename || (filename = "file." + (await (0, import_file_type.fromBuffer)(fileBuffer)).ext);
-    fd.append("file", fileBuffer, filename);
+    fd.append("file", Buffer.from(fileBuffer), filename);
     fd.append("payload_json", JSON.stringify(payload_json));
     return this.post(fd, fd.getHeaders());
   }
@@ -246,12 +246,9 @@ var Sender = class {
       await this.post(addition);
       addition.content = "";
     }
-    if (data.url.startsWith("file://")) {
-      const filename = (0, import_path.basename)(data.url.slice(7));
-      return await this.sendEmbed((0, import_fs.readFileSync)(data.url.slice(7)), addition, data.file || filename);
-    } else if (data.url.startsWith("base64://")) {
-      const a = Buffer.from(data.url.slice(9), "base64");
-      return await this.sendEmbed(a, addition, data.file);
+    if (["file:", "data:", "base64:"].some((prefix) => data.url.startsWith(prefix))) {
+      const result = await this.bot.ctx.http.file(data.url);
+      return await this.sendEmbed(result.data, addition, data.file || result.filename);
     }
     const sendDirect = /* @__PURE__ */ __name(async () => {
       if (addition.content) {
@@ -291,9 +288,13 @@ var Sender = class {
     this.addition = {};
   }
   async render(elements) {
-    for (const { type, attrs, children } of elements) {
+    for (const element of elements) {
+      const { type, attrs, children } = element;
       if (type === "text") {
         this.buffer += attrs.content;
+      } else if (type === "p") {
+        await this.render(children);
+        this.buffer += "\n";
       } else if (type === "at") {
         if (attrs.id) {
           this.buffer += `<@${attrs.id}>`;
@@ -307,11 +308,15 @@ var Sender = class {
       } 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()
-        });
-        this.buffer = "";
+        if (this.mode === "figure") {
+          this.figure = element;
+        } else {
+          await this.sendAsset(type, attrs, {
+            ...this.addition,
+            content: this.buffer.trim()
+          });
+          this.buffer = "";
+        }
       } else if (type === "share") {
         await this.sendBuffer();
         await this.post({
@@ -324,19 +329,34 @@ var Sender = class {
           content: this.buffer.trim()
         });
         this.buffer = "";
+      } else if (type === "figure") {
+        await this.sendBuffer();
+        this.mode = "figure";
+        await this.render(children);
+        await this.sendAsset(this.figure.type, this.figure.attrs, {
+          ...this.addition,
+          content: this.buffer.trim()
+        });
+        this.buffer = "";
+        this.mode = "default";
       } 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
-          };
+        if (this.mode === "figure") {
+          await this.render(children);
+          this.buffer += "\n";
         } else {
-          await this.sendMessage(children);
+          await this.sendBuffer();
+          if ("quote" in attrs) {
+            this.addition.message_reference = {
+              message_id: attrs.id
+            };
+          } else {
+            await this.sendMessage(children);
+          }
         }
       } else {
         await this.render(children);