koishi-plugin-chat-analyse 0.4.5 → 0.4.6

package/lib/index.js

@@ -208,29 +208,40 @@ var Collector = class _Collector {
     if (this.pendingUserRequests.has(cacheKey)) return this.pendingUserRequests.get(cacheKey);
     const promise = (async () => {
       try {
-        const existing = await this.ctx.database.get("analyse_user", { channelId, userId });
-        if (existing.length > 0) {
-          const { uid: uid2, userName: userName2, channelName: channelName2 } = existing[0];
-          const cachedUser2 = { uid: uid2, userName: userName2, channelName: channelName2 };
-          this.userCache.set(cacheKey, cachedUser2);
-          return cachedUser2;
+        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 newUserRecord = {
-          channelId,
-          userId,
-          channelName: guild?.name || channelId,
-          userName: member?.nick || member?.name || user?.name || userId
-        };
-        const createdUser = await this.ctx.database.create("analyse_user", newUserRecord);
-        const { uid, userName, channelName } = createdUser;
-        const cachedUser = { uid, userName, channelName };
-        this.userCache.set(cacheKey, cachedUser);
-        return cachedUser;
+        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
+            });
+          }
+          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;
+        }
       } catch (error) {
         this.ctx.logger.error(`创建或获取用户(${cacheKey})失败:`, error);
         return null;
@@ -894,8 +905,9 @@ var WhoAt = class {
         const userInfoMap = new Map(users.map((u) => [u.uid, { name: u.userName, id: u.userId }]));
         const messageElements = records.map((record) => {
           const senderInfo = userInfoMap.get(record.uid);
-          const userId = senderInfo?.id;
-          const authorElement = (0, import_koishi4.h)("author", { userId, name: userId });
+          const userId = senderInfo.id;
+          const userName = senderInfo.name || userId;
+          const authorElement = (0, import_koishi4.h)("author", { userId, name: userName });
           const contentElement = import_koishi4.h.text(record.content);
           return (0, import_koishi4.h)("message", {}, [authorElement, contentElement]);
         });

package/package.json

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