@satorijs/adapter-discord 3.8.7 → 3.8.9

package/lib/index.js

@@ -1215,7 +1215,7 @@ var encodeRole = /* @__PURE__ */ __name((role) => ({
   ...role,
   permissions: role.permissions && "" + role.permissions
 }), "encodeRole");
-async function decodeMessage(bot, meta, session = {}) {
+async function decodeMessage(bot, meta, session = {}, reference = true) {
   var _a, _b, _c;
   const { platform } = bot;
   session.messageId = meta.id;
@@ -1293,7 +1293,7 @@ async function decodeMessage(bot, meta, session = {}) {
     }
   }
   session.elements = import_satori2.h.parse(session.content);
-  if (meta.message_reference) {
+  if (reference && meta.message_reference) {
     const { message_id, channel_id } = meta.message_reference;
     session.quote = await bot.getMessage(channel_id, message_id);
   }
@@ -1575,26 +1575,31 @@ var _DiscordMessageEncoder = class _DiscordMessageEncoder extends import_satori3
       }
       return this.post({ ...addition, content: attrs.url });
     }, "sendDirect");
-    const sendDownload = /* @__PURE__ */ __name(() => this.sendEmbed(attrs, addition), "sendDownload");
-    if (["file:", "data:", "base64:"].some((prefix) => attrs.url.startsWith(prefix))) {
-      return await sendDownload();
+    if (this.bot.http.isPrivate(attrs.url)) {
+      return await this.sendEmbed(attrs, addition);
     }
     const mode = attrs.mode || handleExternalAsset;
     if (mode === "download" || handleMixedContent === "attach" && addition.content || type === "file") {
-      return sendDownload();
+      return this.sendEmbed(attrs, addition);
     } else if (mode === "direct") {
       return sendDirect();
     }
-    return await this.bot.ctx.http.head(attrs.url, {
+    if (await this.checkMediaType(attrs.url, type)) {
+      return sendDirect();
+    } else {
+      return this.sendEmbed(attrs, addition);
+    }
+  }
+  checkMediaType(url, type) {
+    if (url.startsWith("https://cdn.discordapp.com/"))
+      return true;
+    return this.bot.ctx.http.head(url, {
       headers: { accept: type + "/*" },
-      timeout: +attrs.timeout || void 0
-    }).then((headers) => {
-      if (headers["content-type"].startsWith(type)) {
-        return sendDirect();
-      } else {
-        return sendDownload();
-      }
-    }, sendDownload);
+      timeout: 1e3
+    }).then(
+      (headers) => headers["content-type"].startsWith(type),
+      () => false
+    );
   }
   async ensureWebhook() {
     return this.bot.ensureWebhook(this.channelId);
@@ -1988,7 +1993,7 @@ var _DiscordBot = class _DiscordBot extends import_satori5.Bot {
   }
   async getMessageList(channelId, before) {
     const data = (await this.internal.getChannelMessages(channelId, { before, limit: 50 })).reverse();
-    return await Promise.all(data.map((data2) => decodeMessage(this, data2)));
+    return await Promise.all(data.map((data2) => decodeMessage(this, data2, {}, false)));
   }
   async getUser(userId) {
     const data = await this.internal.getUser(userId);