@satorijs/adapter-discord 3.3.0 → 3.3.2

package/lib/bot.d.ts

@@ -1,16 +1,16 @@
-import { Bot, Context, Quester, Schema, segment } from '@satorijs/satori';
-import { DiscordModulator } from './modulator';
+import { Bot, Context, Fragment, Quester, Schema } from '@satorijs/satori';
+import { DiscordMessenger } from './message';
 import { Internal } from './types';
 import { WsClient } from './ws';
-export declare class DiscordBot<C extends Context = Context> extends Bot<DiscordBot.Config> {
+export declare class DiscordBot extends Bot<DiscordBot.Config> {
     http: Quester;
     internal: Internal;
-    constructor(ctx: C, config: DiscordBot.Config);
+    constructor(ctx: Context, config: DiscordBot.Config);
     getSelf(): Promise<import("@satorijs/core").Universal.User>;
-    sendMessage(channelId: string, content: string | segment, guildId?: string): any;
-    sendPrivateMessage(channelId: string, content: string | segment): Promise<string[]>;
+    sendMessage(channelId: string, content: Fragment, guildId?: string): Promise<string[]>;
+    sendPrivateMessage(channelId: string, content: Fragment): Promise<string[]>;
     deleteMessage(channelId: string, messageId: string): Promise<void>;
-    editMessage(channelId: string, messageId: string, content: string | segment): Promise<void>;
+    editMessage(channelId: string, messageId: string, content: Fragment): Promise<void>;
     getMessage(channelId: string, messageId: string): Promise<import("@satorijs/core").Universal.Message>;
     getMessageList(channelId: string, before?: string): Promise<import("@satorijs/core").Universal.Message[]>;
     getUser(userId: string): Promise<import("@satorijs/core").Universal.User>;
@@ -30,7 +30,7 @@ export declare class DiscordBot<C extends Context = Context> extends Bot<Discord
     getChannelList(guildId: string): Promise<import("@satorijs/core").Universal.Channel[]>;
 }
 export declare namespace DiscordBot {
-    interface Config extends Bot.Config, Quester.Config, DiscordModulator.Config, WsClient.Config {
+    interface Config extends Bot.Config, Quester.Config, DiscordMessenger.Config, WsClient.Config {
         token: string;
     }
     const Config: Schema<Config>;

package/lib/index.d.ts

@@ -2,7 +2,7 @@ import { DiscordBot } from './bot';
 import * as Discord from './types';
 export { Discord };
 export * from './bot';
-export * from './modulator';
+export * from './message';
 export * from './utils';
 export * from './ws';
 export default DiscordBot;

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);
 
-// adapters/discord/src/index.ts
+// satori/adapters/discord/src/index.ts
 var src_exports = {};
 __export(src_exports, {
   Discord: () => types_exports,
   DiscordBot: () => DiscordBot,
-  DiscordModulator: () => DiscordModulator,
+  DiscordMessenger: () => DiscordMessenger,
   WsClient: () => WsClient,
   adaptAuthor: () => adaptAuthor,
   adaptChannel: () => adaptChannel,
@@ -41,10 +41,10 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
 
-// adapters/discord/src/bot.ts
+// satori/adapters/discord/src/bot.ts
 var import_satori4 = require("@satorijs/satori");
 
-// adapters/discord/src/utils.ts
+// satori/adapters/discord/src/utils.ts
 var import_satori = require("@satorijs/satori");
 var adaptUser = /* @__PURE__ */ __name((user) => ({
   userId: user.id,
@@ -67,6 +67,7 @@ var adaptAuthor = /* @__PURE__ */ __name((author) => ({
 }), "adaptAuthor");
 async function adaptMessage(bot, meta, session = {}) {
   var _a, _b, _c;
+  const { platform } = bot;
   prepareMessage(session, meta);
   session.messageId = meta.id;
   session.timestamp = new Date(meta.timestamp).valueOf() || Date.now();
@@ -87,14 +88,21 @@ async 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_satori.segment.at(id, { name: user == null ? void 0 : user.username }).toString();
       }
-    }).replace(/<:(.*):(.+?)>/g, (_, name, id) => (0, import_satori.segment)("face", { id, name }).toString()).replace(/<a:(.*):(.+?)>/g, (_, name, id) => (0, import_satori.segment)("face", { id, name, animated: true }).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(/<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`)
+      ]).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) => {
       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();
     });
   }
   if ((_c = meta.attachments) == null ? void 0 : _c.length) {
-    session.content += " " + meta.attachments.map((v) => {
+    if (session.content)
+      session.content += " ";
+    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", {
@@ -200,11 +208,11 @@ async function adaptSession(bot, input) {
 }
 __name(adaptSession, "adaptSession");
 
-// adapters/discord/src/modulator.ts
+// satori/adapters/discord/src/message.ts
 var import_satori2 = require("@satorijs/satori");
 var import_file_type = require("file-type");
 var import_form_data = __toESM(require("form-data"));
-var DiscordModulator = class extends import_satori2.Modulator {
+var DiscordMessenger = class extends import_satori2.Messenger {
   constructor() {
     super(...arguments);
     this.buffer = "";
@@ -324,8 +332,12 @@ var DiscordModulator = class extends import_satori2.Modulator {
       }
     } 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 === "face") {
+      if (attrs.platform && attrs.platform !== this.bot.platform) {
+        return this.render(children);
+      } else {
+        this.buffer += `<${attrs.animated ? "a" : ""}:${attrs.name}:${attrs.id}>`;
+      }
     } else if ((type === "image" || type === "video") && attrs.url) {
       if (this.mode === "figure") {
         this.figure = element;
@@ -376,9 +388,9 @@ var DiscordModulator = class extends import_satori2.Modulator {
     }
   }
 };
-__name(DiscordModulator, "DiscordModulator");
-((DiscordModulator2) => {
-  DiscordModulator2.Config = import_satori2.Schema.object({
+__name(DiscordMessenger, "DiscordMessenger");
+((DiscordMessenger2) => {
+  DiscordMessenger2.Config = import_satori2.Schema.object({
     handleExternalAsset: import_satori2.Schema.union([
       import_satori2.Schema.const("download").description("先下载后发送"),
       import_satori2.Schema.const("direct").description("直接发送链接"),
@@ -390,9 +402,9 @@ __name(DiscordModulator, "DiscordModulator");
       import_satori2.Schema.const("auto").description("如果图片本身采用直接发送则与前面的文本分开，否则将文本作为图片的附带信息发送")
     ]).role("radio").description("发送图文等混合内容时采用的方式。").default("auto")
   }).description("发送设置");
-})(DiscordModulator || (DiscordModulator = {}));
+})(DiscordMessenger || (DiscordMessenger = {}));
 
-// adapters/discord/src/types/index.ts
+// satori/adapters/discord/src/types/index.ts
 var types_exports = {};
 __export(types_exports, {
   ActivityFlag: () => ActivityFlag,
@@ -429,7 +441,7 @@ __export(types_exports, {
   Webhook: () => Webhook2
 });
 
-// adapters/discord/src/types/internal.ts
+// satori/adapters/discord/src/types/internal.ts
 var import_cosmokit = require("cosmokit");
 var Internal = class {
   constructor(http) {
@@ -469,7 +481,7 @@ var Internal = class {
 };
 __name(Internal, "Internal");
 
-// adapters/discord/src/types/application.ts
+// satori/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";
@@ -488,7 +500,7 @@ Internal.define({
   }
 });
 
-// adapters/discord/src/types/audit-log.ts
+// satori/adapters/discord/src/types/audit-log.ts
 var AuditLog;
 ((AuditLog2) => {
   let Type;
@@ -555,7 +567,7 @@ Internal.define({
   }
 });
 
-// adapters/discord/src/types/auto-moderation.ts
+// satori/adapters/discord/src/types/auto-moderation.ts
 var AutoModerationRule;
 ((AutoModerationRule2) => {
   let EventType;
@@ -597,7 +609,7 @@ Internal.define({
   }
 });
 
-// adapters/discord/src/types/ban.ts
+// satori/adapters/discord/src/types/ban.ts
 Internal.define({
   "/guilds/{guild.id}/bans": {
     GET: "getGuildBans"
@@ -609,7 +621,7 @@ Internal.define({
   }
 });
 
-// adapters/discord/src/types/channel.ts
+// satori/adapters/discord/src/types/channel.ts
 var Channel2;
 ((Channel10) => {
   let Type;
@@ -669,7 +681,7 @@ Internal.define({
   }
 });
 
-// adapters/discord/src/types/command.ts
+// satori/adapters/discord/src/types/command.ts
 var ApplicationCommand;
 ((ApplicationCommand3) => {
   let Type;
@@ -728,7 +740,7 @@ Internal.define({
   }
 });
 
-// adapters/discord/src/types/component.ts
+// satori/adapters/discord/src/types/component.ts
 var ComponentType = /* @__PURE__ */ ((ComponentType2) => {
   ComponentType2[ComponentType2["ACTION_ROW"] = 1] = "ACTION_ROW";
   ComponentType2[ComponentType2["BUTTON"] = 2] = "BUTTON";
@@ -742,7 +754,7 @@ var TextInputStyles = /* @__PURE__ */ ((TextInputStyles2) => {
   return TextInputStyles2;
 })(TextInputStyles || {});
 
-// adapters/discord/src/types/device.ts
+// satori/adapters/discord/src/types/device.ts
 var DeviceType = /* @__PURE__ */ ((DeviceType2) => {
   DeviceType2["AUDIO_INPUT"] = "audioinput";
   DeviceType2["AUDIO_OUTPUT"] = "audiooutput";
@@ -750,7 +762,7 @@ var DeviceType = /* @__PURE__ */ ((DeviceType2) => {
   return DeviceType2;
 })(DeviceType || {});
 
-// adapters/discord/src/types/emoji.ts
+// satori/adapters/discord/src/types/emoji.ts
 Internal.define({
   "/guilds/{guild.id}/emojis": {
     GET: "listGuildEmojis",
@@ -763,7 +775,7 @@ Internal.define({
   }
 });
 
-// adapters/discord/src/types/gateway.ts
+// satori/adapters/discord/src/types/gateway.ts
 var GatewayOpcode = /* @__PURE__ */ ((GatewayOpcode2) => {
   GatewayOpcode2[GatewayOpcode2["DISPATCH"] = 0] = "DISPATCH";
   GatewayOpcode2[GatewayOpcode2["HEARTBEAT"] = 1] = "HEARTBEAT";
@@ -809,7 +821,7 @@ Internal.define({
   }
 });
 
-// adapters/discord/src/types/guild-member.ts
+// satori/adapters/discord/src/types/guild-member.ts
 Internal.define({
   "/guilds/{guild.id}/members/{user.id}": {
     GET: "getGuildMember",
@@ -836,7 +848,7 @@ Internal.define({
   }
 });
 
-// adapters/discord/src/types/guild-template.ts
+// satori/adapters/discord/src/types/guild-template.ts
 Internal.define({
   "/guilds/templates/{template.code}": {
     GET: "getGuildTemplate",
@@ -853,7 +865,7 @@ Internal.define({
   }
 });
 
-// adapters/discord/src/types/guild.ts
+// satori/adapters/discord/src/types/guild.ts
 var Guild3;
 ((Guild6) => {
   let Params;
@@ -938,7 +950,7 @@ Internal.define({
   }
 });
 
-// adapters/discord/src/types/integration.ts
+// satori/adapters/discord/src/types/integration.ts
 var IntegrationExpireBehavior = /* @__PURE__ */ ((IntegrationExpireBehavior2) => {
   IntegrationExpireBehavior2[IntegrationExpireBehavior2["REMOVE_ROLE"] = 0] = "REMOVE_ROLE";
   IntegrationExpireBehavior2[IntegrationExpireBehavior2["KICK"] = 1] = "KICK";
@@ -953,7 +965,7 @@ Internal.define({
   }
 });
 
-// adapters/discord/src/types/interaction.ts
+// satori/adapters/discord/src/types/interaction.ts
 var InteractionType = /* @__PURE__ */ ((InteractionType2) => {
   InteractionType2[InteractionType2["PING"] = 1] = "PING";
   InteractionType2[InteractionType2["APPLICATION_COMMAND"] = 2] = "APPLICATION_COMMAND";
@@ -993,7 +1005,7 @@ Internal.define({
   }
 });
 
-// adapters/discord/src/types/invite.ts
+// satori/adapters/discord/src/types/invite.ts
 var Invite;
 ((Invite2) => {
   let TargetType;
@@ -1019,7 +1031,7 @@ Internal.define({
   }
 });
 
-// adapters/discord/src/types/message.ts
+// satori/adapters/discord/src/types/message.ts
 var Message2;
 ((Message4) => {
   let Type;
@@ -1092,7 +1104,7 @@ Internal.define({
   }
 });
 
-// adapters/discord/src/types/presence.ts
+// satori/adapters/discord/src/types/presence.ts
 var StatusType2 = /* @__PURE__ */ ((StatusType3) => {
   StatusType3["ONLINE"] = "ONLINE";
   StatusType3["DND"] = "DND";
@@ -1120,7 +1132,7 @@ var ActivityFlag = /* @__PURE__ */ ((ActivityFlag2) => {
   return ActivityFlag2;
 })(ActivityFlag || {});
 
-// adapters/discord/src/types/reaction.ts
+// satori/adapters/discord/src/types/reaction.ts
 Internal.define({
   "/channels/{channel.id}/messages/{message.id}/reactions/{emoji}/@me": {
     PUT: "createReaction",
@@ -1138,7 +1150,7 @@ Internal.define({
   }
 });
 
-// adapters/discord/src/types/role.ts
+// satori/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";
@@ -1193,7 +1205,7 @@ Internal.define({
   }
 });
 
-// adapters/discord/src/types/scheduled-event.ts
+// satori/adapters/discord/src/types/scheduled-event.ts
 var GuildScheduledEvent;
 ((GuildScheduledEvent2) => {
   let PrivacyLevel;
@@ -1229,7 +1241,7 @@ Internal.define({
   }
 });
 
-// adapters/discord/src/types/stage-instance.ts
+// satori/adapters/discord/src/types/stage-instance.ts
 Internal.define({
   "/stage-instances": {
     POST: "createStageInstance"
@@ -1241,7 +1253,7 @@ Internal.define({
   }
 });
 
-// adapters/discord/src/types/sticker.ts
+// satori/adapters/discord/src/types/sticker.ts
 var Sticker3;
 ((Sticker4) => {
   let Type;
@@ -1274,14 +1286,14 @@ Internal.define({
   }
 });
 
-// adapters/discord/src/types/team.ts
+// satori/adapters/discord/src/types/team.ts
 var MembershipState = /* @__PURE__ */ ((MembershipState2) => {
   MembershipState2[MembershipState2["INVITED"] = 1] = "INVITED";
   MembershipState2[MembershipState2["ACCEPTED"] = 2] = "ACCEPTED";
   return MembershipState2;
 })(MembershipState || {});
 
-// adapters/discord/src/types/thread.ts
+// satori/adapters/discord/src/types/thread.ts
 Internal.define({
   "/guilds/{guild.id}/threads/active": {
     GET: "listActiveGuildThreads"
@@ -1318,7 +1330,7 @@ Internal.define({
   }
 });
 
-// adapters/discord/src/types/user.ts
+// satori/adapters/discord/src/types/user.ts
 var UserFlag = /* @__PURE__ */ ((UserFlag2) => {
   UserFlag2[UserFlag2["NONE"] = 0] = "NONE";
   UserFlag2[UserFlag2["DISCORD_EMPLOYEE"] = 1] = "DISCORD_EMPLOYEE";
@@ -1354,7 +1366,7 @@ Internal.define({
   }
 });
 
-// adapters/discord/src/types/voice.ts
+// satori/adapters/discord/src/types/voice.ts
 Internal.define({
   "/voice/regions": {
     GET: "listVoiceRegions"
@@ -1370,7 +1382,7 @@ Internal.define({
   }
 });
 
-// adapters/discord/src/types/webhook.ts
+// satori/adapters/discord/src/types/webhook.ts
 var Webhook2;
 ((Webhook3) => {
   let Type;
@@ -1412,7 +1424,7 @@ Internal.define({
   }
 });
 
-// adapters/discord/src/ws.ts
+// satori/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 {
@@ -1500,7 +1512,7 @@ __name(WsClient, "WsClient");
   ]);
 })(WsClient || (WsClient = {}));
 
-// adapters/discord/src/bot.ts
+// satori/adapters/discord/src/bot.ts
 var DiscordBot = class extends import_satori4.Bot {
   constructor(ctx, config) {
     super(ctx, config);
@@ -1519,19 +1531,18 @@ var DiscordBot = class extends import_satori4.Bot {
     return adaptUser(data);
   }
   async sendMessage(channelId, content, guildId) {
-    return new DiscordModulator(this, channelId, guildId).send(content);
+    return new DiscordMessenger(this, channelId, guildId).send(content);
   }
   async sendPrivateMessage(channelId, content) {
-    return new DiscordModulator(this, channelId).send(content);
+    return new DiscordMessenger(this, channelId).send(content);
   }
   async deleteMessage(channelId, messageId) {
     await this.internal.deleteMessage(channelId, messageId);
   }
   async editMessage(channelId, messageId, content) {
-    const fragment = import_satori4.segment.normalize(content);
-    content = fragment.toString();
-    const chain = fragment.children;
-    const image = chain.find((v) => v.type === "image");
+    const elements = import_satori4.segment.normalize(content);
+    content = elements.toString();
+    const image = elements.find((v) => v.type === "image");
     if (image) {
       throw new Error("You can't include embed object(s) while editing message.");
     }
@@ -1589,19 +1600,19 @@ __name(DiscordBot, "DiscordBot");
       token: import_satori4.Schema.string().description("机器人的用户令牌。").role("secret").required()
     }),
     WsClient.Config,
-    DiscordModulator.Config,
+    DiscordMessenger.Config,
     import_satori4.Quester.createConfig("https://discord.com/api/v10")
   ]);
 })(DiscordBot || (DiscordBot = {}));
 DiscordBot.prototype.platform = "discord";
 
-// adapters/discord/src/index.ts
+// satori/adapters/discord/src/index.ts
 var src_default = DiscordBot;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Discord,
   DiscordBot,
-  DiscordModulator,
+  DiscordMessenger,
   WsClient,
   adaptAuthor,
   adaptChannel,