@satorijs/adapter-discord 3.5.7 → 3.6.1

package/lib/bot.d.ts

@@ -1,11 +1,15 @@
 import { Bot, Context, Fragment, Quester, Schema, SendOptions } from '@satorijs/satori';
 import { DiscordMessenger } from './message';
-import { Internal } from './types';
+import { Internal, Webhook } from './types';
 import { WsClient } from './ws';
 export declare class DiscordBot extends Bot<DiscordBot.Config> {
     http: Quester;
     internal: Internal;
+    webhooks: Record<string, Webhook>;
+    webhookLock: Record<string, Promise<Webhook>>;
     constructor(ctx: Context, config: DiscordBot.Config);
+    private _ensureWebhook;
+    ensureWebhook(channelId: string): Promise<Webhook>;
     getSelf(): Promise<import("@satorijs/core").Universal.User>;
     sendMessage(channelId: string, content: Fragment, guildId?: string, options?: SendOptions): Promise<string[]>;
     sendPrivateMessage(channelId: string, content: Fragment, options?: SendOptions): Promise<string[]>;

package/lib/index.js

@@ -41,7 +41,8 @@ __export(src_exports, {
   adaptSession: () => adaptSession,
   adaptUser: () => adaptUser,
   default: () => src_default,
-  prepareMessage: () => prepareMessage
+  prepareMessage: () => prepareMessage,
+  sanitize: () => sanitize
 });
 module.exports = __toCommonJS(src_exports);
 
@@ -50,6 +51,7 @@ var import_satori5 = require("@satorijs/satori");
 
 // satori/adapters/discord/src/utils.ts
 var import_satori = require("@satorijs/satori");
+var sanitize = /* @__PURE__ */ __name((val) => val.replace(/[\\*_`~|()\[\]]/g, "\\$&").replace(/@everyone/g, () => "\\@everyone").replace(/@here/g, () => "\\@here"), "sanitize");
 var adaptUser = /* @__PURE__ */ __name((user) => ({
   userId: user.id,
   avatar: `https://cdn.discordapp.com/avatars/${user.id}/${user.avatar}.png`,
@@ -87,20 +89,20 @@ async function adaptMessage(bot, meta, session = {}) {
     session.content = meta.content.replace(/<@[!&]?(.+?)>/g, (_, id) => {
       var _a2;
       if (meta.mention_roles.includes(id)) {
-        return (0, import_satori.segment)("at", { role: id }).toString();
+        return (0, import_satori.h)("at", { role: id }).toString();
       } else {
         const user = (_a2 = meta.mentions) == null ? void 0 : _a2.find((u) => u.id === id || `${u.username}#${u.discriminator}` === id);
-        return import_satori.segment.at(id, { name: user == null ? void 0 : user.username }).toString();
+        return import_satori.h.at(id, { name: user == null ? void 0 : user.username }).toString();
       }
     }).replace(/<a?:(.*):(.+?)>/g, (_, name, id) => {
       const animated = _[1] === "a";
-      return (0, import_satori.segment)("face", { id, name, animated, platform }, [
-        import_satori.segment.image(`https://cdn.discordapp.com/emojis/${id}.gif?quality=lossless`)
+      return (0, import_satori.h)("face", { id, name, animated, platform }, [
+        import_satori.h.image(`https://cdn.discordapp.com/emojis/${id}.gif?quality=lossless`)
       ]).toString();
-    }).replace(/@everyone/g, () => (0, import_satori.segment)("at", { type: "all" }).toString()).replace(/@here/g, () => (0, import_satori.segment)("at", { type: "here" }).toString()).replace(/<#(.+?)>/g, (_, id) => {
+    }).replace(/@everyone/g, () => (0, import_satori.h)("at", { type: "all" }).toString()).replace(/@here/g, () => (0, import_satori.h)("at", { type: "here" }).toString()).replace(/<#(.+?)>/g, (_, id) => {
       var _a2;
       const channel = (_a2 = meta.mention_channels) == null ? void 0 : _a2.find((c) => c.id === id);
-      return import_satori.segment.sharp(id, { name: channel == null ? void 0 : channel.name }).toString();
+      return import_satori.h.sharp(id, { name: channel == null ? void 0 : channel.name }).toString();
     });
   }
   if ((_c = meta.attachments) == null ? void 0 : _c.length) {
@@ -109,25 +111,25 @@ async function adaptMessage(bot, meta, session = {}) {
     session.content += meta.attachments.map((v) => {
       var _a2, _b2, _c2;
       if (v.height && v.width && ((_a2 = v.content_type) == null ? void 0 : _a2.startsWith("image/"))) {
-        return (0, import_satori.segment)("image", {
+        return (0, import_satori.h)("image", {
           url: v.url,
           proxy_url: v.proxy_url,
           file: v.filename
         });
       } else if (v.height && v.width && ((_b2 = v.content_type) == null ? void 0 : _b2.startsWith("video/"))) {
-        return (0, import_satori.segment)("video", {
+        return (0, import_satori.h)("video", {
           url: v.url,
           proxy_url: v.proxy_url,
           file: v.filename
         });
       } else if ((_c2 = v.content_type) == null ? void 0 : _c2.startsWith("audio/")) {
-        return (0, import_satori.segment)("record", {
+        return (0, import_satori.h)("record", {
           url: v.url,
           proxy_url: v.proxy_url,
           file: v.filename
         });
       } else {
-        return (0, import_satori.segment)("file", {
+        return (0, import_satori.h)("file", {
           url: v.url,
           proxy_url: v.proxy_url,
           file: v.filename
@@ -137,16 +139,16 @@ async function adaptMessage(bot, meta, session = {}) {
   }
   for (const embed of meta.embeds) {
     if (embed.image) {
-      session.content += (0, import_satori.segment)("image", { url: embed.image.url, proxy_url: embed.image.proxy_url });
+      session.content += (0, import_satori.h)("image", { url: embed.image.url, proxy_url: embed.image.proxy_url });
     }
     if (embed.thumbnail) {
-      session.content += (0, import_satori.segment)("image", { url: embed.thumbnail.url, proxy_url: embed.thumbnail.proxy_url });
+      session.content += (0, import_satori.h)("image", { url: embed.thumbnail.url, proxy_url: embed.thumbnail.proxy_url });
     }
     if (embed.video) {
-      session.content += (0, import_satori.segment)("video", { url: embed.video.url, proxy_url: embed.video.proxy_url });
+      session.content += (0, import_satori.h)("video", { url: embed.video.url, proxy_url: embed.video.proxy_url });
     }
   }
-  session.elements = import_satori.segment.parse(session.content);
+  session.elements = import_satori.h.parse(session.content);
   if (meta.message_reference) {
     const { message_id, channel_id } = meta.message_reference;
     session.quote = await bot.getMessage(channel_id, message_id);
@@ -175,6 +177,12 @@ __name(prepareReactionSession, "prepareReactionSession");
 async function adaptSession(bot, input) {
   const session = bot.session();
   if (input.t === "MESSAGE_CREATE") {
+    if (input.d.webhook_id) {
+      const webhook = await bot.ensureWebhook(input.d.channel_id);
+      if (webhook.id === input.d.webhook_id) {
+        return;
+      }
+    }
     session.type = "message";
     await adaptMessage(bot, input.d, session);
   } else if (input.t === "MESSAGE_UPDATE") {
@@ -215,36 +223,78 @@ __name(adaptSession, "adaptSession");
 // satori/adapters/discord/src/message.ts
 var import_satori2 = require("@satorijs/satori");
 var import_form_data = __toESM(require("form-data"));
+var logger = new import_satori2.Logger("discord");
+var State = class {
+  // forward: send the first message and create a thread
+  constructor(type) {
+    this.type = type;
+    this.author = {};
+    this.quote = {};
+    this.channel = {};
+    this.fakeMessageMap = {};
+    // [userInput] = discord messages
+    this.threadCreated = false;
+  }
+};
+__name(State, "State");
 var DiscordMessenger = class extends import_satori2.Messenger {
   constructor() {
     super(...arguments);
+    this.stack = [new State("message")];
     this.buffer = "";
     this.addition = {};
     this.figure = null;
     this.mode = "default";
   }
   async post(data, headers) {
+    var _a, _b, _c;
     try {
-      const result = await this.bot.http.post(`/channels/${this.channelId}/messages`, data, { headers });
+      let url = `/channels/${this.channelId}/messages`;
+      if (this.stack[0].author.nickname || this.stack[0].author.avatar || this.stack[0].type === "forward" && !this.stack[0].threadCreated) {
+        const webhook = await this.ensureWebhook();
+        url = `/webhooks/${webhook.id}/${webhook.token}?wait=true`;
+      }
+      if (this.stack[0].type === "forward" && ((_a = this.stack[0].channel) == null ? void 0 : _a.id)) {
+        if (this.stack[1].author.nickname || this.stack[1].author.avatar) {
+          const webhook = await this.ensureWebhook();
+          url = `/webhooks/${webhook.id}/${webhook.token}?wait=true&thread_id=${(_b = this.stack[0].channel) == null ? void 0 : _b.id}`;
+        } else {
+          url = `/channels/${this.stack[0].channel.id}/messages`;
+        }
+      }
+      const result = await this.bot.http.post(url, data, { headers });
       const session = this.bot.session();
-      await adaptMessage(this.bot, result, session);
+      const message = await adaptMessage(this.bot, result, session);
       session.app.emit(session, "send", session);
       this.results.push(session);
+      if (this.stack[0].type === "forward" && !this.stack[0].threadCreated) {
+        this.stack[0].threadCreated = true;
+        const thread = await this.bot.internal.startThreadFromMessage(this.channelId, result.id, {
+          name: "Forward",
+          auto_archive_duration: 60
+        });
+        this.stack[0].channel = thread;
+      }
+      return message;
     } catch (e) {
+      if (import_satori2.Quester.isAxiosError(e) && ((_c = e.response) == null ? void 0 : _c.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);
+      }
       this.errors.push(e);
     }
   }
   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);
     form.append("payload_json", JSON.stringify(payload));
     return this.post(form, form.getHeaders());
   }
-  async sendContent(content, addition) {
-    return this.post({ ...addition, content });
-  }
   async sendAsset(type, attrs, addition) {
     const { handleMixedContent, handleExternalAsset } = this.bot.config;
     if (handleMixedContent === "separate" && addition.content) {
@@ -268,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();
@@ -277,6 +328,9 @@ var DiscordMessenger = class extends import_satori2.Messenger {
       }
     }, sendDownload);
   }
+  async ensureWebhook() {
+    return this.bot.ensureWebhook(this.channelId);
+  }
   async flush() {
     const content = this.buffer.trim();
     if (!content)
@@ -286,9 +340,10 @@ var DiscordMessenger = class extends import_satori2.Messenger {
     this.addition = {};
   }
   async visit(element) {
+    var _a;
     const { type, attrs, children } = element;
     if (type === "text") {
-      this.buffer += attrs.content.replace(/[\\*_`~|()]/g, "\\$&");
+      this.buffer += sanitize(attrs.content);
     } else if (type === "b" || type === "strong") {
       this.buffer += "**";
       await this.render(children);
@@ -355,7 +410,7 @@ var DiscordMessenger = class extends import_satori2.Messenger {
         ...this.addition,
         embeds: [{ ...attrs }]
       });
-    } else if (type === "record") {
+    } else if (type === "audio") {
       await this.sendAsset("file", attrs, {
         ...this.addition,
         content: this.buffer.trim()
@@ -371,20 +426,78 @@ var DiscordMessenger = class extends import_satori2.Messenger {
       });
       this.buffer = "";
       this.mode = "default";
-    } else if (type === "quote") {
-      await this.flush();
-      this.addition.message_reference = {
-        message_id: attrs.id
-      };
-    } else if (type === "message") {
+    } else if (type === "message" && !attrs.forward) {
       if (this.mode === "figure") {
         await this.render(children);
         this.buffer += "\n";
       } else {
+        const resultLength = +this.results.length;
         await this.flush();
+        const [author] = import_satori2.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_satori2.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;
+        const sentMessages = this.results.slice(resultLength, newLength);
+        if (this.stack[0].type === "forward" && attrs.id) {
+          this.stack[0].fakeMessageMap[attrs.id] = sentMessages;
+        }
+        if (this.stack[0].type === "message") {
+          this.stack[0].author = {};
+        }
+        if (this.stack[0].type === "forward") {
+          this.stack[1].author = {};
+        }
       }
+    } else if (type === "message" && attrs.forward) {
+      this.stack.unshift(new State("forward"));
+      await this.render(children);
+      await this.flush();
+      await this.bot.internal.modifyChannel(this.stack[0].channel.id, {
+        archived: true,
+        locked: true
+      });
+      this.stack.shift();
     } else {
       await this.render(children);
     }
@@ -1445,13 +1558,13 @@ Internal.define({
 
 // satori/adapters/discord/src/types/webhook.ts
 var Webhook2;
-((Webhook3) => {
+((Webhook4) => {
   let Type;
   ((Type2) => {
     Type2[Type2["INCOMING"] = 1] = "INCOMING";
     Type2[Type2["CHANNEL_FOLLOWER"] = 2] = "CHANNEL_FOLLOWER";
     Type2[Type2["APPLICATION"] = 3] = "APPLICATION";
-  })(Type = Webhook3.Type || (Webhook3.Type = {}));
+  })(Type = Webhook4.Type || (Webhook4.Type = {}));
 })(Webhook2 || (Webhook2 = {}));
 Internal.define({
   "/channels/{channel.id}/webhooks": {
@@ -1487,7 +1600,7 @@ Internal.define({
 
 // satori/adapters/discord/src/ws.ts
 var import_satori4 = require("@satorijs/satori");
-var logger = new import_satori4.Logger("discord");
+var logger2 = new import_satori4.Logger("discord");
 var WsClient = class extends import_satori4.Adapter.WsClient {
   constructor() {
     super(...arguments);
@@ -1502,7 +1615,7 @@ var WsClient = class extends import_satori4.Adapter.WsClient {
     return this.bot.http.ws(url);
   }
   heartbeat() {
-    logger.debug(`heartbeat d ${this._d}`);
+    logger2.debug(`heartbeat d ${this._d}`);
     this.bot.socket.send(JSON.stringify({
       op: 1 /* HEARTBEAT */,
       d: this._d
@@ -1515,16 +1628,16 @@ var WsClient = class extends import_satori4.Adapter.WsClient {
       try {
         parsed = JSON.parse(data.toString());
       } catch (error) {
-        return logger.warn("cannot parse message", data);
+        return logger2.warn("cannot parse message", data);
       }
-      logger.debug(require("util").inspect(parsed, false, null, true));
+      logger2.debug(require("util").inspect(parsed, false, null, true));
       if (parsed.s) {
         this._d = parsed.s;
       }
       if (parsed.op === 10 /* HELLO */) {
         this._ping = setInterval(() => this.heartbeat(), parsed.d.heartbeat_interval);
         if (this._sessionId) {
-          logger.debug("resuming");
+          logger2.debug("resuming");
           this.bot.socket.send(JSON.stringify({
             op: 6 /* RESUME */,
             d: {
@@ -1549,7 +1662,7 @@ var WsClient = class extends import_satori4.Adapter.WsClient {
         if (parsed.d)
           return;
         this._sessionId = "";
-        logger.warn("offline: invalid session");
+        logger2.warn("offline: invalid session");
         this.bot.offline();
         (_a = this.bot.socket) == null ? void 0 : _a.close();
       }
@@ -1561,7 +1674,7 @@ var WsClient = class extends import_satori4.Adapter.WsClient {
           self.selfId = self.userId;
           delete self.userId;
           Object.assign(this.bot, self);
-          logger.debug("session_id " + this._sessionId);
+          logger2.debug("session_id " + this._sessionId);
           return this.bot.online();
         }
         if (parsed.t === "RESUMED") {
@@ -1573,7 +1686,7 @@ var WsClient = class extends import_satori4.Adapter.WsClient {
       }
       if (parsed.op === 7 /* RECONNECT */) {
         this.bot.offline();
-        logger.warn("offline: discord request reconnect");
+        logger2.warn("offline: discord request reconnect");
         (_b = this.bot.socket) == null ? void 0 : _b.close();
       }
     });
@@ -1597,6 +1710,8 @@ var import_package = require("../package.json");
 var DiscordBot = class extends import_satori5.Bot {
   constructor(ctx, config) {
     super(ctx, config);
+    this.webhooks = {};
+    this.webhookLock = {};
     this.http = ctx.http.extend({
       ...config,
       headers: {
@@ -1608,6 +1723,31 @@ var DiscordBot = class extends import_satori5.Bot {
     this.internal = new Internal(this.http);
     ctx.plugin(WsClient, this);
   }
+  async _ensureWebhook(channelId) {
+    let webhook;
+    const webhooks = await this.internal.getChannelWebhooks(channelId);
+    const selfId = this.selfId;
+    if (!webhooks.find((v) => v.name === "Koishi" && v.user.id === selfId)) {
+      webhook = await this.internal.createWebhook(channelId, {
+        name: "Koishi"
+      });
+    } else {
+      webhook = webhooks.find((v) => v.name === "Koishi" && v.user.id === this.selfId);
+    }
+    return this.webhooks[channelId] = webhook;
+  }
+  async ensureWebhook(channelId) {
+    var _a;
+    if (this.webhooks[channelId] === null) {
+      delete this.webhooks[channelId];
+      delete this.webhookLock[channelId];
+    }
+    if (this.webhooks[channelId]) {
+      delete this.webhookLock[channelId];
+      return this.webhooks[channelId];
+    }
+    return (_a = this.webhookLock)[channelId] || (_a[channelId] = this._ensureWebhook(channelId));
+  }
   async getSelf() {
     const data = await this.internal.getCurrentUser();
     return adaptUser(data);
@@ -1622,7 +1762,7 @@ var DiscordBot = class extends import_satori5.Bot {
     await this.internal.deleteMessage(channelId, messageId);
   }
   async editMessage(channelId, messageId, content) {
-    const elements = import_satori5.segment.normalize(content);
+    const elements = import_satori5.h.normalize(content);
     content = elements.toString();
     const image = elements.find((v) => v.type === "image");
     if (image) {
@@ -1702,6 +1842,7 @@ var src_default = DiscordBot;
   adaptMessage,
   adaptSession,
   adaptUser,
-  prepareMessage
+  prepareMessage,
+  sanitize
 });
 //# sourceMappingURL=index.js.map