@satorijs/adapter-discord 4.0.1 → 4.0.2

package/lib/bot.d.ts

@@ -1,4 +1,4 @@
-import { Bot, Context, Fragment, Quester, Schema, SendOptions, Universal } from '@satorijs/satori';
+import { Bot, Context, Fragment, Quester, Schema, Universal } from '@satorijs/satori';
 import * as Discord from './utils';
 import { DiscordMessageEncoder } from './message';
 import { Internal, Webhook } from './types';
@@ -11,10 +11,9 @@ export declare class DiscordBot extends Bot<DiscordBot.Config> {
     webhookLock: Record<string, Promise<Webhook>>;
     commands: Universal.Command[];
     constructor(ctx: Context, config: DiscordBot.Config);
-    session(payload?: any, input?: any): import("@satorijs/core").Session;
     private _ensureWebhook;
     ensureWebhook(channelId: string): Promise<Discord.Webhook>;
-    getSelf(): Promise<Universal.User>;
+    getLogin(): Promise<Universal.Login>;
     deleteMessage(channelId: string, messageId: string): Promise<void>;
     editMessage(channelId: string, messageId: string, content: Fragment): Promise<void>;
     getMessage(channelId: string, messageId: string): Promise<Universal.Message>;
@@ -50,14 +49,14 @@ export declare class DiscordBot extends Bot<DiscordBot.Config> {
     getGuildRoleList(guildId: string): Promise<{
         data: Universal.GuildRole[];
     }>;
-    createGuildRole(guildId: string, data: Partial<Universal.GuildRole>): Promise<string>;
-    modifyGuildRole(guildId: string, roleId: string, data: Partial<Universal.GuildRole>): Promise<void>;
+    createGuildRole(guildId: string, data: Partial<Universal.GuildRole>): Promise<Universal.GuildRole>;
+    updateGuildRole(guildId: string, roleId: string, data: Partial<Universal.GuildRole>): Promise<void>;
     deleteGuildRole(guildId: string, roleId: string): Promise<void>;
-    sendPrivateMessage(userId: string, content: Fragment, options?: SendOptions): Promise<string[]>;
+    createDirectChannel(userId: string): Promise<Universal.Channel>;
     updateCommands(commands: Universal.Command[]): Promise<void>;
 }
 export declare namespace DiscordBot {
-    interface Config extends Bot.Config, Quester.Config, DiscordMessageEncoder.Config, WsClient.Config {
+    interface Config extends Quester.Config, DiscordMessageEncoder.Config, WsClient.Config {
         token: string;
         slash?: boolean;
     }

package/lib/index.js

@@ -84,7 +84,6 @@ __export(utils_exports, {
   VisibilityType: () => VisibilityType,
   Webhook: () => Webhook2,
   adaptSession: () => adaptSession,
-  decodeAuthor: () => decodeAuthor,
   decodeChannel: () => decodeChannel,
   decodeGuild: () => decodeGuild,
   decodeGuildMember: () => decodeGuildMember,
@@ -1193,17 +1192,16 @@ var decodeUser = /* @__PURE__ */ __name((user) => ({
   id: user.id,
   name: user.username,
   userId: user.id,
-  avatar: `https://cdn.discordapp.com/avatars/${user.id}/${user.avatar}.png`,
+  avatar: user.avatar && `https://cdn.discordapp.com/avatars/${user.id}/${user.avatar}.png`,
   username: user.username,
   discriminator: user.discriminator,
   isBot: user.bot || false
 }), "decodeUser");
 var decodeGuildMember = /* @__PURE__ */ __name((member) => ({
-  ...decodeUser(member.user),
-  user: decodeUser(member.user),
-  nickname: member.nick,
+  user: member.user && decodeUser(member.user),
+  name: member.nick,
   roles: member.roles,
-  avatar: member.user.avatar
+  joinedAt: member.joined_at && new Date(member.joined_at).valueOf()
 }), "decodeGuildMember");
 var decodeGuild = /* @__PURE__ */ __name((data) => ({
   id: data.id,
@@ -1211,12 +1209,9 @@ var decodeGuild = /* @__PURE__ */ __name((data) => ({
 }), "decodeGuild");
 var decodeChannel = /* @__PURE__ */ __name((data) => ({
   id: data.id,
-  name: data.name
+  name: data.name,
+  type: data.type === Channel2.Type.DM ? import_satori2.Universal.Channel.Type.DIRECT : import_satori2.Universal.Channel.Type.TEXT
 }), "decodeChannel");
-var decodeAuthor = /* @__PURE__ */ __name((author) => ({
-  ...decodeUser(author),
-  nickname: author.username
-}), "decodeAuthor");
 var decodeRole = /* @__PURE__ */ __name((role) => ({
   ...role,
   permissions: BigInt(role.permissions)
@@ -1225,27 +1220,18 @@ var encodeRole = /* @__PURE__ */ __name((role) => ({
   ...role,
   permissions: role.permissions && "" + role.permissions
 }), "encodeRole");
-async function decodeMessage(bot, meta, session = {}, reference = true) {
-  var _a, _b, _c;
+async function decodeMessage(bot, data, message, payload = message, details = true) {
+  var _a;
   const { platform } = bot;
-  session.messageId = meta.id;
-  session.channelId = meta.channel_id;
-  session.timestamp = new Date(meta.timestamp).valueOf() || Date.now();
-  if (meta.author) {
-    session.author = decodeAuthor(meta.author);
-    session.userId = meta.author.id;
-  }
-  if ((_a = meta.member) == null ? void 0 : _a.nick) {
-    session.author.nickname = (_b = meta.member) == null ? void 0 : _b.nick;
-  }
-  session.content = "";
-  if (meta.content) {
-    session.content = meta.content.replace(/<@[!&]?(.+?)>/g, (_, id) => {
+  message.id = message.messageId = data.id;
+  message.content = "";
+  if (data.content) {
+    message.content = data.content.replace(/<@[!&]?(.+?)>/g, (_, id) => {
       var _a2;
-      if (meta.mention_roles.includes(id)) {
+      if (data.mention_roles.includes(id)) {
         return (0, import_satori2.h)("at", { role: id }).toString();
       } else {
-        const user = (_a2 = meta.mentions) == null ? void 0 : _a2.find((u) => u.id === id || `${u.username}#${u.discriminator}` === id);
+        const user = (_a2 = data.mentions) == null ? void 0 : _a2.find((u) => u.id === id || `${u.username}#${u.discriminator}` === id);
         return import_satori2.h.at(id, { name: user == null ? void 0 : user.username }).toString();
       }
     }).replace(/<a?:(.*):(.+?)>/g, (_, name, id) => {
@@ -1255,28 +1241,28 @@ async function decodeMessage(bot, meta, session = {}, reference = true) {
       ]).toString();
     }).replace(/@everyone/g, () => (0, import_satori2.h)("at", { type: "all" }).toString()).replace(/@here/g, () => (0, import_satori2.h)("at", { type: "here" }).toString()).replace(/<#(.+?)>/g, (_, id) => {
       var _a2;
-      const channel = (_a2 = meta.mention_channels) == null ? void 0 : _a2.find((c) => c.id === id);
+      const channel = (_a2 = data.mention_channels) == null ? void 0 : _a2.find((c) => c.id === id);
       return import_satori2.h.sharp(id, { name: channel == null ? void 0 : channel.name }).toString();
     });
   }
-  if ((_c = meta.attachments) == null ? void 0 : _c.length) {
-    if (session.content)
-      session.content += " ";
-    session.content += meta.attachments.map((v) => {
-      var _a2, _b2, _c2;
+  if ((_a = data.attachments) == null ? void 0 : _a.length) {
+    if (message.content)
+      message.content += " ";
+    message.content += data.attachments.map((v) => {
+      var _a2, _b, _c;
       if (v.height && v.width && ((_a2 = v.content_type) == null ? void 0 : _a2.startsWith("image/"))) {
         return (0, import_satori2.h)("image", {
           url: v.url,
           proxy_url: v.proxy_url,
           file: v.filename
         });
-      } else if (v.height && v.width && ((_b2 = v.content_type) == null ? void 0 : _b2.startsWith("video/"))) {
+      } else if (v.height && v.width && ((_b = v.content_type) == null ? void 0 : _b.startsWith("video/"))) {
         return (0, import_satori2.h)("video", {
           url: v.url,
           proxy_url: v.proxy_url,
           file: v.filename
         });
-      } else if ((_c2 = v.content_type) == null ? void 0 : _c2.startsWith("audio/")) {
+      } else if ((_c = v.content_type) == null ? void 0 : _c.startsWith("audio/")) {
         return (0, import_satori2.h)("record", {
           url: v.url,
           proxy_url: v.proxy_url,
@@ -1291,23 +1277,32 @@ async function decodeMessage(bot, meta, session = {}, reference = true) {
       }
     }).join("");
   }
-  for (const embed of meta.embeds) {
+  for (const embed of data.embeds) {
     if (embed.image) {
-      session.content += (0, import_satori2.h)("image", { url: embed.image.url, proxy_url: embed.image.proxy_url });
+      message.content += (0, import_satori2.h)("image", { url: embed.image.url, proxy_url: embed.image.proxy_url });
     }
     if (embed.thumbnail) {
-      session.content += (0, import_satori2.h)("image", { url: embed.thumbnail.url, proxy_url: embed.thumbnail.proxy_url });
+      message.content += (0, import_satori2.h)("image", { url: embed.thumbnail.url, proxy_url: embed.thumbnail.proxy_url });
     }
     if (embed.video) {
-      session.content += (0, import_satori2.h)("video", { url: embed.video.url, proxy_url: embed.video.proxy_url });
+      message.content += (0, import_satori2.h)("video", { url: embed.video.url, proxy_url: embed.video.proxy_url });
     }
   }
-  session.elements = import_satori2.h.parse(session.content);
-  if (reference && meta.message_reference) {
-    const { message_id, channel_id } = meta.message_reference;
-    session.quote = await bot.getMessage(channel_id, message_id);
-  }
-  return session;
+  message.elements = import_satori2.h.parse(message.content);
+  if (details && data.message_reference) {
+    const { message_id, channel_id } = data.message_reference;
+    message.quote = await bot.getMessage(channel_id, message_id);
+  }
+  if (!payload)
+    return message;
+  payload.channel = {
+    id: data.channel_id,
+    type: data.member ? import_satori2.Universal.Channel.Type.TEXT : import_satori2.Universal.Channel.Type.DIRECT
+  };
+  payload.user = decodeUser(data.author);
+  payload.member = data.member && decodeGuildMember(data.member);
+  payload.timestamp = new Date(data.timestamp).valueOf() || Date.now();
+  return message;
 }
 __name(decodeMessage, "decodeMessage");
 function setupMessageGuildId(session, guildId) {
@@ -1330,7 +1325,8 @@ function setupReaction(session, data) {
 }
 __name(setupReaction, "setupReaction");
 async function adaptSession(bot, input) {
-  const session = bot.session({}, input);
+  const session = bot.session();
+  session.setInternal("discord", input);
   if (input.t === "MESSAGE_CREATE") {
     setupMessageGuildId(session, input.d.guild_id);
     if (input.d.webhook_id && !session.isDirect) {
@@ -1342,11 +1338,11 @@ async function adaptSession(bot, input) {
       }
     }
     session.type = "message";
-    await decodeMessage(bot, input.d, session);
+    await decodeMessage(bot, input.d, session.event.message = {}, session.event);
   } else if (input.t === "MESSAGE_UPDATE") {
     session.type = "message-updated";
     const message = await bot.internal.getChannelMessage(input.d.channel_id, input.d.id);
-    await decodeMessage(bot, message, session);
+    await decodeMessage(bot, message, session.event.message = {}, session.event);
     const channel = await bot.internal.getChannel(input.d.channel_id);
     setupMessageGuildId(session, channel.guild_id);
   } else if (input.t === "MESSAGE_DELETE") {
@@ -1373,12 +1369,12 @@ async function adaptSession(bot, input) {
     session.type = "guild-role-added";
     session.guildId = input.d.guild_id;
     session.roleId = input.d.role.id;
-    session.data.role = decodeRole(input.d.role);
+    session.event.role = decodeRole(input.d.role);
   } else if (input.t === "GUILD_ROLE_UPDATE") {
     session.type = "guild-role-updated";
     session.guildId = input.d.guild_id;
     session.roleId = input.d.role.id;
-    session.data.role = decodeRole(input.d.role);
+    session.event.role = decodeRole(input.d.role);
   } else if (input.t === "GUILD_ROLE_DELETE") {
     session.type = "guild-role-added";
     session.guildId = input.d.guild_id;
@@ -1399,7 +1395,7 @@ async function adaptSession(bot, input) {
     session.userId = session.isDirect ? input.d.user.id : input.d.member.user.id;
     session.messageId = input.d.id;
     session.content = "";
-    session.data.argv = decodeArgv(data, command);
+    session.event.argv = decodeArgv(data, command);
   } else if (input.t === "CHANNEL_UPDATE") {
     session.type = "channel-updated";
     session.guildId = input.d.guild_id;
@@ -1517,14 +1513,14 @@ var _DiscordMessageEncoder = class _DiscordMessageEncoder extends import_satori3
     if ((input == null ? void 0 : input.t) === "INTERACTION_CREATE") {
       return `/webhooks/${input.d.application_id}/${input.d.token}`;
     } else if (this.stack[0].type === "forward" && ((_c = this.stack[0].channel) == null ? void 0 : _c.id)) {
-      if (this.stack[1].author.nickname || this.stack[1].author.avatar) {
+      if (this.stack[1].author.name || this.stack[1].author.avatar) {
         const webhook = await this.ensureWebhook();
         return `/webhooks/${webhook.id}/${webhook.token}?wait=true&thread_id=${(_d = this.stack[0].channel) == null ? void 0 : _d.id}`;
       } else {
         return `/channels/${this.stack[0].channel.id}/messages`;
       }
     } else {
-      if (this.stack[0].author.nickname || this.stack[0].author.avatar || this.stack[0].type === "forward" && !this.stack[0].threadCreated) {
+      if (this.stack[0].author.name || this.stack[0].author.avatar || this.stack[0].type === "forward" && !this.stack[0].threadCreated) {
         const webhook = await this.ensureWebhook();
         return `/webhooks/${webhook.id}/${webhook.token}?wait=true`;
       } else {
@@ -1538,9 +1534,13 @@ var _DiscordMessageEncoder = class _DiscordMessageEncoder extends import_satori3
       const url = await this.getUrl();
       const result = await this.bot.http.post(url, data, { headers });
       const session = this.bot.session();
-      const message = await decodeMessage(this.bot, result, session);
+      const message = await decodeMessage(this.bot, result, session.event.message = {}, session.event);
       session.app.emit(session, "send", session);
-      this.results.push(session);
+      this.results.push(session.event.message);
+      Object.defineProperty(session.event.message, "channel", {
+        configurable: true,
+        get: () => session.event.channel
+      });
       if (this.stack[0].type === "forward" && !this.stack[0].threadCreated) {
         this.stack[0].threadCreated = true;
         const thread = await this.bot.internal.startThreadFromMessage(this.channelId, result.id, {
@@ -1741,7 +1741,7 @@ var _DiscordMessageEncoder = class _DiscordMessageEncoder extends import_satori3
       await this.flush();
       const parse = /* @__PURE__ */ __name((val) => val.replace(/\\([\\*_`~|()\[\]])/g, "$1"), "parse");
       const message = this.stack[this.stack[0].type === "forward" ? 1 : 0];
-      if (!message.author.avatar && !message.author.nickname && this.stack[0].type !== "forward") {
+      if (!message.author.avatar && !message.author.name && this.stack[0].type !== "forward") {
         await this.flush();
         this.addition.message_reference = {
           message_id: attrs.id
@@ -1749,18 +1749,18 @@ var _DiscordMessageEncoder = class _DiscordMessageEncoder extends import_satori3
       } else {
         let replyId = attrs.id, channelId = this.channelId;
         if (this.stack[0].type === "forward" && ((_a = this.stack[0].fakeMessageMap[attrs.id]) == null ? void 0 : _a.length) >= 1) {
-          replyId = this.stack[0].fakeMessageMap[attrs.id][0].messageId;
-          channelId = this.stack[0].fakeMessageMap[attrs.id][0].channelId;
+          replyId = this.stack[0].fakeMessageMap[attrs.id][0].id;
+          channelId = this.stack[0].fakeMessageMap[attrs.id][0].channel.id;
         }
-        const quoted = await this.bot.getMessage(channelId, replyId);
+        const quote = await this.bot.getMessage(channelId, replyId);
         this.addition.embeds = [{
           description: [
-            sanitize(parse(quoted.elements.filter((v) => v.type === "text").join("")).slice(0, 30)),
-            `<t:${Math.ceil(quoted.timestamp / 1e3)}:R> [[ ↑ ]](https://discord.com/channels/${this.guildId}/${channelId}/${replyId})`
+            sanitize(parse(quote.elements.filter((v) => v.type === "text").join("")).slice(0, 30)),
+            `<t:${Math.ceil(quote.timestamp / 1e3)}:R> [[ ↑ ]](https://discord.com/channels/${this.guildId}/${channelId}/${replyId})`
           ].join("\n\n"),
           author: {
-            name: quoted.author.nickname || quoted.author.username,
-            icon_url: quoted.author.avatar
+            name: quote.user.name,
+            icon_url: quote.user.avatar
           }
         }];
       }
@@ -1843,13 +1843,13 @@ var _WsClient = class _WsClient extends import_satori4.Adapter.WsClient {
   }
   heartbeat() {
     logger2.debug(`heartbeat d ${this._d}`);
-    this.bot.socket.send(JSON.stringify({
+    this.socket.send(JSON.stringify({
       op: Gateway.Opcode.HEARTBEAT,
       d: this._d
     }));
   }
   accept() {
-    this.bot.socket.addEventListener("message", async ({ data }) => {
+    this.socket.addEventListener("message", async ({ data }) => {
       var _a, _b;
       let parsed;
       try {
@@ -1865,7 +1865,7 @@ var _WsClient = class _WsClient extends import_satori4.Adapter.WsClient {
         this._ping = setInterval(() => this.heartbeat(), parsed.d.heartbeat_interval);
         if (this._sessionId) {
           logger2.debug("resuming");
-          this.bot.socket.send(JSON.stringify({
+          this.socket.send(JSON.stringify({
             op: Gateway.Opcode.RESUME,
             d: {
               token: this.bot.config.token,
@@ -1874,7 +1874,7 @@ var _WsClient = class _WsClient extends import_satori4.Adapter.WsClient {
             }
           }));
         } else {
-          this.bot.socket.send(JSON.stringify({
+          this.socket.send(JSON.stringify({
             op: Gateway.Opcode.IDENTIFY,
             d: {
               token: this.bot.config.token,
@@ -1890,15 +1890,18 @@ var _WsClient = class _WsClient extends import_satori4.Adapter.WsClient {
           return;
         this._sessionId = "";
         logger2.warn("offline: invalid session");
-        (_a = this.bot.socket) == null ? void 0 : _a.close();
+        (_a = this.socket) == null ? void 0 : _a.close();
       }
       if (parsed.op === Gateway.Opcode.DISPATCH) {
-        this.bot.ctx.emit("discord/" + parsed.t.toLowerCase().replace(/_/g, "-"), parsed);
+        this.bot.dispatch(this.bot.session({
+          type: "internal",
+          _type: "discord/" + parsed.t.toLowerCase().replace(/_/g, "-"),
+          _data: parsed
+        }));
         if (parsed.t === "READY") {
           this._sessionId = parsed.d.session_id;
           this._resumeUrl = parsed.d.resume_gateway_url;
-          const user = decodeUser(parsed.d.user);
-          Object.assign(this.bot, user);
+          this.bot.user = decodeUser(parsed.d.user);
           logger2.debug("session_id " + this._sessionId);
           return this.bot.online();
         }
@@ -1911,10 +1914,10 @@ var _WsClient = class _WsClient extends import_satori4.Adapter.WsClient {
       }
       if (parsed.op === Gateway.Opcode.RECONNECT) {
         logger2.warn("offline: discord request reconnect");
-        (_b = this.bot.socket) == null ? void 0 : _b.close();
+        (_b = this.socket) == null ? void 0 : _b.close();
       }
     });
-    this.bot.socket.addEventListener("close", () => {
+    this.socket.addEventListener("close", () => {
       clearInterval(this._ping);
     });
   }
@@ -1926,7 +1929,7 @@ var WsClient = _WsClient;
     import_satori4.Schema.object({
       intents: import_satori4.Schema.bitset(Gateway.Intent).description("需要订阅的机器人事件。").default(0 | Gateway.Intent.GUILD_MESSAGES | Gateway.Intent.GUILD_MESSAGE_REACTIONS | Gateway.Intent.DIRECT_MESSAGES | Gateway.Intent.DIRECT_MESSAGE_REACTIONS | Gateway.Intent.MESSAGE_CONTENT)
     }).description("推送设置"),
-    import_satori4.Adapter.WsClient.Config
+    import_satori4.Adapter.WsClientConfig
   ]);
 })(WsClient || (WsClient = {}));
 
@@ -1953,9 +1956,6 @@ var _DiscordBot = class _DiscordBot extends import_satori5.Bot {
     this.internal = new Internal(this.http);
     ctx.plugin(WsClient, this);
   }
-  session(payload, input) {
-    return (0, import_satori5.defineProperty)(super.session(payload), "discord", Object.assign(Object.create(this.internal), input));
-  }
   async _ensureWebhook(channelId) {
     let webhook;
     const webhooks = await this.internal.getChannelWebhooks(channelId);
@@ -1981,9 +1981,10 @@ var _DiscordBot = class _DiscordBot extends import_satori5.Bot {
     }
     return (_a = this.webhookLock)[channelId] || (_a[channelId] = this._ensureWebhook(channelId));
   }
-  async getSelf() {
+  async getLogin() {
     const data = await this.internal.getCurrentUser();
-    return decodeUser(data);
+    this.user = decodeUser(data);
+    return this.toJSON();
   }
   async deleteMessage(channelId, messageId) {
     await this.internal.deleteMessage(channelId, messageId);
@@ -2001,13 +2002,13 @@ var _DiscordBot = class _DiscordBot extends import_satori5.Bot {
   }
   async getMessage(channelId, messageId) {
     const data = await this.internal.getChannelMessage(channelId, messageId);
-    return await decodeMessage(this, data);
+    return await decodeMessage(this, data, {});
   }
   async getMessageList(channelId, before) {
     var _a;
     const messages = await this.internal.getChannelMessages(channelId, { before, limit: 100 });
-    const data = await Promise.all(messages.reverse().map((data2) => decodeMessage(this, data2, {}, false)));
-    return { data, next: (_a = data[0]) == null ? void 0 : _a.messageId };
+    const data = await Promise.all(messages.reverse().map((data2) => decodeMessage(this, data2, {}, void 0, false)));
+    return { data, next: (_a = data[0]) == null ? void 0 : _a.id };
   }
   async getUser(userId) {
     const data = await this.internal.getUser(userId);
@@ -2078,19 +2079,17 @@ var _DiscordBot = class _DiscordBot extends import_satori5.Bot {
   }
   async createGuildRole(guildId, data) {
     const role = await this.internal.createGuildRole(guildId, encodeRole(data));
-    return role.id;
+    return decodeRole(role);
   }
-  async modifyGuildRole(guildId, roleId, data) {
+  async updateGuildRole(guildId, roleId, data) {
     await this.internal.modifyGuildRole(guildId, roleId, encodeRole(data));
   }
   deleteGuildRole(guildId, roleId) {
     return this.internal.deleteGuildRole(guildId, roleId);
   }
-  async sendPrivateMessage(userId, content, options) {
-    const channel = await this.internal.createDM({
-      recipient_id: userId
-    });
-    return this.sendMessage(channel.id, content, null, options);
+  async createDirectChannel(userId) {
+    const channel = await this.internal.createDM({ recipient_id: userId });
+    return decodeChannel(channel);
   }
   async updateCommands(commands) {
     if (!this.config.slash)