@satorijs/adapter-discord 3.2.7 → 3.3.0

package/lib/index.js

@@ -23,12 +23,12 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// satori/adapters/discord/src/index.ts
+// adapters/discord/src/index.ts
 var src_exports = {};
 __export(src_exports, {
   Discord: () => types_exports,
   DiscordBot: () => DiscordBot,
-  Sender: () => Sender,
+  DiscordModulator: () => DiscordModulator,
   WsClient: () => WsClient,
   adaptAuthor: () => adaptAuthor,
   adaptChannel: () => adaptChannel,
@@ -41,10 +41,10 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
 
-// satori/adapters/discord/src/bot.ts
+// adapters/discord/src/bot.ts
 var import_satori4 = require("@satorijs/satori");
 
-// satori/adapters/discord/src/utils.ts
+// adapters/discord/src/utils.ts
 var import_satori = require("@satorijs/satori");
 var adaptUser = /* @__PURE__ */ __name((user) => ({
   userId: user.id,
@@ -200,23 +200,13 @@ async function adaptSession(bot, input) {
 }
 __name(adaptSession, "adaptSession");
 
-// satori/adapters/discord/src/sender.ts
+// adapters/discord/src/modulator.ts
 var import_satori2 = require("@satorijs/satori");
 var import_file_type = require("file-type");
 var import_form_data = __toESM(require("form-data"));
-var AggregateError = class extends Error {
-  constructor(errors, message = "") {
-    super(message);
-    this.errors = errors;
-  }
-};
-__name(AggregateError, "AggregateError");
-var Sender = class {
-  constructor(bot, url) {
-    this.bot = bot;
-    this.url = url;
-    this.results = [];
-    this.errors = [];
+var DiscordModulator = class extends import_satori2.Modulator {
+  constructor() {
+    super(...arguments);
     this.buffer = "";
     this.addition = {};
     this.figure = null;
@@ -224,8 +214,11 @@ var Sender = class {
   }
   async post(data, headers) {
     try {
-      const result = await this.bot.http.post(this.url, data, { headers });
-      this.results.push(result.id);
+      const result = await this.bot.http.post(`/channels/${this.channelId}/messages`, data, { headers });
+      const session = this.bot.session();
+      await adaptMessage(this.bot, result, session);
+      session.app.emit(session, "send", session);
+      this.results.push(session);
     } catch (e) {
       this.errors.push(e);
     }
@@ -279,7 +272,7 @@ var Sender = class {
       }
     }, sendDownload);
   }
-  async sendBuffer() {
+  async flush() {
     const content = this.buffer.trim();
     if (!content)
       return;
@@ -287,97 +280,105 @@ var Sender = class {
     this.buffer = "";
     this.addition = {};
   }
-  async render(elements) {
-    for (const element of elements) {
-      const { type, attrs, children } = element;
-      if (type === "text") {
-        this.buffer += attrs.content;
-      } else if (type === "p") {
-        await this.render(children);
-        this.buffer += "\n";
-      } else if (type === "at") {
-        if (attrs.id) {
-          this.buffer += `<@${attrs.id}>`;
-        } else if (attrs.type === "all") {
-          this.buffer += `@everyone`;
-        } else if (attrs.type === "here") {
-          this.buffer += `@here`;
-        }
-      } else if (type === "sharp" && attrs.id) {
-        this.buffer += `<#${attrs.id}>`;
-      } else if (type === "face" && attrs.name && attrs.id) {
-        this.buffer += `<:${attrs.name}:${attrs.id}>`;
-      } else if ((type === "image" || type === "video") && attrs.url) {
-        if (this.mode === "figure") {
-          this.figure = element;
-        } else {
-          await this.sendAsset(type, attrs, {
-            ...this.addition,
-            content: this.buffer.trim()
-          });
-          this.buffer = "";
-        }
-      } else if (type === "share") {
-        await this.sendBuffer();
-        await this.post({
-          ...this.addition,
-          embeds: [{ ...attrs }]
-        });
-      } else if (type === "record") {
-        await this.sendAsset("file", attrs, {
+  async visit(element) {
+    const { type, attrs, children } = element;
+    if (type === "text") {
+      this.buffer += attrs.content.replace(/[\\*_`~|()]/g, "\\$&");
+    } else if (type === "b" || type === "strong") {
+      this.buffer += "**";
+      await this.render(children);
+      this.buffer += "**";
+    } else if (type === "i" || type === "em") {
+      this.buffer += "*";
+      await this.render(children);
+      this.buffer += "*";
+    } else if (type === "u" || type === "ins") {
+      this.buffer += "__";
+      await this.render(children);
+      this.buffer += "__";
+    } else if (type === "s" || type === "del") {
+      this.buffer += "~~";
+      await this.render(children);
+      this.buffer += "~~";
+    } else if (type === "spl") {
+      this.buffer += "||";
+      await this.render(children);
+      this.buffer += "||";
+    } else if (type === "code") {
+      this.buffer += "`";
+      await this.render(children);
+      this.buffer += "`";
+    } else if (type === "a") {
+      await this.render(children);
+      this.buffer += ` (${attrs.href}) `;
+    } else if (type === "p") {
+      await this.render(children);
+      this.buffer += "\n";
+    } else if (type === "at") {
+      if (attrs.id) {
+        this.buffer += `<@${attrs.id}>`;
+      } else if (attrs.type === "all") {
+        this.buffer += `@everyone`;
+      } else if (attrs.type === "here") {
+        this.buffer += `@here`;
+      }
+    } else if (type === "sharp" && attrs.id) {
+      this.buffer += `<#${attrs.id}>`;
+    } else if (type === "face" && attrs.name && attrs.id) {
+      this.buffer += `<:${attrs.name}:${attrs.id}>`;
+    } else if ((type === "image" || type === "video") && attrs.url) {
+      if (this.mode === "figure") {
+        this.figure = element;
+      } else {
+        await this.sendAsset(type, attrs, {
           ...this.addition,
           content: this.buffer.trim()
         });
         this.buffer = "";
-      } else if (type === "figure") {
-        await this.sendBuffer();
-        this.mode = "figure";
+      }
+    } else if (type === "share") {
+      await this.flush();
+      await this.post({
+        ...this.addition,
+        embeds: [{ ...attrs }]
+      });
+    } else if (type === "record") {
+      await this.sendAsset("file", attrs, {
+        ...this.addition,
+        content: this.buffer.trim()
+      });
+      this.buffer = "";
+    } else if (type === "figure") {
+      await this.flush();
+      this.mode = "figure";
+      await this.render(children);
+      await this.sendAsset(this.figure.type, this.figure.attrs, {
+        ...this.addition,
+        content: this.buffer.trim()
+      });
+      this.buffer = "";
+      this.mode = "default";
+    } else if (type === "quote") {
+      await this.flush();
+      this.addition.message_reference = {
+        message_id: attrs.id
+      };
+    } else if (type === "message") {
+      if (this.mode === "figure") {
         await this.render(children);
-        await this.sendAsset(this.figure.type, this.figure.attrs, {
-          ...this.addition,
-          content: this.buffer.trim()
-        });
-        this.buffer = "";
-        this.mode = "default";
-      } else if (type === "quote") {
-        await this.sendBuffer();
-        this.addition.message_reference = {
-          message_id: attrs.id
-        };
-      } else if (type === "message") {
-        if (this.mode === "figure") {
-          await this.render(children);
-          this.buffer += "\n";
-        } else {
-          await this.sendBuffer();
-          if ("quote" in attrs) {
-            this.addition.message_reference = {
-              message_id: attrs.id
-            };
-          } else {
-            await this.sendMessage(children);
-          }
-        }
+        this.buffer += "\n";
       } else {
-        await this.render(children);
+        await this.flush();
+        await this.render(children, true);
       }
+    } else {
+      await this.render(children);
     }
   }
-  async sendMessage(elements) {
-    await this.render(elements);
-    await this.sendBuffer();
-  }
-  async send(content) {
-    const elements = import_satori2.segment.parse(content);
-    await this.sendMessage(elements);
-    if (!this.errors.length)
-      return this.results;
-    throw new AggregateError(this.errors);
-  }
 };
-__name(Sender, "Sender");
-((Sender2) => {
-  Sender2.Config = import_satori2.Schema.object({
+__name(DiscordModulator, "DiscordModulator");
+((DiscordModulator2) => {
+  DiscordModulator2.Config = import_satori2.Schema.object({
     handleExternalAsset: import_satori2.Schema.union([
       import_satori2.Schema.const("download").description("先下载后发送"),
       import_satori2.Schema.const("direct").description("直接发送链接"),
@@ -389,9 +390,9 @@ __name(Sender, "Sender");
       import_satori2.Schema.const("auto").description("如果图片本身采用直接发送则与前面的文本分开，否则将文本作为图片的附带信息发送")
     ]).role("radio").description("发送图文等混合内容时采用的方式。").default("auto")
   }).description("发送设置");
-})(Sender || (Sender = {}));
+})(DiscordModulator || (DiscordModulator = {}));
 
-// satori/adapters/discord/src/types/index.ts
+// adapters/discord/src/types/index.ts
 var types_exports = {};
 __export(types_exports, {
   ActivityFlag: () => ActivityFlag,
@@ -402,12 +403,12 @@ __export(types_exports, {
   AuditLog: () => AuditLog,
   AutoModerationAction: () => AutoModerationAction,
   AutoModerationRule: () => AutoModerationRule,
-  Channel: () => Channel3,
+  Channel: () => Channel2,
   ComponentType: () => ComponentType,
   DeviceType: () => DeviceType,
   GatewayIntent: () => GatewayIntent,
   GatewayOpcode: () => GatewayOpcode,
-  Guild: () => Guild4,
+  Guild: () => Guild3,
   GuildFeature: () => GuildFeature,
   GuildScheduledEvent: () => GuildScheduledEvent,
   IntegrationExpireBehavior: () => IntegrationExpireBehavior,
@@ -417,7 +418,7 @@ __export(types_exports, {
   Internal: () => Internal,
   Invite: () => Invite,
   MembershipState: () => MembershipState,
-  Message: () => Message3,
+  Message: () => Message2,
   Permission: () => Permission,
   StatusType: () => StatusType2,
   Sticker: () => Sticker3,
@@ -428,7 +429,7 @@ __export(types_exports, {
   Webhook: () => Webhook2
 });
 
-// satori/adapters/discord/src/types/internal.ts
+// adapters/discord/src/types/internal.ts
 var import_cosmokit = require("cosmokit");
 var Internal = class {
   constructor(http) {
@@ -468,7 +469,7 @@ var Internal = class {
 };
 __name(Internal, "Internal");
 
-// satori/adapters/discord/src/types/application.ts
+// adapters/discord/src/types/application.ts
 var ApplicationFlag = /* @__PURE__ */ ((ApplicationFlag2) => {
   ApplicationFlag2[ApplicationFlag2["GATEWAY_PRESENCE"] = 4096] = "GATEWAY_PRESENCE";
   ApplicationFlag2[ApplicationFlag2["GATEWAY_PRESENCE_LIMITED"] = 8192] = "GATEWAY_PRESENCE_LIMITED";
@@ -487,7 +488,7 @@ Internal.define({
   }
 });
 
-// satori/adapters/discord/src/types/audit-log.ts
+// adapters/discord/src/types/audit-log.ts
 var AuditLog;
 ((AuditLog2) => {
   let Type;
@@ -554,7 +555,7 @@ Internal.define({
   }
 });
 
-// satori/adapters/discord/src/types/auto-moderation.ts
+// adapters/discord/src/types/auto-moderation.ts
 var AutoModerationRule;
 ((AutoModerationRule2) => {
   let EventType;
@@ -596,7 +597,7 @@ Internal.define({
   }
 });
 
-// satori/adapters/discord/src/types/ban.ts
+// adapters/discord/src/types/ban.ts
 Internal.define({
   "/guilds/{guild.id}/bans": {
     GET: "getGuildBans"
@@ -608,9 +609,9 @@ Internal.define({
   }
 });
 
-// satori/adapters/discord/src/types/channel.ts
-var Channel3;
-((Channel11) => {
+// adapters/discord/src/types/channel.ts
+var Channel2;
+((Channel10) => {
   let Type;
   ((Type2) => {
     Type2[Type2["GUILD_TEXT"] = 0] = "GUILD_TEXT";
@@ -626,8 +627,8 @@ var Channel3;
     Type2[Type2["GUILD_STAGE_VOICE"] = 13] = "GUILD_STAGE_VOICE";
     Type2[Type2["GUILD_DIRECTORY"] = 14] = "GUILD_DIRECTORY";
     Type2[Type2["GUILD_FORUM"] = 15] = "GUILD_FORUM";
-  })(Type = Channel11.Type || (Channel11.Type = {}));
-})(Channel3 || (Channel3 = {}));
+  })(Type = Channel10.Type || (Channel10.Type = {}));
+})(Channel2 || (Channel2 = {}));
 var AllowedMentionType = /* @__PURE__ */ ((AllowedMentionType2) => {
   AllowedMentionType2["ROLE_MENTIONS"] = "roles";
   AllowedMentionType2["USER_MENTIONS"] = "users";
@@ -668,7 +669,7 @@ Internal.define({
   }
 });
 
-// satori/adapters/discord/src/types/command.ts
+// adapters/discord/src/types/command.ts
 var ApplicationCommand;
 ((ApplicationCommand3) => {
   let Type;
@@ -727,7 +728,7 @@ Internal.define({
   }
 });
 
-// satori/adapters/discord/src/types/component.ts
+// adapters/discord/src/types/component.ts
 var ComponentType = /* @__PURE__ */ ((ComponentType2) => {
   ComponentType2[ComponentType2["ACTION_ROW"] = 1] = "ACTION_ROW";
   ComponentType2[ComponentType2["BUTTON"] = 2] = "BUTTON";
@@ -741,7 +742,7 @@ var TextInputStyles = /* @__PURE__ */ ((TextInputStyles2) => {
   return TextInputStyles2;
 })(TextInputStyles || {});
 
-// satori/adapters/discord/src/types/device.ts
+// adapters/discord/src/types/device.ts
 var DeviceType = /* @__PURE__ */ ((DeviceType2) => {
   DeviceType2["AUDIO_INPUT"] = "audioinput";
   DeviceType2["AUDIO_OUTPUT"] = "audiooutput";
@@ -749,7 +750,7 @@ var DeviceType = /* @__PURE__ */ ((DeviceType2) => {
   return DeviceType2;
 })(DeviceType || {});
 
-// satori/adapters/discord/src/types/emoji.ts
+// adapters/discord/src/types/emoji.ts
 Internal.define({
   "/guilds/{guild.id}/emojis": {
     GET: "listGuildEmojis",
@@ -762,7 +763,7 @@ Internal.define({
   }
 });
 
-// satori/adapters/discord/src/types/gateway.ts
+// adapters/discord/src/types/gateway.ts
 var GatewayOpcode = /* @__PURE__ */ ((GatewayOpcode2) => {
   GatewayOpcode2[GatewayOpcode2["DISPATCH"] = 0] = "DISPATCH";
   GatewayOpcode2[GatewayOpcode2["HEARTBEAT"] = 1] = "HEARTBEAT";
@@ -808,7 +809,7 @@ Internal.define({
   }
 });
 
-// satori/adapters/discord/src/types/guild-member.ts
+// adapters/discord/src/types/guild-member.ts
 Internal.define({
   "/guilds/{guild.id}/members/{user.id}": {
     GET: "getGuildMember",
@@ -835,7 +836,7 @@ Internal.define({
   }
 });
 
-// satori/adapters/discord/src/types/guild-template.ts
+// adapters/discord/src/types/guild-template.ts
 Internal.define({
   "/guilds/templates/{template.code}": {
     GET: "getGuildTemplate",
@@ -852,9 +853,9 @@ Internal.define({
   }
 });
 
-// satori/adapters/discord/src/types/guild.ts
-var Guild4;
-((Guild7) => {
+// adapters/discord/src/types/guild.ts
+var Guild3;
+((Guild6) => {
   let Params;
   ((Params2) => {
     let WidgetStyleOptions;
@@ -865,8 +866,8 @@ var Guild4;
       WidgetStyleOptions2["banner3"] = "banner3";
       WidgetStyleOptions2["banner4"] = "banner4";
     })(WidgetStyleOptions = Params2.WidgetStyleOptions || (Params2.WidgetStyleOptions = {}));
-  })(Params = Guild7.Params || (Guild7.Params = {}));
-})(Guild4 || (Guild4 = {}));
+  })(Params = Guild6.Params || (Guild6.Params = {}));
+})(Guild3 || (Guild3 = {}));
 var SystemChannelFlag = /* @__PURE__ */ ((SystemChannelFlag2) => {
   SystemChannelFlag2[SystemChannelFlag2["SUPPRESS_JOIN_NOTIFICATIONS"] = 1] = "SUPPRESS_JOIN_NOTIFICATIONS";
   SystemChannelFlag2[SystemChannelFlag2["SUPPRESS_PREMIUM_SUBSCRIPTIONS"] = 2] = "SUPPRESS_PREMIUM_SUBSCRIPTIONS";
@@ -937,7 +938,7 @@ Internal.define({
   }
 });
 
-// satori/adapters/discord/src/types/integration.ts
+// adapters/discord/src/types/integration.ts
 var IntegrationExpireBehavior = /* @__PURE__ */ ((IntegrationExpireBehavior2) => {
   IntegrationExpireBehavior2[IntegrationExpireBehavior2["REMOVE_ROLE"] = 0] = "REMOVE_ROLE";
   IntegrationExpireBehavior2[IntegrationExpireBehavior2["KICK"] = 1] = "KICK";
@@ -952,7 +953,7 @@ Internal.define({
   }
 });
 
-// satori/adapters/discord/src/types/interaction.ts
+// adapters/discord/src/types/interaction.ts
 var InteractionType = /* @__PURE__ */ ((InteractionType2) => {
   InteractionType2[InteractionType2["PING"] = 1] = "PING";
   InteractionType2[InteractionType2["APPLICATION_COMMAND"] = 2] = "APPLICATION_COMMAND";
@@ -992,7 +993,7 @@ Internal.define({
   }
 });
 
-// satori/adapters/discord/src/types/invite.ts
+// adapters/discord/src/types/invite.ts
 var Invite;
 ((Invite2) => {
   let TargetType;
@@ -1018,9 +1019,9 @@ Internal.define({
   }
 });
 
-// satori/adapters/discord/src/types/message.ts
-var Message3;
-((Message6) => {
+// adapters/discord/src/types/message.ts
+var Message2;
+((Message4) => {
   let Type;
   ((Type2) => {
     Type2[Type2["DEFAULT"] = 0] = "DEFAULT";
@@ -1046,14 +1047,14 @@ var Message3;
     Type2[Type2["THREAD_STARTER_MESSAGE"] = 21] = "THREAD_STARTER_MESSAGE";
     Type2[Type2["GUILD_INVITE_REMINDER"] = 22] = "GUILD_INVITE_REMINDER";
     Type2[Type2["CONTEXT_MENU_COMMAND"] = 23] = "CONTEXT_MENU_COMMAND";
-  })(Type = Message6.Type || (Message6.Type = {}));
+  })(Type = Message4.Type || (Message4.Type = {}));
   let ActivityType2;
   ((ActivityType3) => {
     ActivityType3[ActivityType3["JOIN"] = 1] = "JOIN";
     ActivityType3[ActivityType3["SPECTATE"] = 2] = "SPECTATE";
     ActivityType3[ActivityType3["LISTEN"] = 3] = "LISTEN";
     ActivityType3[ActivityType3["JOIN_REQUEST"] = 5] = "JOIN_REQUEST";
-  })(ActivityType2 = Message6.ActivityType || (Message6.ActivityType = {}));
+  })(ActivityType2 = Message4.ActivityType || (Message4.ActivityType = {}));
   let Flag;
   ((Flag2) => {
     Flag2[Flag2["CROSSPOSTED"] = 1] = "CROSSPOSTED";
@@ -1064,8 +1065,8 @@ var Message3;
     Flag2[Flag2["HAS_THREAD"] = 32] = "HAS_THREAD";
     Flag2[Flag2["EPHEMERAL"] = 64] = "EPHEMERAL";
     Flag2[Flag2["LOADING"] = 128] = "LOADING";
-  })(Flag = Message6.Flag || (Message6.Flag = {}));
-})(Message3 || (Message3 = {}));
+  })(Flag = Message4.Flag || (Message4.Flag = {}));
+})(Message2 || (Message2 = {}));
 Internal.define({
   "/channels/{channel.id}/messages": {
     GET: "getChannelMessages",
@@ -1091,7 +1092,7 @@ Internal.define({
   }
 });
 
-// satori/adapters/discord/src/types/presence.ts
+// adapters/discord/src/types/presence.ts
 var StatusType2 = /* @__PURE__ */ ((StatusType3) => {
   StatusType3["ONLINE"] = "ONLINE";
   StatusType3["DND"] = "DND";
@@ -1119,7 +1120,7 @@ var ActivityFlag = /* @__PURE__ */ ((ActivityFlag2) => {
   return ActivityFlag2;
 })(ActivityFlag || {});
 
-// satori/adapters/discord/src/types/reaction.ts
+// adapters/discord/src/types/reaction.ts
 Internal.define({
   "/channels/{channel.id}/messages/{message.id}/reactions/{emoji}/@me": {
     PUT: "createReaction",
@@ -1137,7 +1138,7 @@ Internal.define({
   }
 });
 
-// satori/adapters/discord/src/types/role.ts
+// adapters/discord/src/types/role.ts
 var Permission = /* @__PURE__ */ ((Permission2) => {
   Permission2[Permission2["CREATE_INSTANT_INVITE"] = 1] = "CREATE_INSTANT_INVITE";
   Permission2[Permission2["KICK_MEMBERS"] = 2] = "KICK_MEMBERS";
@@ -1192,7 +1193,7 @@ Internal.define({
   }
 });
 
-// satori/adapters/discord/src/types/scheduled-event.ts
+// adapters/discord/src/types/scheduled-event.ts
 var GuildScheduledEvent;
 ((GuildScheduledEvent2) => {
   let PrivacyLevel;
@@ -1228,7 +1229,7 @@ Internal.define({
   }
 });
 
-// satori/adapters/discord/src/types/stage-instance.ts
+// adapters/discord/src/types/stage-instance.ts
 Internal.define({
   "/stage-instances": {
     POST: "createStageInstance"
@@ -1240,7 +1241,7 @@ Internal.define({
   }
 });
 
-// satori/adapters/discord/src/types/sticker.ts
+// adapters/discord/src/types/sticker.ts
 var Sticker3;
 ((Sticker4) => {
   let Type;
@@ -1273,14 +1274,14 @@ Internal.define({
   }
 });
 
-// satori/adapters/discord/src/types/team.ts
+// adapters/discord/src/types/team.ts
 var MembershipState = /* @__PURE__ */ ((MembershipState2) => {
   MembershipState2[MembershipState2["INVITED"] = 1] = "INVITED";
   MembershipState2[MembershipState2["ACCEPTED"] = 2] = "ACCEPTED";
   return MembershipState2;
 })(MembershipState || {});
 
-// satori/adapters/discord/src/types/thread.ts
+// adapters/discord/src/types/thread.ts
 Internal.define({
   "/guilds/{guild.id}/threads/active": {
     GET: "listActiveGuildThreads"
@@ -1317,7 +1318,7 @@ Internal.define({
   }
 });
 
-// satori/adapters/discord/src/types/user.ts
+// adapters/discord/src/types/user.ts
 var UserFlag = /* @__PURE__ */ ((UserFlag2) => {
   UserFlag2[UserFlag2["NONE"] = 0] = "NONE";
   UserFlag2[UserFlag2["DISCORD_EMPLOYEE"] = 1] = "DISCORD_EMPLOYEE";
@@ -1353,7 +1354,7 @@ Internal.define({
   }
 });
 
-// satori/adapters/discord/src/types/voice.ts
+// adapters/discord/src/types/voice.ts
 Internal.define({
   "/voice/regions": {
     GET: "listVoiceRegions"
@@ -1369,7 +1370,7 @@ Internal.define({
   }
 });
 
-// satori/adapters/discord/src/types/webhook.ts
+// adapters/discord/src/types/webhook.ts
 var Webhook2;
 ((Webhook3) => {
   let Type;
@@ -1411,7 +1412,7 @@ Internal.define({
   }
 });
 
-// satori/adapters/discord/src/ws.ts
+// 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 {
@@ -1499,7 +1500,7 @@ __name(WsClient, "WsClient");
   ]);
 })(WsClient || (WsClient = {}));
 
-// satori/adapters/discord/src/bot.ts
+// adapters/discord/src/bot.ts
 var DiscordBot = class extends import_satori4.Bot {
   constructor(ctx, config) {
     super(ctx, config);
@@ -1518,32 +1519,10 @@ var DiscordBot = class extends import_satori4.Bot {
     return adaptUser(data);
   }
   async sendMessage(channelId, content, guildId) {
-    const fragment = import_satori4.segment.normalize(content);
-    const elements = fragment.children;
-    content = fragment.toString();
-    const session = this.session({
-      type: "send",
-      author: this,
-      channelId,
-      elements,
-      content,
-      guildId,
-      subtype: guildId ? "group" : "private"
-    });
-    if (await this.context.serial(session, "before-send", session))
-      return;
-    if (!session.content)
-      return [];
-    const sender = new Sender(this, `/channels/${channelId}/messages`);
-    const results = await sender.send(session.content);
-    for (const id of results) {
-      session.messageId = id;
-      this.context.emit(session, "send", session);
-    }
-    return results;
+    return new DiscordModulator(this, channelId, guildId).send(content);
   }
   async sendPrivateMessage(channelId, content) {
-    return this.sendMessage(channelId, content);
+    return new DiscordModulator(this, channelId).send(content);
   }
   async deleteMessage(channelId, messageId) {
     await this.internal.deleteMessage(channelId, messageId);
@@ -1610,19 +1589,19 @@ __name(DiscordBot, "DiscordBot");
       token: import_satori4.Schema.string().description("机器人的用户令牌。").role("secret").required()
     }),
     WsClient.Config,
-    Sender.Config,
+    DiscordModulator.Config,
     import_satori4.Quester.createConfig("https://discord.com/api/v10")
   ]);
 })(DiscordBot || (DiscordBot = {}));
 DiscordBot.prototype.platform = "discord";
 
-// satori/adapters/discord/src/index.ts
+// adapters/discord/src/index.ts
 var src_default = DiscordBot;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Discord,
   DiscordBot,
-  Sender,
+  DiscordModulator,
   WsClient,
   adaptAuthor,
   adaptChannel,