@koishijs/plugin-adapter-discord 2.0.7 → 2.1.0

package/lib/bot.d.ts

@@ -40,8 +40,10 @@ export declare class DiscordBot extends Bot<BotConfig> {
         discriminator?: string;
         isBot?: boolean;
     }>;
+    kickGuildMember(guildId: string, userId: string): Promise<void>;
     getGuild(guildId: string): Promise<Bot.Guild>;
     getGuildList(): Promise<Bot.Guild[]>;
     getChannelList(guildId: string): Promise<Bot.Channel[]>;
+    getChannelMessageHistory(channelId: string, before?: string): Promise<Bot.Message[]>;
 }
 export {};

package/lib/index.js

@@ -51,9 +51,11 @@ __export(exports, {
   adaptChannel: () => adaptChannel,
   adaptGroup: () => adaptGroup,
   adaptMessage: () => adaptMessage,
+  adaptMessageSession: () => adaptMessageSession,
   adaptSession: () => adaptSession,
   adaptUser: () => adaptUser,
-  default: () => src_default
+  default: () => src_default,
+  prepareMessageSession: () => prepareMessageSession
 });
 var import_koishi6 = __toModule(require("koishi"));
 
@@ -244,7 +246,7 @@ function adaptMessage(meta, session = {}) {
   }
   session.content = "";
   if (meta.content) {
-    session.content = meta.content.replace(/<@[!&](.+?)>/g, (_, id) => {
+    session.content = meta.content.replace(/<@[!&]?(.+?)>/g, (_, id) => {
       var _a2;
       if (meta.mention_roles.includes(id)) {
         return (0, import_koishi2.segment)("at", { role: id });
@@ -302,7 +304,7 @@ function adaptMessage(meta, session = {}) {
   return session;
 }
 __name(adaptMessage, "adaptMessage");
-function adaptMessageSession(bot, meta, session = {}) {
+function adaptMessageSession(meta, session = {}) {
   adaptMessage(meta, session);
   session.messageId = meta.id;
   session.timestamp = new Date(meta.timestamp).valueOf() || Date.now();
@@ -338,14 +340,14 @@ async function adaptSession(bot, input) {
   if (input.t === "MESSAGE_CREATE") {
     session.type = "message";
     prepareMessageSession(session, input.d);
-    adaptMessageSession(bot, input.d, session);
+    adaptMessageSession(input.d, session);
     if (session.userId === bot.selfId)
       return;
   } 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(bot, msg, session);
+    adaptMessageSession(msg, session);
     if (session.userId === bot.selfId)
       return;
   } else if (input.t === "MESSAGE_DELETE") {
@@ -367,6 +369,11 @@ async function adaptSession(bot, input) {
     session.type = "reaction-deleted";
     session.subtype = "emoji";
     prepareReactionSession(session, input.d);
+  } else if (input.t === "CHANNEL_UPDATE") {
+    session.type = "channel-updated";
+    session.guildId = input.d.guild_id;
+    session.subtype = input.d.guild_id ? "group" : "private";
+    session.channelId = input.d.id;
   } else {
     return;
   }
@@ -699,7 +706,7 @@ var GatewayOpcode;
 })(GatewayOpcode || (GatewayOpcode = {}));
 var GatewayIntent;
 (function(GatewayIntent2) {
-  GatewayIntent2[GatewayIntent2["GUILD_CREATE"] = 1] = "GUILD_CREATE";
+  GatewayIntent2[GatewayIntent2["GUILDS"] = 1] = "GUILDS";
   GatewayIntent2[GatewayIntent2["GUILD_MEMBERS"] = 2] = "GUILD_MEMBERS";
   GatewayIntent2[GatewayIntent2["GUILD_BANS"] = 4] = "GUILD_BANS";
   GatewayIntent2[GatewayIntent2["GUILD_EMOJIS_AND_STICKERS"] = 8] = "GUILD_EMOJIS_AND_STICKERS";
@@ -1430,6 +1437,9 @@ var DiscordBot = class extends import_koishi4.Bot {
       nickname: member.nick
     });
   }
+  async kickGuildMember(guildId, userId) {
+    return this.internal.removeGuildMember(guildId, userId);
+  }
   async getGuild(guildId) {
     const data = await this.internal.getGuild(guildId);
     return adaptGroup(data);
@@ -1442,17 +1452,29 @@ var DiscordBot = class extends import_koishi4.Bot {
     const data = await this.internal.getGuildChannels(guildId);
     return data.map((v) => adaptChannel(v));
   }
+  async getChannelMessageHistory(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");
 DiscordBot.schema = AdapterConfig;
 
 // plugins/adapter/discord/src/ws.ts
 var import_koishi5 = __toModule(require("koishi"));
-var import_ws = __toModule(require("ws"));
 var logger = new import_koishi5.Logger("discord");
 var WebSocketClient = class extends import_koishi5.Adapter.WebSocketClient {
   prepare(bot) {
-    return new import_ws.default(bot.config.gateway);
+    const http = this.ctx.http.extend(bot.config);
+    return http.ws(bot.config.gateway);
   }
   heartbeat(bot) {
     logger.debug(`heartbeat d ${bot._d}`);
@@ -1534,7 +1556,9 @@ var src_default = import_koishi6.Adapter.define("discord", DiscordBot, WebSocket
   adaptChannel,
   adaptGroup,
   adaptMessage,
+  adaptMessageSession,
   adaptSession,
-  adaptUser
+  adaptUser,
+  prepareMessageSession
 });
 //# sourceMappingURL=index.js.map