@satorijs/adapter-discord 3.3.1 → 3.3.3

package/lib/index.js

@@ -23,7 +23,7 @@ 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,
@@ -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,7 +88,12 @@ 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();
@@ -202,7 +208,7 @@ async function adaptSession(bot, input) {
 }
 __name(adaptSession, "adaptSession");
 
-// adapters/discord/src/message.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"));
@@ -326,8 +332,12 @@ var DiscordMessenger = class extends import_satori2.Messenger {
       }
     } 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;
@@ -371,7 +381,8 @@ var DiscordMessenger = class extends import_satori2.Messenger {
         this.buffer += "\n";
       } else {
         await this.flush();
-        await this.render(children, true);
+        await this.render(children);
+        await this.flush();
       }
     } else {
       await this.render(children);
@@ -394,7 +405,7 @@ __name(DiscordMessenger, "DiscordMessenger");
   }).description("发送设置");
 })(DiscordMessenger || (DiscordMessenger = {}));
 
-// adapters/discord/src/types/index.ts
+// satori/adapters/discord/src/types/index.ts
 var types_exports = {};
 __export(types_exports, {
   ActivityFlag: () => ActivityFlag,
@@ -431,7 +442,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) {
@@ -471,7 +482,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";
@@ -490,7 +501,7 @@ Internal.define({
   }
 });
 
-// adapters/discord/src/types/audit-log.ts
+// satori/adapters/discord/src/types/audit-log.ts
 var AuditLog;
 ((AuditLog2) => {
   let Type;
@@ -557,7 +568,7 @@ Internal.define({
   }
 });
 
-// adapters/discord/src/types/auto-moderation.ts
+// satori/adapters/discord/src/types/auto-moderation.ts
 var AutoModerationRule;
 ((AutoModerationRule2) => {
   let EventType;
@@ -599,7 +610,7 @@ Internal.define({
   }
 });
 
-// adapters/discord/src/types/ban.ts
+// satori/adapters/discord/src/types/ban.ts
 Internal.define({
   "/guilds/{guild.id}/bans": {
     GET: "getGuildBans"
@@ -611,7 +622,7 @@ Internal.define({
   }
 });
 
-// adapters/discord/src/types/channel.ts
+// satori/adapters/discord/src/types/channel.ts
 var Channel2;
 ((Channel10) => {
   let Type;
@@ -671,7 +682,7 @@ Internal.define({
   }
 });
 
-// adapters/discord/src/types/command.ts
+// satori/adapters/discord/src/types/command.ts
 var ApplicationCommand;
 ((ApplicationCommand3) => {
   let Type;
@@ -730,7 +741,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";
@@ -744,7 +755,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";
@@ -752,7 +763,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",
@@ -765,7 +776,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";
@@ -811,7 +822,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",
@@ -838,7 +849,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",
@@ -855,7 +866,7 @@ Internal.define({
   }
 });
 
-// adapters/discord/src/types/guild.ts
+// satori/adapters/discord/src/types/guild.ts
 var Guild3;
 ((Guild6) => {
   let Params;
@@ -940,7 +951,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";
@@ -955,7 +966,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";
@@ -995,7 +1006,7 @@ Internal.define({
   }
 });
 
-// adapters/discord/src/types/invite.ts
+// satori/adapters/discord/src/types/invite.ts
 var Invite;
 ((Invite2) => {
   let TargetType;
@@ -1021,7 +1032,7 @@ Internal.define({
   }
 });
 
-// adapters/discord/src/types/message.ts
+// satori/adapters/discord/src/types/message.ts
 var Message2;
 ((Message4) => {
   let Type;
@@ -1094,7 +1105,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";
@@ -1122,7 +1133,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",
@@ -1140,7 +1151,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";
@@ -1195,7 +1206,7 @@ Internal.define({
   }
 });
 
-// adapters/discord/src/types/scheduled-event.ts
+// satori/adapters/discord/src/types/scheduled-event.ts
 var GuildScheduledEvent;
 ((GuildScheduledEvent2) => {
   let PrivacyLevel;
@@ -1231,7 +1242,7 @@ Internal.define({
   }
 });
 
-// adapters/discord/src/types/stage-instance.ts
+// satori/adapters/discord/src/types/stage-instance.ts
 Internal.define({
   "/stage-instances": {
     POST: "createStageInstance"
@@ -1243,7 +1254,7 @@ Internal.define({
   }
 });
 
-// adapters/discord/src/types/sticker.ts
+// satori/adapters/discord/src/types/sticker.ts
 var Sticker3;
 ((Sticker4) => {
   let Type;
@@ -1276,14 +1287,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"
@@ -1320,7 +1331,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";
@@ -1356,7 +1367,7 @@ Internal.define({
   }
 });
 
-// adapters/discord/src/types/voice.ts
+// satori/adapters/discord/src/types/voice.ts
 Internal.define({
   "/voice/regions": {
     GET: "listVoiceRegions"
@@ -1372,7 +1383,7 @@ Internal.define({
   }
 });
 
-// adapters/discord/src/types/webhook.ts
+// satori/adapters/discord/src/types/webhook.ts
 var Webhook2;
 ((Webhook3) => {
   let Type;
@@ -1414,7 +1425,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 {
@@ -1502,7 +1513,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);
@@ -1596,7 +1607,7 @@ __name(DiscordBot, "DiscordBot");
 })(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 = {