@satorijs/adapter-discord 3.6.0 → 3.6.2

package/lib/index.js

@@ -288,7 +288,7 @@ var DiscordMessenger = class extends import_satori2.Messenger {
     }
   }
   async sendEmbed(attrs, payload) {
-    const { filename, data, mime } = await this.bot.ctx.http.file(attrs.url);
+    const { filename, data, mime } = await this.bot.ctx.http.file(attrs.url, attrs);
     const form = new import_form_data.default();
     const value = process.env.KOISHI_ENV === "browser" ? new Blob([data], { type: mime }) : Buffer.from(data);
     form.append("file", value, attrs.file || filename);
@@ -318,7 +318,8 @@ var DiscordMessenger = class extends import_satori2.Messenger {
       return sendDirect();
     }
     return await this.bot.ctx.http.head(attrs.url, {
-      headers: { accept: type + "/*" }
+      headers: { accept: type + "/*" },
+      timeout: +attrs.timeout || void 0
     }).then((headers) => {
       if (headers["content-type"].startsWith(type)) {
         return sendDirect();
@@ -463,9 +464,10 @@ var DiscordMessenger = class extends import_satori2.Messenger {
             }
             const quoted = await this.bot.getMessage(channelId, replyId);
             this.addition.embeds = [{
-              description: `${sanitize(parse(quoted.elements.filter((v) => v.type === "text").join("")).slice(0, 30))}
-
- <t:${Math.ceil(quoted.timestamp / 1e3)}:R> [[ ↑ ]](https://discord.com/channels/${this.guildId}/${channelId}/${replyId})`,
+              description: [
+                sanitize(parse(quoted.elements.filter((v) => v.type === "text").join("")).slice(0, 30)),
+                `<t:${Math.ceil(quoted.timestamp / 1e3)}:R> [[ ↑ ]](https://discord.com/channels/${this.guildId}/${channelId}/${replyId})`
+              ].join("\n\n"),
               author: {
                 name: quoted.author.nickname || quoted.author.username,
                 icon_url: quoted.author.avatar
@@ -1607,10 +1609,10 @@ var WsClient = class extends import_satori4.Adapter.WsClient {
   }
   async prepare() {
     if (this._resumeUrl) {
-      return this.bot.http.ws(this._resumeUrl);
+      return this.bot.http.ws(this._resumeUrl + "/?v=10&encoding=json");
     }
     const { url } = await this.bot.internal.getGatewayBot();
-    return this.bot.http.ws(url);
+    return this.bot.http.ws(url + "/?v=10&encoding=json");
   }
   heartbeat() {
     logger2.debug(`heartbeat d ${this._d}`);