@satorijs/adapter-discord 3.5.1 → 3.5.3

package/lib/index.js

@@ -214,7 +214,6 @@ __name(adaptSession, "adaptSession");
 
 // satori/adapters/discord/src/message.ts
 var import_satori2 = require("@satorijs/satori");
-var import_file_type = require("file-type");
 var import_form_data = __toESM(require("form-data"));
 var DiscordMessenger = class extends import_satori2.Messenger {
   constructor() {
@@ -235,46 +234,41 @@ var DiscordMessenger = class extends import_satori2.Messenger {
       this.errors.push(e);
     }
   }
-  async sendEmbed(fileBuffer, payload_json, filename) {
+  async sendEmbed(buffer, payload, filename) {
     const fd = new import_form_data.default();
-    filename || (filename = "file." + (await (0, import_file_type.fromBuffer)(fileBuffer)).ext);
-    fd.append("file", Buffer.from(fileBuffer), filename);
-    fd.append("payload_json", JSON.stringify(payload_json));
+    fd.append("file", buffer, filename);
+    fd.append("payload_json", JSON.stringify(payload));
     return this.post(fd, fd.getHeaders());
   }
   async sendContent(content, addition) {
     return this.post({ ...addition, content });
   }
-  async sendAsset(type, data, addition) {
+  async sendAsset(type, attrs, addition) {
     const { handleMixedContent, handleExternalAsset } = this.bot.config;
     if (handleMixedContent === "separate" && addition.content) {
       await this.post(addition);
       addition.content = "";
     }
-    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) {
         await this.post(addition);
       }
-      return this.post({ ...addition, content: data.url });
+      return this.post({ ...addition, content: attrs.url });
     }, "sendDirect");
     const sendDownload = /* @__PURE__ */ __name(async () => {
-      const buffer = await this.bot.ctx.http.get(data.url, {
-        headers: { accept: type + "/*" },
-        responseType: "arraybuffer"
-      });
-      return this.sendEmbed(buffer, addition, data.file);
+      const { filename, data } = await this.bot.ctx.http.file(attrs.url);
+      return this.sendEmbed(data, addition, attrs.file || filename);
     }, "sendDownload");
-    const mode = data.mode || handleExternalAsset;
+    if (["file:", "data:", "base64:"].some((prefix) => attrs.url.startsWith(prefix))) {
+      return await sendDownload();
+    }
+    const mode = attrs.mode || handleExternalAsset;
     if (mode === "download" || handleMixedContent === "attach" && addition.content || type === "file") {
       return sendDownload();
     } else if (mode === "direct") {
       return sendDirect();
     }
-    return await this.bot.ctx.http.head(data.url, {
+    return await this.bot.ctx.http.head(attrs.url, {
       headers: { accept: type + "/*" }
     }).then((headers) => {
       if (headers["content-type"].startsWith(type)) {