@satorijs/adapter-discord 3.0.0 → 3.0.1

package/lib/bot.d.ts

@@ -2,11 +2,10 @@ import { Bot, Context, Message, Quester, Schema } from '@satorijs/satori';
 import { Sender } from './sender';
 import { Internal } from './types';
 import { WsClient } from './ws';
-export declare class DiscordBot extends Bot<Context, DiscordBot.Config> {
+export declare class DiscordBot<C extends Context = Context> extends Bot<C, DiscordBot.Config> {
     http: Quester;
     internal: Internal;
-    constructor(ctx: Context, config: DiscordBot.Config);
-    getIntents(): number;
+    constructor(ctx: C, config: DiscordBot.Config);
     getSelf(): Promise<import("@satorijs/core").User>;
     private parseQuote;
     sendMessage(channelId: string, content: string, guildId?: string): Promise<string[]>;

package/lib/index.js

@@ -1349,7 +1349,7 @@ var WsClient = class extends import_satori3.Adapter.WsClient {
             token: this.bot.config.token,
             properties: {},
             compress: false,
-            intents: this.bot.getIntents()
+            intents: this.bot.config.intents
           }
         }));
       }
@@ -1378,10 +1378,7 @@ __name(WsClient, "WsClient");
   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 网关。"),
-      intents: import_satori3.Schema.object({
-        members: import_satori3.Schema.boolean().description("启用 GUILD_MEMBERS 推送。").default(true),
-        presence: import_satori3.Schema.boolean().description("启用 GUILD_PRESENCES 推送。").default(false)
-      })
+      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
   ]);
@@ -1401,16 +1398,6 @@ var DiscordBot = class extends import_satori4.Bot {
     this.internal = new Internal(this.http);
     ctx.plugin(WsClient, this);
   }
-  getIntents() {
-    let intents = 0 | 512 /* GUILD_MESSAGES */ | 1024 /* GUILD_MESSAGE_REACTIONS */ | 4096 /* DIRECT_MESSAGES */ | 8192 /* DIRECT_MESSAGE_REACTIONS */;
-    if (this.config.intents.members) {
-      intents |= 2 /* GUILD_MEMBERS */;
-    }
-    if (this.config.intents.presence) {
-      intents |= 256 /* GUILD_PRESENCES */;
-    }
-    return intents;
-  }
   async getSelf() {
     const data = await this.internal.getCurrentUser();
     return adaptUser(data);
@@ -1429,7 +1416,7 @@ var DiscordBot = class extends import_satori4.Bot {
       guildId,
       subtype: guildId ? "group" : "private"
     });
-    if (await this.ctx.serial(session, "before-send", session))
+    if (await this.context.serial(session, "before-send", session))
       return;
     if (!(session == null ? void 0 : session.content))
       return [];
@@ -1442,7 +1429,7 @@ var DiscordBot = class extends import_satori4.Bot {
     const results = await send(session.content, { message_reference });
     for (const id of results) {
       session.messageId = id;
-      this.ctx.emit(session, "send", session);
+      this.context.emit(session, "send", session);
     }
     return results;
   }