koishi-plugin-chat-analyse 0.4.7 → 0.4.8

package/lib/Collector.d.ts

@@ -91,6 +91,17 @@ export declare class Collector {
      * @returns {Promise<UserCache | null>} 返回用户的缓存对象，如果操作失败则返回 `null`。
      */
     private getOrCreateCachedUser;
+    /**
+     * @private
+     * @async
+     * @method fetchApiNames
+     * @description 并发调用机器人API以获取用户和频道名称，作为备用数据源。
+     * @param bot - The bot instance.
+     * @param guildId - The guild ID.
+     * @param userId - The user ID.
+     * @returns {Promise<{userName: string, channelName: string}>} - 包含名称的对象。
+     */
+    private fetchApiNames;
     /**
      * @private
      * @method sanitizeContent

package/lib/index.d.ts

@@ -18,7 +18,6 @@ export interface Config {
     enableOriRecord: boolean;
     enableWhoAt: boolean;
     enableData: boolean;
-    enableDebug: boolean;
     atRetentionDays: number;
     rankRetentionDays: number;
 }

package/lib/index.js

@@ -202,46 +202,42 @@ var Collector = class _Collector {
    * @returns {Promise<UserCache | null>} 返回用户的缓存对象，如果操作失败则返回 `null`。
    */
   async getOrCreateCachedUser(session, channelId) {
-    const { userId, bot, guildId } = session;
+    const { userId, bot } = session;
     const cacheKey = `${channelId}:${userId}`;
     if (this.userCache.has(cacheKey)) return this.userCache.get(cacheKey);
     if (this.pendingUserRequests.has(cacheKey)) return this.pendingUserRequests.get(cacheKey);
     const promise = (async () => {
       try {
-        const [dbUser] = await this.ctx.database.get("analyse_user", { channelId, userId });
-        if (dbUser && dbUser.userName && dbUser.channelName) {
-          this.userCache.set(cacheKey, dbUser);
-          return dbUser;
-        }
-        const [guild, member] = await Promise.all([
-          guildId ? bot.getGuild(guildId).catch(() => null) : Promise.resolve(null),
-          guildId ? bot.getGuildMember(guildId, userId).catch(() => null) : Promise.resolve(null)
-        ]);
-        const user = !member ? await bot.getUser(userId).catch(() => null) : null;
-        const fetchedUserName = member?.nick || member?.name || user?.name || "";
-        const fetchedChannelName = guild?.name || "";
-        if (dbUser) {
-          const needsUpdate = !dbUser.userName && fetchedUserName || !dbUser.channelName && fetchedChannelName;
-          if (needsUpdate) {
-            dbUser.userName = dbUser.userName || fetchedUserName;
-            dbUser.channelName = dbUser.channelName || fetchedChannelName;
-            await this.ctx.database.set("analyse_user", { uid: dbUser.uid }, {
-              userName: dbUser.userName,
-              channelName: dbUser.channelName
-            });
+        const sessionUserName = session.username || "";
+        const sessionChannelName = session.event._data.raw.peerName || session.guild.name || "";
+        const dbUser = await this.ctx.database.get("analyse_user", { channelId, userId });
+        if (dbUser[0]) {
+          const user = dbUser[0];
+          const nameChanged = sessionUserName && user.userName !== sessionUserName;
+          const channelNameChanged = sessionChannelName && user.channelName !== sessionChannelName;
+          if (nameChanged || channelNameChanged) {
+            user.userName = nameChanged ? sessionUserName : user.userName;
+            user.channelName = channelNameChanged ? sessionChannelName : user.channelName;
+            await this.ctx.database.set("analyse_user", { uid: user.uid }, { userName: user.userName, channelName: user.channelName });
           }
-          if (dbUser.userName && dbUser.channelName) this.userCache.set(cacheKey, dbUser);
-          return dbUser;
-        } else {
-          const createdUser = await this.ctx.database.create("analyse_user", {
-            channelId,
-            userId,
-            userName: fetchedUserName,
-            channelName: fetchedChannelName
-          });
-          if (createdUser.userName && createdUser.channelName) this.userCache.set(cacheKey, createdUser);
-          return createdUser;
+          this.userCache.set(cacheKey, user);
+          return user;
+        }
+        let finalUserName = sessionUserName;
+        let finalChannelName = sessionChannelName;
+        if (!finalUserName || !finalChannelName) {
+          const apiData = await this.fetchApiNames(bot, session.guildId || channelId, userId);
+          finalUserName = finalUserName || apiData.userName;
+          finalChannelName = finalChannelName || apiData.channelName;
         }
+        const createdUser = await this.ctx.database.create("analyse_user", {
+          channelId,
+          userId,
+          userName: finalUserName,
+          channelName: finalChannelName
+        });
+        this.userCache.set(cacheKey, createdUser);
+        return createdUser;
       } catch (error) {
         this.ctx.logger.error(`创建或获取用户(${cacheKey})失败:`, error);
         return null;
@@ -252,6 +248,30 @@ var Collector = class _Collector {
     this.pendingUserRequests.set(cacheKey, promise);
     return promise;
   }
+  /**
+   * @private
+   * @async
+   * @method fetchApiNames
+   * @description 并发调用机器人API以获取用户和频道名称，作为备用数据源。
+   * @param bot - The bot instance.
+   * @param guildId - The guild ID.
+   * @param userId - The user ID.
+   * @returns {Promise<{userName: string, channelName: string}>} - 包含名称的对象。
+   */
+  async fetchApiNames(bot, guildId, userId) {
+    const results = await Promise.allSettled([
+      guildId && bot.getGuildMember ? bot.getGuildMember(guildId, userId) : Promise.resolve(null),
+      bot.getUser ? bot.getUser(userId) : Promise.resolve(null),
+      guildId && bot.getGuild ? bot.getGuild(guildId) : Promise.resolve(null)
+    ]);
+    const member = results[0].status === "fulfilled" ? results[0].value : null;
+    const user = results[1].status === "fulfilled" ? results[1].value : null;
+    const guild = results[2].status === "fulfilled" ? results[2].value : null;
+    return {
+      userName: member?.username || member?.nick || member?.name || user?.name || "",
+      channelName: guild?.name || ""
+    };
+  }
   /**
    * @private
    * @method sanitizeContent
@@ -1078,72 +1098,6 @@ var Data = class {
         return "数据清理失败";
       }
     });
-  }
-};
-
-// src/Debug.ts
-var Debug = class {
-  /**
-   * @constructor
-   * @param {Context} ctx - Koishi 的插件上下文。
-   */
-  constructor(ctx) {
-    this.ctx = ctx;
-  }
-  static {
-    __name(this, "Debug");
-  }
-  /**
-   * @public
-   * @method registerCommands
-   * @description 在 'analyse' 命令下注册所有调试相关的子命令。
-   * @param {Command} analyse - 主 'analyse' 命令实例。
-   */
-  registerCommands(analyse) {
-    analyse.subcommand(".fill", "手动补全用户信息", { authority: 4 }).action(async ({ session }) => {
-      const bots = this.ctx.bots;
-      if (bots.length === 0) return "暂无可用机器人";
-      const usersToUpdate = await this.ctx.database.get("analyse_user", {
-        $or: [{ userName: "" }, { channelName: "" }]
-      });
-      if (usersToUpdate.length === 0) return "暂无用户信息需要补全";
-      const usersByChannel = usersToUpdate.reduce((acc, user) => {
-        (acc[user.channelId] = acc[user.channelId] || []).push(user);
-        return acc;
-      }, {});
-      let updatedCount = 0;
-      const bot = bots.find((b) => b.platform === session.platform) || bots[0];
-      for (const channelId in usersByChannel) {
-        const usersInChannel = usersByChannel[channelId];
-        let channelName = usersInChannel.find((u) => u.channelName)?.channelName || "";
-        if (!channelName && channelId) {
-          try {
-            channelName = (await bot.getGuild(channelId))?.name || "";
-          } catch (e) {
-            this.ctx.logger.warn(`获取频道 ${channelId} 信息失败:`, e);
-          }
-        }
-        for (const user of usersInChannel) {
-          if (user.userName && user.channelName) continue;
-          let userName = user.userName;
-          if (!userName && user.userId && channelId) {
-            try {
-              const member = await bot.getGuildMember(channelId, user.userId);
-              userName = member?.nick || member?.name || "";
-              if (!userName) userName = (await bot.getUser(user.userId))?.name || "";
-            } catch (e) {
-              this.ctx.logger.warn(`获取频道 ${channelId} 的用户 ${user.userId} 信息失败:`, e);
-            }
-          }
-          await this.ctx.database.set("analyse_user", { uid: user.uid }, {
-            userName: userName || user.userName,
-            channelName: channelName || user.channelName
-          });
-          updatedCount++;
-        }
-      }
-      return `已补全 ${updatedCount} 条用户信息`;
-    });
     analyse.subcommand(".list", "列出频道及命令", { authority: 4 }).action(async () => {
       const allChannelInfo = await this.ctx.database.get("analyse_user", {}, ["channelId", "channelName"]);
       const uniqueChannels = [...new Map(allChannelInfo.map((item) => [item.channelId, item])).values()];
@@ -1174,11 +1128,12 @@ var using = ["database", "puppeteer", "cron"];
 var Config = import_koishi6.Schema.intersect([
   import_koishi6.Schema.object({
     enableListener: import_koishi6.Schema.boolean().default(true).description("启用消息监听"),
-    enableOriRecord: import_koishi6.Schema.boolean().default(true).description("启用原始记录")
+    enableData: import_koishi6.Schema.boolean().default(false).description("启用数据管理")
   }).description("监听配置"),
   import_koishi6.Schema.object({
     enableCmdStat: import_koishi6.Schema.boolean().default(true).description("启用命令统计"),
-    enableMsgStat: import_koishi6.Schema.boolean().default(true).description("启用消息统计")
+    enableMsgStat: import_koishi6.Schema.boolean().default(true).description("启用消息统计"),
+    enableOriRecord: import_koishi6.Schema.boolean().default(true).description("启用原始记录")
   }).description("功能配置"),
   import_koishi6.Schema.object({
     enableRankStat: import_koishi6.Schema.boolean().default(true).description("启用发言排行"),
@@ -1187,11 +1142,7 @@ var Config = import_koishi6.Schema.intersect([
   import_koishi6.Schema.object({
     enableWhoAt: import_koishi6.Schema.boolean().default(true).description("启用 @ 记录"),
     atRetentionDays: import_koishi6.Schema.number().min(0).default(7).description("记录保留天数")
-  }).description("@ 记录配置"),
-  import_koishi6.Schema.object({
-    enableData: import_koishi6.Schema.boolean().default(false).description("启用数据管理"),
-    enableDebug: import_koishi6.Schema.boolean().default(false).description("启用调试工具")
-  }).description("高级功能")
+  }).description("@ 记录配置")
 ]);
 function apply(ctx, config) {
   if (config.enableListener) new Collector(ctx, config);
@@ -1199,7 +1150,6 @@ function apply(ctx, config) {
   new Stat(ctx, config).registerCommands(analyse);
   if (config.enableWhoAt) new WhoAt(ctx, config).registerCommand(analyse);
   if (config.enableData) new Data(ctx).registerCommands(analyse);
-  if (config.enableDebug) new Debug(ctx).registerCommands(analyse);
 }
 __name(apply, "apply");
 // Annotate the CommonJS export names for ESM import in node:

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-chat-analyse",
   "description": "聊天记录分析",
-  "version": "0.4.7",
+  "version": "0.4.8",
   "contributors": [
     "Yis_Rime <yis_rime@outlook.com>"
   ],