@satorijs/adapter-discord 3.8.1 → 3.8.3

package/lib/bot.d.ts

@@ -41,7 +41,7 @@ export declare class DiscordBot extends Bot<DiscordBot.Config> {
     setGuildMemberRole(guildId: string, userId: string, roleId: string): Promise<void>;
     unsetGuildMemberRole(guildId: string, userId: string, roleId: string): Promise<void>;
     getGuildRoles(guildId: string): Promise<Universal.Role[]>;
-    createGuildRole(guildId: string, data: Partial<Universal.Role>): Promise<Universal.Role>;
+    createGuildRole(guildId: string, data: Partial<Universal.Role>): Promise<string>;
     modifyGuildRole(guildId: string, roleId: string, data: Partial<Universal.Role>): Promise<void>;
     deleteGuildRole(guildId: string, roleId: string): Promise<void>;
     sendPrivateMessage(userId: string, content: Fragment, options?: SendOptions): Promise<string[]>;

package/lib/index.js

@@ -89,13 +89,13 @@ __export(utils_exports, {
   encodeCommandOptions: () => encodeCommandOptions,
   encodeRole: () => encodeRole,
   sanitize: () => sanitize,
-  setupMessage: () => setupMessage
+  setupMessageGuildId: () => setupMessageGuildId
 });
 var import_satori2 = require("@satorijs/satori");
 
 // satori/adapters/discord/src/types/internal.ts
 var import_satori = require("@satorijs/satori");
-var Internal = class {
+var _Internal = class _Internal {
   constructor(http) {
     this.http = http;
   }
@@ -104,7 +104,7 @@ var Internal = class {
       for (const key in routes[path]) {
         const method = key;
         for (const name of (0, import_satori.makeArray)(routes[path][method])) {
-          Internal.prototype[name] = async function(...args) {
+          _Internal.prototype[name] = async function(...args) {
             const raw = args.join(", ");
             const url = path.replace(/\{([^}]+)\}/g, () => {
               if (!args.length)
@@ -137,7 +137,8 @@ var Internal = class {
     }
   }
 };
-__name(Internal, "Internal");
+__name(_Internal, "Internal");
+var Internal = _Internal;
 
 // satori/adapters/discord/src/types/application.ts
 var ApplicationFlag = /* @__PURE__ */ ((ApplicationFlag2) => {
@@ -1212,8 +1213,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 +1295,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 +1325,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);
@@ -1463,7 +1467,7 @@ __name(encodeCommandOptions, "encodeCommandOptions");
 var import_satori3 = require("@satorijs/satori");
 var import_form_data = __toESM(require("form-data"));
 var logger = new import_satori3.Logger("discord");
-var State = class {
+var _State = class _State {
   // forward: send the first message and create a thread
   constructor(type) {
     this.type = type;
@@ -1475,8 +1479,9 @@ var State = class {
     this.threadCreated = false;
   }
 };
-__name(State, "State");
-var DiscordMessageEncoder = class extends import_satori3.MessageEncoder {
+__name(_State, "State");
+var State = _State;
+var _DiscordMessageEncoder = class _DiscordMessageEncoder extends import_satori3.MessageEncoder {
   constructor() {
     super(...arguments);
     this.stack = [new State("message")];
@@ -1525,12 +1530,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 +1673,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 +1729,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;
@@ -1751,7 +1757,8 @@ var DiscordMessageEncoder = class extends import_satori3.MessageEncoder {
     }
   }
 };
-__name(DiscordMessageEncoder, "DiscordMessageEncoder");
+__name(_DiscordMessageEncoder, "DiscordMessageEncoder");
+var DiscordMessageEncoder = _DiscordMessageEncoder;
 ((DiscordMessageEncoder2) => {
   DiscordMessageEncoder2.Config = import_satori3.Schema.object({
     handleExternalAsset: import_satori3.Schema.union([
@@ -1770,7 +1777,7 @@ __name(DiscordMessageEncoder, "DiscordMessageEncoder");
 // satori/adapters/discord/src/ws.ts
 var import_satori4 = require("@satorijs/satori");
 var logger2 = new import_satori4.Logger("discord");
-var WsClient = class extends import_satori4.Adapter.WsClient {
+var _WsClient = class _WsClient extends import_satori4.Adapter.WsClient {
   constructor() {
     super(...arguments);
     this._d = 0;
@@ -1865,7 +1872,8 @@ var WsClient = class extends import_satori4.Adapter.WsClient {
     });
   }
 };
-__name(WsClient, "WsClient");
+__name(_WsClient, "WsClient");
+var WsClient = _WsClient;
 ((WsClient2) => {
   WsClient2.Config = import_satori4.Schema.intersect([
     import_satori4.Schema.object({
@@ -1878,7 +1886,7 @@ __name(WsClient, "WsClient");
 // satori/adapters/discord/src/bot.ts
 var import_package = require("../package.json");
 var logger3 = new import_satori5.Logger("discord");
-var DiscordBot = class extends import_satori5.Bot {
+var _DiscordBot = class _DiscordBot extends import_satori5.Bot {
   constructor(ctx, config) {
     super(ctx, config);
     this.webhooks = {};
@@ -2016,7 +2024,7 @@ var DiscordBot = class extends import_satori5.Bot {
   }
   async createGuildRole(guildId, data) {
     const role = await this.internal.createGuildRole(guildId, encodeRole(data));
-    return decodeRole(role);
+    return role.id;
   }
   async modifyGuildRole(guildId, roleId, data) {
     await this.internal.modifyGuildRole(guildId, roleId, encodeRole(data));
@@ -2052,8 +2060,9 @@ var DiscordBot = class extends import_satori5.Bot {
     }
   }
 };
-__name(DiscordBot, "DiscordBot");
-DiscordBot.MessageEncoder = DiscordMessageEncoder;
+__name(_DiscordBot, "DiscordBot");
+_DiscordBot.MessageEncoder = DiscordMessageEncoder;
+var DiscordBot = _DiscordBot;
 function shapeEqual(a, b, strict = false) {
   if (a === b)
     return true;