@satorijs/adapter-discord 3.8.6 → 3.8.8

package/lib/index.js

@@ -1412,11 +1412,19 @@ var types = {
   channel: ApplicationCommand2.OptionType.STRING,
   guild: ApplicationCommand2.OptionType.STRING
 };
+var trimDescription = /* @__PURE__ */ __name((source) => {
+  if (!source || source.length < 96)
+    return source;
+  return source.slice(0, 93) + "...";
+}, "trimDescription");
+var encodeDescription = /* @__PURE__ */ __name((object) => ({
+  description: trimDescription(object.description[""] || object.name),
+  description_localizations: (0, import_satori2.valueMap)((0, import_satori2.pick)(object.description, Locale3), trimDescription)
+}), "encodeDescription");
 var encodeCommand = /* @__PURE__ */ __name((cmd) => ({
+  ...encodeDescription(cmd),
   name: cmd.name,
   type: ApplicationCommand2.Type.CHAT_INPUT,
-  description: cmd.description[""] || cmd.name,
-  description_localizations: (0, import_satori2.pick)(cmd.description, Locale3),
   options: encodeCommandOptions(cmd)
 }), "encodeCommand");
 var decodeArgv = /* @__PURE__ */ __name((data, command) => {
@@ -1448,18 +1456,16 @@ function encodeCommandOptions(cmd) {
   } else {
     for (const arg of cmd.arguments) {
       result.push({
+        ...encodeDescription(arg),
         name: arg.name.toLowerCase().replace(/[^a-z0-9]/g, ""),
-        description: arg.description[""] || arg.name,
-        description_localizations: (0, import_satori2.pick)(arg.description, Locale3),
         type: (_a = types[arg.type]) != null ? _a : types.text
         // required: arg.required ?? false,
       });
     }
     for (const option of cmd.options) {
       result.push({
+        ...encodeDescription(option),
         name: option.name.toLowerCase(),
-        description: option.description[""] || option.name,
-        description_localizations: (0, import_satori2.pick)(option.description, Locale3),
         type: (_b = types[option.type]) != null ? _b : types.text,
         // required: option.required ?? false,
         min_value: option.type === "posint" ? 1 : void 0
@@ -1569,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);