@satorijs/adapter-discord 3.0.0 → 3.0.3

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

@@ -339,12 +339,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 = {}));
 
@@ -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
           }
         }));
       }
@@ -1377,11 +1377,8 @@ __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 网关。"),
-      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)
-      })
+      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
   ]);
@@ -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;
   }
@@ -1527,12 +1514,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";