@satorijs/adapter-discord 3.0.2 → 3.1.1

package/lib/bot.d.ts

@@ -1,4 +1,4 @@
-import { Bot, Context, Message, Quester, Schema } from '@satorijs/satori';
+import { Bot, Context, Message, Quester, Schema, segment } from '@satorijs/satori';
 import { Sender } from './sender';
 import { Internal } from './types';
 import { WsClient } from './ws';
@@ -8,11 +8,12 @@ export declare class DiscordBot<C extends Context = Context> extends Bot<C, Disc
     constructor(ctx: C, config: DiscordBot.Config);
     getSelf(): Promise<import("@satorijs/core").User>;
     private parseQuote;
-    sendMessage(channelId: string, content: string, guildId?: string): Promise<string[]>;
-    sendPrivateMessage(channelId: string, content: string): Promise<string[]>;
+    sendMessage(channelId: string, content: string | segment, guildId?: string): Promise<string[]>;
+    sendPrivateMessage(channelId: string, content: string | segment): Promise<string[]>;
     deleteMessage(channelId: string, messageId: string): Promise<void>;
-    editMessage(channelId: string, messageId: string, content: string): Promise<void>;
+    editMessage(channelId: string, messageId: string, content: string | segment): Promise<void>;
     getMessage(channelId: string, messageId: string): Promise<Message>;
+    getMessageList(channelId: string, before?: string): any;
     getUser(userId: string): Promise<import("@satorijs/core").User>;
     getGuildMemberList(guildId: string): Promise<import("@satorijs/core").User[]>;
     getChannel(channelId: string): Promise<import("@satorijs/core").Channel>;
@@ -28,7 +29,6 @@ export declare class DiscordBot<C extends Context = Context> extends Bot<C, Disc
     getGuild(guildId: string): Promise<import("@satorijs/core").Guild>;
     getGuildList(): Promise<import("@satorijs/core").Guild[]>;
     getChannelList(guildId: string): Promise<import("@satorijs/core").Channel[]>;
-    getMessageList(channelId: string, before?: string): Promise<Message[]>;
 }
 export declare namespace DiscordBot {
     interface Config extends Bot.Config, Quester.Config, Sender.Config, WsClient.Config {

package/lib/index.js

@@ -17,7 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // adapters/discord/src/index.ts
@@ -31,11 +34,10 @@ __export(src_exports, {
   adaptChannel: () => adaptChannel,
   adaptGuild: () => adaptGuild,
   adaptMessage: () => adaptMessage,
-  adaptMessageSession: () => adaptMessageSession,
   adaptSession: () => adaptSession,
   adaptUser: () => adaptUser,
   default: () => src_default,
-  prepareMessageSession: () => prepareMessageSession
+  prepareMessage: () => prepareMessage
 });
 module.exports = __toCommonJS(src_exports);
 
@@ -63,8 +65,11 @@ var adaptAuthor = /* @__PURE__ */ __name((author) => ({
   ...adaptUser(author),
   nickname: author.username
 }), "adaptAuthor");
-function adaptMessage(meta, session = {}) {
+async function adaptMessage(bot, meta, session = {}) {
   var _a, _b, _c;
+  prepareMessage(session, meta);
+  session.messageId = meta.id;
+  session.timestamp = new Date(meta.timestamp).valueOf() || Date.now();
   if (meta.author) {
     session.author = adaptAuthor(meta.author);
     session.userId = meta.author.id;
@@ -77,15 +82,15 @@ function adaptMessage(meta, session = {}) {
     session.content = meta.content.replace(/<@[!&]?(.+?)>/g, (_, id) => {
       var _a2;
       if (meta.mention_roles.includes(id)) {
-        return (0, import_satori.segment)("at", { role: id });
+        return (0, import_satori.segment)("at", { role: id }).toString();
       } else {
         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 });
+        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 })).replace(/<a:(.*):(.+?)>/g, (_, name, id) => (0, import_satori.segment)("face", { id, name, animated: true })).replace(/@everyone/g, () => (0, import_satori.segment)("at", { type: "all" })).replace(/@here/g, () => (0, import_satori.segment)("at", { type: "here" })).replace(/<#(.+?)>/g, (_, id) => {
+    }).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) => {
       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 });
+      return import_satori.segment.sharp(id, { name: channel == null ? void 0 : channel.name }).toString();
     });
   }
   if ((_c = meta.attachments) == null ? void 0 : _c.length) {
@@ -129,26 +134,20 @@ function adaptMessage(meta, session = {}) {
       session.content += (0, import_satori.segment)("video", { url: embed.video.url, proxy_url: embed.video.proxy_url });
     }
   }
-  return session;
-}
-__name(adaptMessage, "adaptMessage");
-function adaptMessageSession(meta, session = {}) {
-  adaptMessage(meta, session);
-  session.messageId = meta.id;
-  session.timestamp = new Date(meta.timestamp).valueOf() || Date.now();
+  session.elements = import_satori.segment.parse(session.content);
   if (meta.message_reference) {
     const { message_id, channel_id } = meta.message_reference;
-    session.content = (0, import_satori.segment)("quote", { id: message_id, channelId: channel_id }) + session.content;
+    session.quote = await bot.getMessage(channel_id, message_id);
   }
   return session;
 }
-__name(adaptMessageSession, "adaptMessageSession");
-function prepareMessageSession(session, data) {
+__name(adaptMessage, "adaptMessage");
+function prepareMessage(session, data) {
   session.guildId = data.guild_id;
   session.subtype = data.guild_id ? "group" : "private";
   session.channelId = data.channel_id;
 }
-__name(prepareMessageSession, "prepareMessageSession");
+__name(prepareMessage, "prepareMessage");
 function prepareReactionSession(session, data) {
   session.userId = data.user_id;
   session.messageId = data.message_id;
@@ -165,17 +164,15 @@ async function adaptSession(bot, input) {
   const session = bot.session();
   if (input.t === "MESSAGE_CREATE") {
     session.type = "message";
-    prepareMessageSession(session, input.d);
-    adaptMessageSession(input.d, session);
+    await adaptMessage(bot, input.d, session);
   } else if (input.t === "MESSAGE_UPDATE") {
     session.type = "message-updated";
-    prepareMessageSession(session, input.d);
     const msg = await bot.internal.getChannelMessage(input.d.channel_id, input.d.id);
-    adaptMessageSession(msg, session);
+    await adaptMessage(bot, msg, session);
   } else if (input.t === "MESSAGE_DELETE") {
     session.type = "message-deleted";
     session.messageId = input.d.id;
-    prepareMessageSession(session, input.d);
+    prepareMessage(session, input.d);
   } else if (input.t === "MESSAGE_REACTION_ADD") {
     session.type = "reaction-added";
     prepareReactionSession(session, input.d);
@@ -339,12 +336,12 @@ __name(Sender, "Sender");
       import_satori2.Schema.const("download").description("先下载后发送"),
       import_satori2.Schema.const("direct").description("直接发送链接"),
       import_satori2.Schema.const("auto").description("发送一个 HEAD 请求，根据返回的 Content-Type 决定发送方式")
-    ]).description("发送外链资源时采用的方式。").default("auto"),
+    ]).role("radio").description("发送外链资源时采用的方式。").default("auto"),
     handleMixedContent: import_satori2.Schema.union([
       import_satori2.Schema.const("separate").description("将每个不同形式的内容分开发送"),
       import_satori2.Schema.const("attach").description("图片前如果有文本内容，则将文本作为图片的附带信息进行发送"),
       import_satori2.Schema.const("auto").description("如果图片本身采用直接发送则与前面的文本分开，否则将文本作为图片的附带信息发送")
-    ]).description("发送图文等混合内容时采用的方式。").default("auto")
+    ]).role("radio").description("发送图文等混合内容时采用的方式。").default("auto")
   }).description("发送设置");
 })(Sender || (Sender = {}));
 
@@ -1377,7 +1374,7 @@ __name(WsClient, "WsClient");
 ((WsClient2) => {
   WsClient2.Config = import_satori3.Schema.intersect([
     import_satori3.Schema.object({
-      gateway: import_satori3.Schema.string().role("url").default("wss://gateway.discord.gg/?v=8&encoding=json").description("要连接的 WebSocket 网关。"),
+      gateway: import_satori3.Schema.string().default("wss://gateway.discord.gg/?v=8&encoding=json").description("要连接的 WebSocket 网关。"),
       intents: import_satori3.Schema.bitset(GatewayIntent).description("需要订阅的机器人事件。").default(0 | 512 /* GUILD_MESSAGES */ | 1024 /* GUILD_MESSAGE_REACTIONS */ | 4096 /* DIRECT_MESSAGES */ | 8192 /* DIRECT_MESSAGE_REACTIONS */)
     }).description("推送设置"),
     import_satori3.Adapter.WsClient.Config
@@ -1405,13 +1402,17 @@ var DiscordBot = class extends import_satori4.Bot {
   parseQuote(chain) {
     if (chain[0].type !== "quote")
       return;
-    return chain.shift().data.id;
+    return chain.shift().attrs.id;
   }
   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"
@@ -1440,7 +1441,9 @@ var DiscordBot = class extends import_satori4.Bot {
     await this.internal.deleteMessage(channelId, messageId);
   }
   async editMessage(channelId, messageId, content) {
-    const chain = import_satori4.segment.parse(content);
+    const fragment = import_satori4.segment.normalize(content);
+    content = fragment.toString();
+    const chain = fragment.children;
     const image = chain.find((v) => v.type === "image");
     if (image) {
       throw new Error("You can't include embed object(s) while editing message.");
@@ -1450,14 +1453,12 @@ var DiscordBot = class extends import_satori4.Bot {
     });
   }
   async getMessage(channelId, messageId) {
-    const original = await this.internal.getChannelMessage(channelId, messageId);
-    const result = adaptMessage(original);
-    const reference = original.message_reference;
-    if (reference) {
-      const quoteMsg = await this.internal.getChannelMessage(reference.channel_id, reference.message_id);
-      result.quote = adaptMessage(quoteMsg);
-    }
-    return result;
+    const data = await this.internal.getChannelMessage(channelId, messageId);
+    return await adaptMessage(this, data);
+  }
+  async getMessageList(channelId, before) {
+    const data = (await this.internal.getChannelMessages(channelId, { before, limit: 50 })).reverse();
+    return await Promise.all(data.map((data2) => adaptMessage(this, data2)));
   }
   async getUser(userId) {
     const data = await this.internal.getUser(userId);
@@ -1493,18 +1494,6 @@ var DiscordBot = class extends import_satori4.Bot {
     const data = await this.internal.getGuildChannels(guildId);
     return data.map((v) => adaptChannel(v));
   }
-  async getMessageList(channelId, before) {
-    const data = (await this.internal.getChannelMessages(channelId, {
-      before,
-      limit: 50
-    })).reverse();
-    return data.map((v) => {
-      const session = {};
-      prepareMessageSession(session, v);
-      adaptMessageSession(v, session);
-      return session;
-    });
-  }
 };
 __name(DiscordBot, "DiscordBot");
 ((DiscordBot2) => {
@@ -1514,12 +1503,7 @@ __name(DiscordBot, "DiscordBot");
     }),
     WsClient.Config,
     Sender.Config,
-    import_satori4.Schema.object({
-      endpoint: import_satori4.Schema.string().role("url").description("要连接的服务器地址。").default("https://discord.com/api/v8"),
-      proxyAgent: import_satori4.Schema.string().role("url").description("使用的代理服务器地址。"),
-      headers: import_satori4.Schema.dict(String).description("要附加的额外请求头。"),
-      timeout: import_satori4.Schema.natural().role("ms").description("等待连接建立的最长时间。")
-    }).description("请求设置")
+    import_satori4.Quester.createConfig("https://discord.com/api/v8")
   ]);
 })(DiscordBot || (DiscordBot = {}));
 DiscordBot.prototype.platform = "discord";
@@ -1536,9 +1520,8 @@ var src_default = DiscordBot;
   adaptChannel,
   adaptGuild,
   adaptMessage,
-  adaptMessageSession,
   adaptSession,
   adaptUser,
-  prepareMessageSession
+  prepareMessage
 });
 //# sourceMappingURL=index.js.map