@satorijs/adapter-discord 3.5.5 → 3.5.7

package/lib/index.js

@@ -46,7 +46,7 @@ __export(src_exports, {
 module.exports = __toCommonJS(src_exports);
 
 // satori/adapters/discord/src/bot.ts
-var import_satori4 = require("@satorijs/satori");
+var import_satori5 = require("@satorijs/satori");
 
 // satori/adapters/discord/src/utils.ts
 var import_satori = require("@satorijs/satori");
@@ -234,11 +234,13 @@ var DiscordMessenger = class extends import_satori2.Messenger {
       this.errors.push(e);
     }
   }
-  async sendEmbed(buffer, payload, filename) {
-    const fd = new import_form_data.default();
-    fd.append("file", buffer, filename);
-    fd.append("payload_json", JSON.stringify(payload));
-    return this.post(fd, fd.getHeaders());
+  async sendEmbed(attrs, payload) {
+    const { filename, data, mime } = await this.bot.ctx.http.file(attrs.url);
+    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);
+    form.append("payload_json", JSON.stringify(payload));
+    return this.post(form, form.getHeaders());
   }
   async sendContent(content, addition) {
     return this.post({ ...addition, content });
@@ -255,10 +257,7 @@ var DiscordMessenger = class extends import_satori2.Messenger {
       }
       return this.post({ ...addition, content: attrs.url });
     }, "sendDirect");
-    const sendDownload = /* @__PURE__ */ __name(async () => {
-      const { filename, data } = await this.bot.ctx.http.file(attrs.url);
-      return this.sendEmbed(data, addition, attrs.file || filename);
-    }, "sendDownload");
+    const sendDownload = /* @__PURE__ */ __name(() => this.sendEmbed(attrs, addition), "sendDownload");
     if (["file:", "data:", "base64:"].some((prefix) => attrs.url.startsWith(prefix))) {
       return await sendDownload();
     }
@@ -448,7 +447,7 @@ __export(types_exports, {
 });
 
 // satori/adapters/discord/src/types/internal.ts
-var import_cosmokit = require("cosmokit");
+var import_satori3 = require("@satorijs/satori");
 var Internal = class {
   constructor(http) {
     this.http = http;
@@ -457,7 +456,7 @@ var Internal = class {
     for (const path in routes) {
       for (const key in routes[path]) {
         const method = key;
-        for (const name of (0, import_cosmokit.makeArray)(routes[path][method])) {
+        for (const name of (0, import_satori3.makeArray)(routes[path][method])) {
           Internal.prototype[name] = function(...args) {
             const raw = args.join(", ");
             const url = path.replace(/\{([^}]+)\}/g, () => {
@@ -1487,9 +1486,9 @@ Internal.define({
 });
 
 // satori/adapters/discord/src/ws.ts
-var import_satori3 = require("@satorijs/satori");
-var logger = new import_satori3.Logger("discord");
-var WsClient = class extends import_satori3.Adapter.WsClient {
+var import_satori4 = require("@satorijs/satori");
+var logger = new import_satori4.Logger("discord");
+var WsClient = class extends import_satori4.Adapter.WsClient {
   constructor() {
     super(...arguments);
     this._d = 0;
@@ -1510,7 +1509,7 @@ var WsClient = class extends import_satori3.Adapter.WsClient {
     }));
   }
   accept() {
-    this.bot.socket.on("message", async (data) => {
+    this.bot.socket.addEventListener("message", async ({ data }) => {
       var _a, _b;
       let parsed;
       try {
@@ -1578,29 +1577,31 @@ var WsClient = class extends import_satori3.Adapter.WsClient {
         (_b = this.bot.socket) == null ? void 0 : _b.close();
       }
     });
-    this.bot.socket.on("close", () => {
+    this.bot.socket.addEventListener("close", () => {
       clearInterval(this._ping);
     });
   }
 };
 __name(WsClient, "WsClient");
 ((WsClient2) => {
-  WsClient2.Config = import_satori3.Schema.intersect([
-    import_satori3.Schema.object({
-      intents: import_satori3.Schema.bitset(GatewayIntent).description("需要订阅的机器人事件。").default(0 | 512 /* GUILD_MESSAGES */ | 1024 /* GUILD_MESSAGE_REACTIONS */ | 4096 /* DIRECT_MESSAGES */ | 8192 /* DIRECT_MESSAGE_REACTIONS */ | 32768 /* MESSAGE_CONTENT */)
+  WsClient2.Config = import_satori4.Schema.intersect([
+    import_satori4.Schema.object({
+      intents: import_satori4.Schema.bitset(GatewayIntent).description("需要订阅的机器人事件。").default(0 | 512 /* GUILD_MESSAGES */ | 1024 /* GUILD_MESSAGE_REACTIONS */ | 4096 /* DIRECT_MESSAGES */ | 8192 /* DIRECT_MESSAGE_REACTIONS */ | 32768 /* MESSAGE_CONTENT */)
     }).description("推送设置"),
-    import_satori3.Adapter.WsClient.Config
+    import_satori4.Adapter.WsClient.Config
   ]);
 })(WsClient || (WsClient = {}));
 
 // satori/adapters/discord/src/bot.ts
-var DiscordBot = class extends import_satori4.Bot {
+var import_package = require("../package.json");
+var DiscordBot = class extends import_satori5.Bot {
   constructor(ctx, config) {
     super(ctx, config);
     this.http = ctx.http.extend({
       ...config,
       headers: {
         Authorization: `Bot ${config.token}`,
+        "User-Agent": `Koishi (https://koishi.chat/, ${import_package.version})`,
         ...config.headers
       }
     });
@@ -1621,7 +1622,7 @@ var DiscordBot = class extends import_satori4.Bot {
     await this.internal.deleteMessage(channelId, messageId);
   }
   async editMessage(channelId, messageId, content) {
-    const elements = import_satori4.segment.normalize(content);
+    const elements = import_satori5.segment.normalize(content);
     content = elements.toString();
     const image = elements.find((v) => v.type === "image");
     if (image) {
@@ -1676,13 +1677,13 @@ var DiscordBot = class extends import_satori4.Bot {
 };
 __name(DiscordBot, "DiscordBot");
 ((DiscordBot2) => {
-  DiscordBot2.Config = import_satori4.Schema.intersect([
-    import_satori4.Schema.object({
-      token: import_satori4.Schema.string().description("机器人的用户令牌。").role("secret").required()
+  DiscordBot2.Config = import_satori5.Schema.intersect([
+    import_satori5.Schema.object({
+      token: import_satori5.Schema.string().description("机器人的用户令牌。").role("secret").required()
     }),
     WsClient.Config,
     DiscordMessenger.Config,
-    import_satori4.Quester.createConfig("https://discord.com/api/v10")
+    import_satori5.Quester.createConfig("https://discord.com/api/v10")
   ]);
 })(DiscordBot || (DiscordBot = {}));
 DiscordBot.prototype.platform = "discord";