@satorijs/adapter-discord 3.8.0 → 3.8.2

package/lib/index.js

@@ -89,7 +89,7 @@ __export(utils_exports, {
   encodeCommandOptions: () => encodeCommandOptions,
   encodeRole: () => encodeRole,
   sanitize: () => sanitize,
-  setupMessage: () => setupMessage
+  setupMessageGuildId: () => setupMessageGuildId
 });
 var import_satori2 = require("@satorijs/satori");
 
@@ -1212,8 +1212,8 @@ var encodeRole = /* @__PURE__ */ __name((role) => ({
 async function decodeMessage(bot, meta, session = {}) {
   var _a, _b, _c;
   const { platform } = bot;
-  setupMessage(session, meta);
   session.messageId = meta.id;
+  session.channelId = meta.channel_id;
   session.timestamp = new Date(meta.timestamp).valueOf() || Date.now();
   if (meta.author) {
     session.author = decodeAuthor(meta.author);
@@ -1294,13 +1294,12 @@ async function decodeMessage(bot, meta, session = {}) {
   return session;
 }
 __name(decodeMessage, "decodeMessage");
-function setupMessage(session, data) {
-  session.guildId = data.guild_id;
-  session.isDirect = !data.guild_id;
-  session.subtype = data.guild_id ? "group" : "private";
-  session.channelId = data.channel_id;
+function setupMessageGuildId(session, guildId) {
+  session.guildId = guildId;
+  session.isDirect = !guildId;
+  session.subtype = guildId ? "group" : "private";
 }
-__name(setupMessage, "setupMessage");
+__name(setupMessageGuildId, "setupMessageGuildId");
 function setupReaction(session, data) {
   session.userId = data.user_id;
   session.messageId = data.message_id;
@@ -1325,14 +1324,18 @@ async function adaptSession(bot, input) {
     }
     session.type = "message";
     await decodeMessage(bot, input.d, session);
+    setupMessageGuildId(session, input.d.guild_id);
   } else if (input.t === "MESSAGE_UPDATE") {
     session.type = "message-updated";
-    const msg = await bot.internal.getChannelMessage(input.d.channel_id, input.d.id);
-    await decodeMessage(bot, msg, session);
+    const message = await bot.internal.getChannelMessage(input.d.channel_id, input.d.id);
+    await decodeMessage(bot, message, session);
+    const channel = await bot.internal.getChannel(input.d.channel_id);
+    setupMessageGuildId(session, channel.guild_id);
   } else if (input.t === "MESSAGE_DELETE") {
     session.type = "message-deleted";
     session.messageId = input.d.id;
-    setupMessage(session, input.d);
+    session.channelId = input.d.channel_id;
+    setupMessageGuildId(session, input.d.guild_id);
   } else if (input.t === "MESSAGE_REACTION_ADD") {
     session.type = "reaction-added";
     setupReaction(session, input.d);
@@ -1486,14 +1489,14 @@ var DiscordMessageEncoder = class extends import_satori3.MessageEncoder {
     this.mode = "default";
   }
   async getUrl() {
-    var _a, _b;
-    const input = this.options.session.discord;
+    var _a, _b, _c, _d;
+    const input = (_b = (_a = this.options) == null ? void 0 : _a.session) == null ? void 0 : _b.discord;
     if ((input == null ? void 0 : input.t) === "INTERACTION_CREATE") {
       return `/webhooks/${input.d.application_id}/${input.d.token}`;
-    } else if (this.stack[0].type === "forward" && ((_a = this.stack[0].channel) == null ? void 0 : _a.id)) {
+    } else if (this.stack[0].type === "forward" && ((_c = this.stack[0].channel) == null ? void 0 : _c.id)) {
       if (this.stack[1].author.nickname || this.stack[1].author.avatar) {
         const webhook = await this.ensureWebhook();
-        return `/webhooks/${webhook.id}/${webhook.token}?wait=true&thread_id=${(_b = this.stack[0].channel) == null ? void 0 : _b.id}`;
+        return `/webhooks/${webhook.id}/${webhook.token}?wait=true&thread_id=${(_d = this.stack[0].channel) == null ? void 0 : _d.id}`;
       } else {
         return `/channels/${this.stack[0].channel.id}/messages`;
       }
@@ -1525,12 +1528,16 @@ var DiscordMessageEncoder = class extends import_satori3.MessageEncoder {
       }
       return message;
     } catch (e) {
-      if (import_satori3.Quester.isAxiosError(e) && ((_a = e.response) == null ? void 0 : _a.data.code) === 10015) {
-        logger.debug("webhook has been deleted, recreating..., %o", e.response.data);
-        if (!this.bot.webhookLock[this.channelId])
-          this.bot.webhooks[this.channelId] = null;
-        await this.ensureWebhook();
-        return this.post(data, headers);
+      if (import_satori3.Quester.isAxiosError(e) && e.response) {
+        if (((_a = e.response.data) == null ? void 0 : _a.code) === 10015) {
+          logger.debug("webhook has been deleted, recreating..., %o", e.response.data);
+          if (!this.bot.webhookLock[this.channelId])
+            this.bot.webhooks[this.channelId] = null;
+          await this.ensureWebhook();
+          return this.post(data, headers);
+        } else {
+          e = new Error(`[${e.response.status}] ${JSON.stringify(e.response.data)}`);
+        }
       }
       this.errors.push(e);
     }
@@ -1664,6 +1671,45 @@ var DiscordMessageEncoder = class extends import_satori3.MessageEncoder {
         content: this.buffer.trim()
       });
       this.buffer = "";
+    } else if (type === "author") {
+      const { avatar, nickname } = attrs;
+      if (avatar)
+        this.addition.avatar_url = avatar;
+      if (nickname)
+        this.addition.username = nickname;
+      if (this.stack[0].type === "message") {
+        this.stack[0].author = attrs;
+      }
+      if (this.stack[0].type === "forward") {
+        this.stack[1].author = attrs;
+      }
+    } else if (type === "quote") {
+      await this.flush();
+      const parse = /* @__PURE__ */ __name((val) => val.replace(/\\([\\*_`~|()\[\]])/g, "$1"), "parse");
+      const message = this.stack[this.stack[0].type === "forward" ? 1 : 0];
+      if (!message.author.avatar && !message.author.nickname && this.stack[0].type !== "forward") {
+        await this.flush();
+        this.addition.message_reference = {
+          message_id: attrs.id
+        };
+      } else {
+        let replyId = attrs.id, channelId = this.channelId;
+        if (this.stack[0].type === "forward" && ((_a = this.stack[0].fakeMessageMap[attrs.id]) == null ? void 0 : _a.length) >= 1) {
+          replyId = this.stack[0].fakeMessageMap[attrs.id][0].messageId;
+          channelId = this.stack[0].fakeMessageMap[attrs.id][0].channelId;
+        }
+        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})`
+          ].join("\n\n"),
+          author: {
+            name: quoted.author.nickname || quoted.author.username,
+            icon_url: quoted.author.avatar
+          }
+        }];
+      }
     } else if (type === "figure") {
       await this.flush();
       this.mode = "figure";
@@ -1681,48 +1727,6 @@ var DiscordMessageEncoder = class extends import_satori3.MessageEncoder {
       } else {
         const resultLength = +this.results.length;
         await this.flush();
-        const [author] = import_satori3.segment.select(children, "author");
-        if (author) {
-          const { avatar, nickname } = author.attrs;
-          if (avatar)
-            this.addition.avatar_url = avatar;
-          if (nickname)
-            this.addition.username = nickname;
-          if (this.stack[0].type === "message") {
-            this.stack[0].author = author.attrs;
-          }
-          if (this.stack[0].type === "forward") {
-            this.stack[1].author = author.attrs;
-          }
-        }
-        const [quote] = import_satori3.segment.select(children, "quote");
-        if (quote) {
-          const parse = /* @__PURE__ */ __name((val) => val.replace(/\\([\\*_`~|()\[\]])/g, "$1"), "parse");
-          const message = this.stack[this.stack[0].type === "forward" ? 1 : 0];
-          if (!message.author.avatar && !message.author.nickname && this.stack[0].type !== "forward") {
-            await this.flush();
-            this.addition.message_reference = {
-              message_id: quote.attrs.id
-            };
-          } else {
-            let replyId = quote.attrs.id, channelId = this.channelId;
-            if (this.stack[0].type === "forward" && ((_a = this.stack[0].fakeMessageMap[quote.attrs.id]) == null ? void 0 : _a.length) >= 1) {
-              replyId = this.stack[0].fakeMessageMap[quote.attrs.id][0].messageId;
-              channelId = this.stack[0].fakeMessageMap[quote.attrs.id][0].channelId;
-            }
-            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})`
-              ].join("\n\n"),
-              author: {
-                name: quoted.author.nickname || quoted.author.username,
-                icon_url: quoted.author.avatar
-              }
-            }];
-          }
-        }
         await this.render(children);
         await this.flush();
         const newLength = +this.results.length;