@satorijs/adapter-discord 3.6.1 → 3.7.0

package/lib/bot.d.ts

@@ -1,8 +1,9 @@
-import { Bot, Context, Fragment, Quester, Schema, SendOptions } from '@satorijs/satori';
-import { DiscordMessenger } from './message';
+import { Bot, Context, Fragment, Quester, Schema, Universal } from '@satorijs/satori';
+import { DiscordMessageEncoder } from './message';
 import { Internal, Webhook } from './types';
 import { WsClient } from './ws';
 export declare class DiscordBot extends Bot<DiscordBot.Config> {
+    static MessageEncoder: typeof DiscordMessageEncoder;
     http: Quester;
     internal: Internal;
     webhooks: Record<string, Webhook>;
@@ -10,16 +11,14 @@ export declare class DiscordBot extends Bot<DiscordBot.Config> {
     constructor(ctx: Context, config: DiscordBot.Config);
     private _ensureWebhook;
     ensureWebhook(channelId: string): Promise<Webhook>;
-    getSelf(): Promise<import("@satorijs/core").Universal.User>;
-    sendMessage(channelId: string, content: Fragment, guildId?: string, options?: SendOptions): Promise<string[]>;
-    sendPrivateMessage(channelId: string, content: Fragment, options?: SendOptions): Promise<string[]>;
+    getSelf(): Promise<Universal.User>;
     deleteMessage(channelId: string, messageId: string): 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>;
-    getGuildMemberList(guildId: string): Promise<import("@satorijs/core").Universal.User[]>;
-    getChannel(channelId: string): Promise<import("@satorijs/core").Universal.Channel>;
+    getMessage(channelId: string, messageId: string): Promise<Universal.Message>;
+    getMessageList(channelId: string, before?: string): Promise<Universal.Message[]>;
+    getUser(userId: string): Promise<Universal.User>;
+    getGuildMemberList(guildId: string): Promise<Universal.User[]>;
+    getChannel(channelId: string): Promise<Universal.Channel>;
     getGuildMember(guildId: string, userId: string): Promise<{
         nickname: string;
         userId: string;
@@ -29,12 +28,22 @@ export declare class DiscordBot extends Bot<DiscordBot.Config> {
         isBot?: boolean;
     }>;
     kickGuildMember(guildId: string, userId: string): Promise<void>;
-    getGuild(guildId: string): Promise<import("@satorijs/core").Universal.Guild>;
-    getGuildList(): Promise<import("@satorijs/core").Universal.Guild[]>;
-    getChannelList(guildId: string): Promise<import("@satorijs/core").Universal.Channel[]>;
+    getGuild(guildId: string): Promise<Universal.Guild>;
+    getGuildList(): Promise<Universal.Guild[]>;
+    getChannelList(guildId: string): Promise<Universal.Channel[]>;
+    createReaction(channelId: string, messageId: string, emoji: string): Promise<void>;
+    deleteReaction(channelId: string, messageId: string, emoji: string, userId?: string): Promise<void>;
+    clearReaction(channelId: string, messageId: string, emoji?: string): Promise<void>;
+    getReactions(channelId: string, messageId: string, emoji: string): Promise<Universal.User[]>;
+    setGuildMemberRole(guildId: string, userId: string, roleId: string): Promise<void>;
+    unsetGuildMemberRole(guildId: string, userId: string, roleId: string): Promise<void>;
+    getGuildRoles(guildId: string): Promise<Universal.Role[]>;
+    createGuildRole(guildId: string, data: Partial<Universal.Role>): Promise<Universal.Role>;
+    modifyGuildRole(guildId: string, roleId: string, data: Partial<Universal.Role>): Promise<void>;
+    deleteGuildRole(guildId: string, roleId: string): Promise<void>;
 }
 export declare namespace DiscordBot {
-    interface Config extends Bot.Config, Quester.Config, DiscordMessenger.Config, WsClient.Config {
+    interface Config extends Bot.Config, Quester.Config, DiscordMessageEncoder.Config, WsClient.Config {
         token: string;
     }
     const Config: Schema<Config>;

package/lib/index.js

@@ -32,7 +32,7 @@ var src_exports = {};
 __export(src_exports, {
   Discord: () => types_exports,
   DiscordBot: () => DiscordBot,
-  DiscordMessenger: () => DiscordMessenger,
+  DiscordMessageEncoder: () => DiscordMessageEncoder,
   WsClient: () => WsClient,
   adaptAuthor: () => adaptAuthor,
   adaptChannel: () => adaptChannel,
@@ -40,7 +40,9 @@ __export(src_exports, {
   adaptMessage: () => adaptMessage,
   adaptSession: () => adaptSession,
   adaptUser: () => adaptUser,
+  decodeRole: () => decodeRole,
   default: () => src_default,
+  encodeRole: () => encodeRole,
   prepareMessage: () => prepareMessage,
   sanitize: () => sanitize
 });
@@ -71,6 +73,14 @@ var adaptAuthor = /* @__PURE__ */ __name((author) => ({
   ...adaptUser(author),
   nickname: author.username
 }), "adaptAuthor");
+var decodeRole = /* @__PURE__ */ __name((role) => ({
+  ...role,
+  permissions: BigInt(role.permissions)
+}), "decodeRole");
+var encodeRole = /* @__PURE__ */ __name((role) => ({
+  ...role,
+  permissions: role.permissions && "" + role.permissions
+}), "encodeRole");
 async function adaptMessage(bot, meta, session = {}) {
   var _a, _b, _c;
   const { platform } = bot;
@@ -237,7 +247,7 @@ var State = class {
   }
 };
 __name(State, "State");
-var DiscordMessenger = class extends import_satori2.Messenger {
+var DiscordMessageEncoder = class extends import_satori2.MessageEncoder {
   constructor() {
     super(...arguments);
     this.stack = [new State("message")];
@@ -503,9 +513,9 @@ var DiscordMessenger = class extends import_satori2.Messenger {
     }
   }
 };
-__name(DiscordMessenger, "DiscordMessenger");
-((DiscordMessenger2) => {
-  DiscordMessenger2.Config = import_satori2.Schema.object({
+__name(DiscordMessageEncoder, "DiscordMessageEncoder");
+((DiscordMessageEncoder2) => {
+  DiscordMessageEncoder2.Config = import_satori2.Schema.object({
     handleExternalAsset: import_satori2.Schema.union([
       import_satori2.Schema.const("download").description("先下载后发送"),
       import_satori2.Schema.const("direct").description("直接发送链接"),
@@ -517,7 +527,7 @@ __name(DiscordMessenger, "DiscordMessenger");
       import_satori2.Schema.const("auto").description("如果图片本身采用直接发送则与前面的文本分开，否则将文本作为图片的附带信息发送")
     ]).role("radio").description("发送图文等混合内容时采用的方式。").default("auto")
   }).description("发送设置");
-})(DiscordMessenger || (DiscordMessenger = {}));
+})(DiscordMessageEncoder || (DiscordMessageEncoder = {}));
 
 // satori/adapters/discord/src/types/index.ts
 var types_exports = {};
@@ -1609,10 +1619,10 @@ var WsClient = class extends import_satori4.Adapter.WsClient {
   }
   async prepare() {
     if (this._resumeUrl) {
-      return this.bot.http.ws(this._resumeUrl);
+      return this.bot.http.ws(this._resumeUrl + "/?v=10&encoding=json");
     }
     const { url } = await this.bot.internal.getGatewayBot();
-    return this.bot.http.ws(url);
+    return this.bot.http.ws(url + "/?v=10&encoding=json");
   }
   heartbeat() {
     logger2.debug(`heartbeat d ${this._d}`);
@@ -1752,12 +1762,6 @@ var DiscordBot = class extends import_satori5.Bot {
     const data = await this.internal.getCurrentUser();
     return adaptUser(data);
   }
-  async sendMessage(channelId, content, guildId, options) {
-    return new DiscordMessenger(this, channelId, guildId, options).send(content);
-  }
-  async sendPrivateMessage(channelId, content, options) {
-    return new DiscordMessenger(this, channelId, null, options).send(content);
-  }
   async deleteMessage(channelId, messageId) {
     await this.internal.deleteMessage(channelId, messageId);
   }
@@ -1808,21 +1812,63 @@ var DiscordBot = class extends import_satori5.Bot {
   }
   async getGuildList() {
     const data = await this.internal.getCurrentUserGuilds();
-    return data.map((v) => adaptGuild(v));
+    return data.map(adaptGuild);
   }
   async getChannelList(guildId) {
     const data = await this.internal.getGuildChannels(guildId);
-    return data.map((v) => adaptChannel(v));
+    return data.map(adaptChannel);
+  }
+  createReaction(channelId, messageId, emoji) {
+    return this.internal.createReaction(channelId, messageId, emoji);
+  }
+  deleteReaction(channelId, messageId, emoji, userId) {
+    if (!userId) {
+      return this.internal.deleteOwnReaction(channelId, messageId, emoji);
+    } else {
+      return this.internal.deleteUserReaction(channelId, messageId, emoji, userId);
+    }
+  }
+  clearReaction(channelId, messageId, emoji) {
+    if (!emoji) {
+      return this.internal.deleteAllReactions(channelId, messageId);
+    } else {
+      return this.internal.deleteAllReactionsForEmoji(channelId, messageId, emoji);
+    }
+  }
+  async getReactions(channelId, messageId, emoji) {
+    const data = await this.internal.getReactions(channelId, messageId, emoji);
+    return data.map(adaptUser);
+  }
+  setGuildMemberRole(guildId, userId, roleId) {
+    return this.internal.addGuildMemberRole(guildId, userId, roleId);
+  }
+  unsetGuildMemberRole(guildId, userId, roleId) {
+    return this.internal.removeGuildMemberRole(guildId, userId, roleId);
+  }
+  async getGuildRoles(guildId) {
+    const data = await this.internal.getGuildRoles(guildId);
+    return data.map(decodeRole);
+  }
+  async createGuildRole(guildId, data) {
+    const role = await this.internal.createGuildRole(guildId, encodeRole(data));
+    return decodeRole(role);
+  }
+  async modifyGuildRole(guildId, roleId, data) {
+    await this.internal.modifyGuildRole(guildId, roleId, encodeRole(data));
+  }
+  deleteGuildRole(guildId, roleId) {
+    return this.internal.deleteGuildRole(guildId, roleId);
   }
 };
 __name(DiscordBot, "DiscordBot");
+DiscordBot.MessageEncoder = DiscordMessageEncoder;
 ((DiscordBot2) => {
   DiscordBot2.Config = import_satori5.Schema.intersect([
     import_satori5.Schema.object({
       token: import_satori5.Schema.string().description("机器人的用户令牌。").role("secret").required()
     }),
     WsClient.Config,
-    DiscordMessenger.Config,
+    DiscordMessageEncoder.Config,
     import_satori5.Quester.createConfig("https://discord.com/api/v10")
   ]);
 })(DiscordBot || (DiscordBot = {}));
@@ -1834,7 +1880,7 @@ var src_default = DiscordBot;
 0 && (module.exports = {
   Discord,
   DiscordBot,
-  DiscordMessenger,
+  DiscordMessageEncoder,
   WsClient,
   adaptAuthor,
   adaptChannel,
@@ -1842,6 +1888,8 @@ var src_default = DiscordBot;
   adaptMessage,
   adaptSession,
   adaptUser,
+  decodeRole,
+  encodeRole,
   prepareMessage,
   sanitize
 });