@satorijs/adapter-discord 3.2.5 → 3.2.6

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,
@@ -200,7 +200,7 @@ async function adaptSession(bot, input) {
 }
 __name(adaptSession, "adaptSession");
 
-// adapters/discord/src/sender.ts
+// satori/adapters/discord/src/sender.ts
 var import_satori2 = require("@satorijs/satori");
 var import_file_type = require("file-type");
 var import_form_data = __toESM(require("form-data"));
@@ -219,6 +219,8 @@ var Sender = class {
     this.errors = [];
     this.buffer = "";
     this.addition = {};
+    this.figure = null;
+    this.mode = "default";
   }
   async post(data, headers) {
     try {
@@ -231,7 +233,7 @@ var Sender = class {
   async sendEmbed(fileBuffer, payload_json, filename) {
     const fd = new import_form_data.default();
     filename || (filename = "file." + (await (0, import_file_type.fromBuffer)(fileBuffer)).ext);
-    fd.append("file", fileBuffer, filename);
+    fd.append("file", Buffer.from(fileBuffer), filename);
     fd.append("payload_json", JSON.stringify(payload_json));
     return this.post(fd, fd.getHeaders());
   }
@@ -286,9 +288,13 @@ var Sender = class {
     this.addition = {};
   }
   async render(elements) {
-    for (const { type, attrs, children } of 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}>`;
@@ -302,11 +308,15 @@ var Sender = class {
       } else if (type === "face" && attrs.name && attrs.id) {
         this.buffer += `<:${attrs.name}:${attrs.id}>`;
       } else if ((type === "image" || type === "video") && attrs.url) {
-        await this.sendAsset(type, attrs, {
-          ...this.addition,
-          content: this.buffer.trim()
-        });
-        this.buffer = "";
+        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({
@@ -319,19 +329,34 @@ var Sender = class {
           content: this.buffer.trim()
         });
         this.buffer = "";
+      } else if (type === "figure") {
+        await this.sendBuffer();
+        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") {
-        await this.sendBuffer();
-        if ("quote" in attrs) {
-          this.addition.message_reference = {
-            message_id: attrs.id
-          };
+        if (this.mode === "figure") {
+          await this.render(children);
+          this.buffer += "\n";
         } else {
-          await this.sendMessage(children);
+          await this.sendBuffer();
+          if ("quote" in attrs) {
+            this.addition.message_reference = {
+              message_id: attrs.id
+            };
+          } else {
+            await this.sendMessage(children);
+          }
         }
       } else {
         await this.render(children);
@@ -366,7 +391,7 @@ __name(Sender, "Sender");
   }).description("发送设置");
 })(Sender || (Sender = {}));
 
-// adapters/discord/src/types/index.ts
+// satori/adapters/discord/src/types/index.ts
 var types_exports = {};
 __export(types_exports, {
   ActivityFlag: () => ActivityFlag,
@@ -403,7 +428,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) {
@@ -443,7 +468,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";
@@ -462,7 +487,7 @@ Internal.define({
   }
 });
 
-// adapters/discord/src/types/audit-log.ts
+// satori/adapters/discord/src/types/audit-log.ts
 var AuditLog;
 ((AuditLog2) => {
   let Type;
@@ -529,7 +554,7 @@ Internal.define({
   }
 });
 
-// adapters/discord/src/types/auto-moderation.ts
+// satori/adapters/discord/src/types/auto-moderation.ts
 var AutoModerationRule;
 ((AutoModerationRule2) => {
   let EventType;
@@ -571,7 +596,7 @@ Internal.define({
   }
 });
 
-// adapters/discord/src/types/ban.ts
+// satori/adapters/discord/src/types/ban.ts
 Internal.define({
   "/guilds/{guild.id}/bans": {
     GET: "getGuildBans"
@@ -583,7 +608,7 @@ Internal.define({
   }
 });
 
-// adapters/discord/src/types/channel.ts
+// satori/adapters/discord/src/types/channel.ts
 var Channel3;
 ((Channel11) => {
   let Type;
@@ -643,7 +668,7 @@ Internal.define({
   }
 });
 
-// adapters/discord/src/types/command.ts
+// satori/adapters/discord/src/types/command.ts
 var ApplicationCommand;
 ((ApplicationCommand3) => {
   let Type;
@@ -702,7 +727,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";
@@ -716,7 +741,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";
@@ -724,7 +749,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",
@@ -737,7 +762,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";
@@ -783,7 +808,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",
@@ -810,7 +835,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",
@@ -827,7 +852,7 @@ Internal.define({
   }
 });
 
-// adapters/discord/src/types/guild.ts
+// satori/adapters/discord/src/types/guild.ts
 var Guild4;
 ((Guild7) => {
   let Params;
@@ -912,7 +937,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";
@@ -927,7 +952,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";
@@ -967,7 +992,7 @@ Internal.define({
   }
 });
 
-// adapters/discord/src/types/invite.ts
+// satori/adapters/discord/src/types/invite.ts
 var Invite;
 ((Invite2) => {
   let TargetType;
@@ -993,7 +1018,7 @@ Internal.define({
   }
 });
 
-// adapters/discord/src/types/message.ts
+// satori/adapters/discord/src/types/message.ts
 var Message3;
 ((Message6) => {
   let Type;
@@ -1066,7 +1091,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";
@@ -1094,7 +1119,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",
@@ -1112,7 +1137,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";
@@ -1167,7 +1192,7 @@ Internal.define({
   }
 });
 
-// adapters/discord/src/types/scheduled-event.ts
+// satori/adapters/discord/src/types/scheduled-event.ts
 var GuildScheduledEvent;
 ((GuildScheduledEvent2) => {
   let PrivacyLevel;
@@ -1203,7 +1228,7 @@ Internal.define({
   }
 });
 
-// adapters/discord/src/types/stage-instance.ts
+// satori/adapters/discord/src/types/stage-instance.ts
 Internal.define({
   "/stage-instances": {
     POST: "createStageInstance"
@@ -1215,7 +1240,7 @@ Internal.define({
   }
 });
 
-// adapters/discord/src/types/sticker.ts
+// satori/adapters/discord/src/types/sticker.ts
 var Sticker3;
 ((Sticker4) => {
   let Type;
@@ -1248,14 +1273,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"
@@ -1292,7 +1317,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";
@@ -1328,7 +1353,7 @@ Internal.define({
   }
 });
 
-// adapters/discord/src/types/voice.ts
+// satori/adapters/discord/src/types/voice.ts
 Internal.define({
   "/voice/regions": {
     GET: "listVoiceRegions"
@@ -1344,7 +1369,7 @@ Internal.define({
   }
 });
 
-// adapters/discord/src/types/webhook.ts
+// satori/adapters/discord/src/types/webhook.ts
 var Webhook2;
 ((Webhook3) => {
   let Type;
@@ -1386,7 +1411,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 {
@@ -1474,7 +1499,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);
@@ -1591,7 +1616,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 = {