@satorijs/adapter-discord 3.3.0 → 3.3.1

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

@@ -28,7 +28,7 @@ var src_exports = {};
 __export(src_exports, {
   Discord: () => types_exports,
   DiscordBot: () => DiscordBot,
-  DiscordModulator: () => DiscordModulator,
+  DiscordMessenger: () => DiscordMessenger,
   WsClient: () => WsClient,
   adaptAuthor: () => adaptAuthor,
   adaptChannel: () => adaptChannel,
@@ -94,7 +94,9 @@ async function adaptMessage(bot, meta, session = {}) {
     });
   }
   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 +202,11 @@ async function adaptSession(bot, input) {
 }
 __name(adaptSession, "adaptSession");
 
-// adapters/discord/src/modulator.ts
+// 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 = "";
@@ -376,9 +378,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,7 +392,7 @@ __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
 var types_exports = {};
@@ -1519,19 +1521,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,7 +1590,7 @@ __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 = {}));
@@ -1601,7 +1602,7 @@ var src_default = DiscordBot;
 0 && (module.exports = {
   Discord,
   DiscordBot,
-  DiscordModulator,
+  DiscordMessenger,
   WsClient,
   adaptAuthor,
   adaptChannel,