@koishijs/plugin-adapter-discord 2.0.5 → 2.0.8

package/lib/index.js

@@ -91,8 +91,7 @@ var _Sender = class {
   }
   async sendEmbed(fileBuffer, payload_json, filename) {
     const fd = new import_form_data.default();
-    const type = await (0, import_file_type.fromBuffer)(fileBuffer);
-    filename || (filename = "file." + type.ext);
+    filename || (filename = "file." + (await (0, import_file_type.fromBuffer)(fileBuffer)).ext);
     fd.append("file", fileBuffer, filename);
     fd.append("payload_json", JSON.stringify(payload_json));
     return this.post(fd, fd.getHeaders());
@@ -120,12 +119,11 @@ var _Sender = class {
       return this.post(__spreadProps(__spreadValues({}, addition), { content: data.url }));
     }, "sendDirect");
     const sendDownload = /* @__PURE__ */ __name(async () => {
-      const filename = (0, import_path.basename)(data.url);
       const buffer = await this.bot.app.http.get(data.url, {
         headers: { accept: type + "/*" },
         responseType: "arraybuffer"
       });
-      return this.sendEmbed(buffer, addition, data.file || filename);
+      return this.sendEmbed(buffer, addition, data.file);
     }, "sendDownload");
     const mode = data.mode || handleExternalAsset;
     if (mode === "download" || handleMixedContent === "attach" && addition.content || type === "file") {
@@ -235,7 +233,7 @@ __name(adaptChannel, "adaptChannel");
 var adaptAuthor = /* @__PURE__ */ __name((author) => __spreadProps(__spreadValues({}, adaptUser(author)), {
   nickname: author.username
 }), "adaptAuthor");
-function adaptMessage(bot, meta, session = {}) {
+function adaptMessage(meta, session = {}) {
   var _a, _b, _c;
   if (meta.author) {
     session.author = adaptAuthor(meta.author);
@@ -246,7 +244,7 @@ function adaptMessage(bot, meta, session = {}) {
   }
   session.content = "";
   if (meta.content) {
-    session.content = meta.content.replace(/<@[!&](.+?)>/, (_, id) => {
+    session.content = meta.content.replace(/<@[!&](.+?)>/g, (_, id) => {
       var _a2;
       if (meta.mention_roles.includes(id)) {
         return (0, import_koishi2.segment)("at", { role: id });
@@ -254,7 +252,7 @@ function adaptMessage(bot, meta, session = {}) {
         const user = (_a2 = meta.mentions) == null ? void 0 : _a2.find((u) => u.id === id || `${u.username}#${u.discriminator}` === id);
         return import_koishi2.segment.at(id, { name: user == null ? void 0 : user.username });
       }
-    }).replace(/<:(.*):(.+?)>/, (_, name, id) => (0, import_koishi2.segment)("face", { id, name })).replace(/<a:(.*):(.+?)>/, (_, name, id) => (0, import_koishi2.segment)("face", { id, name, animated: true })).replace(/@everyone/, () => (0, import_koishi2.segment)("at", { type: "all" })).replace(/@here/, () => (0, import_koishi2.segment)("at", { type: "here" })).replace(/<#(.+?)>/, (_, id) => {
+    }).replace(/<:(.*):(.+?)>/g, (_, name, id) => (0, import_koishi2.segment)("face", { id, name })).replace(/<a:(.*):(.+?)>/g, (_, name, id) => (0, import_koishi2.segment)("face", { id, name, animated: true })).replace(/@everyone/g, () => (0, import_koishi2.segment)("at", { type: "all" })).replace(/@here/g, () => (0, import_koishi2.segment)("at", { type: "here" })).replace(/<#(.+?)>/g, (_, id) => {
       var _a2;
       const channel = (_a2 = meta.mention_channels) == null ? void 0 : _a2.find((c) => c.id === id);
       return import_koishi2.segment.sharp(id, { name: channel == null ? void 0 : channel.name });
@@ -305,7 +303,7 @@ function adaptMessage(bot, meta, session = {}) {
 }
 __name(adaptMessage, "adaptMessage");
 function adaptMessageSession(bot, meta, session = {}) {
-  adaptMessage(bot, meta, session);
+  adaptMessage(meta, session);
   session.messageId = meta.id;
   session.timestamp = new Date(meta.timestamp).valueOf() || Date.now();
   if (meta.message_reference) {
@@ -1405,24 +1403,12 @@ var DiscordBot = class extends import_koishi4.Bot {
     });
   }
   async getMessage(channelId, messageId) {
-    var _a;
-    const [msg, channel] = await Promise.all([
-      this.internal.getChannelMessage(channelId, messageId),
-      this.internal.getChannel(channelId)
-    ]);
-    const result = {
-      messageId: msg.id,
-      channelId: msg.channel_id,
-      guildId: channel.guild_id,
-      userId: msg.author.id,
-      content: msg.content,
-      timestamp: new Date(msg.timestamp).valueOf(),
-      author: adaptUser(msg.author)
-    };
-    result.author.nickname = (_a = msg.member) == null ? void 0 : _a.nick;
-    if (msg.message_reference) {
-      const quoteMsg = await this.internal.getChannelMessage(msg.message_reference.channel_id, msg.message_reference.message_id);
-      result.quote = adaptMessage(this, quoteMsg);
+    const original = await this.internal.getChannelMessage(channelId, messageId);
+    const result = adaptMessage(original);
+    const reference = original.message_reference;
+    if (reference) {
+      const quoteMsg = await this.internal.getChannelMessage(reference.channel_id, reference.message_id);
+      result.quote = adaptMessage(quoteMsg);
     }
     return result;
   }
@@ -1462,11 +1448,11 @@ DiscordBot.schema = AdapterConfig;
 
 // plugins/adapter/discord/src/ws.ts
 var import_koishi5 = __toModule(require("koishi"));
-var import_ws = __toModule(require("ws"));
 var logger = new import_koishi5.Logger("discord");
 var WebSocketClient = class extends import_koishi5.Adapter.WebSocketClient {
   prepare(bot) {
-    return new import_ws.default(bot.config.gateway);
+    const http = this.ctx.http.extend(bot.config);
+    return http.ws(bot.config.gateway);
   }
   heartbeat(bot) {
     logger.debug(`heartbeat d ${bot._d}`);
@@ -1486,6 +1472,7 @@ var WebSocketClient = class extends import_koishi5.Adapter.WebSocketClient {
           seq: bot._d
         }
       }));
+      bot.resolve();
     }
     bot.socket.on("message", async (data) => {
       let parsed;