koishi-plugin-echo-cave 1.21.0 → 1.22.0

package/lib/config/config.d.ts

@@ -12,5 +12,6 @@ export interface Config {
     useBase64ForMedia?: boolean;
     sendAllAsForwardMsg?: boolean;
     rankingTopCount?: number;
+    considerOriginUserAsRelated?: boolean;
 }
 export declare const Config: Schema<Config>;

package/lib/index.cjs

@@ -44,7 +44,8 @@ var require_zh_CN = __commonJS({
       maxRecordSize: "\u6700\u5927\u5F55\u97F3\u5927\u5C0F (MB)",
       useBase64ForMedia: "\u662F\u5426\u4F7F\u7528 Base64 \u7F16\u7801\u53D1\u9001\u5A92\u4F53\u6587\u4EF6\uFF0C\u5F00\u542F\u540E\u5C06\u8BFB\u53D6 base64 \u7F16\u7801\u53D1\u9001\u800C\u4E0D\u662F\u4F7F\u7528 file uri",
       sendAllAsForwardMsg: "\u662F\u5426\u5C06\u6240\u6709\u6D88\u606F\u4EE5\u8F6C\u53D1\u6D88\u606F\u5F62\u5F0F\u53D1\u9001\uFF0C\u5F00\u542F\u540E\u666E\u901A\u6D88\u606F\u4E5F\u4F1A\u8F6C\u6362\u4E3A\u8F6C\u53D1\u6D88\u606F\u683C\u5F0F",
-      rankingTopCount: "\u6392\u884C\u699C\u663E\u793A\u7684\u7528\u6237\u6570\u91CF"
+      rankingTopCount: "\u6392\u884C\u699C\u663E\u793A\u7684\u7528\u6237\u6570\u91CF",
+      considerOriginUserAsRelated: "\u662F\u5426\u5C06\u539F\u6D88\u606F\u53D1\u9001\u8005\u89C6\u4E3A\u76F8\u5173\u7528\u6237\uFF0C\u9ED8\u8BA4\u4E0D\u8003\u8651"
     };
   }
 });
@@ -179,14 +180,13 @@ var require_zh_CN2 = __commonJS({
           description: "\u67E5\u770B\u56DE\u58F0\u6D1E\u6392\u884C\u699C",
           messages: {
             invalidPeriod: "\u65E0\u6548\u7684\u65F6\u95F4\u6BB5\u53C2\u6570\u3002\u652F\u6301\u7684\u65F6\u95F4\u6BB5\uFF1A{0}",
-            rankingTitle: "\u{1F4CA} \u56DE\u58F0\u6D1E\u6392\u884C\u699C\uFF08{0}\uFF09",
+            rankingTitle: "\u{1F4CA} \u56DE\u58F0\u6D1E\u6392\u884C\u699C ({0})",
             noData: "\u6682\u65E0\u6570\u636E",
-            rankFormat: "{0} {1}\uFF1A{2} \u4E2A\u56DE\u58F0\u6D1E",
-            rankingHeader: "\u4ECA\u65E5\u4EBA\u54C1\u6392\u884C\u699C",
+            rankFormat: "{rankEmoji} {userName}\uFF1A{count} \u4E2A\u56DE\u58F0\u6D1E",
             period: {
-              day: "24\u5C0F\u65F6",
-              week: "7\u5929",
-              month: "1\u4E2A\u6708",
+              day: "24 \u5C0F\u65F6",
+              week: "7 \u5929",
+              month: "1 \u4E2A\u6708",
               all: "\u6240\u6709\u65F6\u95F4"
             }
           }
@@ -916,20 +916,21 @@ function getStartTime(period) {
   }
   return startTime;
 }
-function countUserOccurrences(caves) {
+function countUserOccurrences(caves, considerOriginUser) {
   const countMap = /* @__PURE__ */ new Map();
   caves.forEach((cave) => {
     cave.relatedUsers.forEach((userId) => {
       countMap.set(userId, (countMap.get(userId) || 0) + 1);
     });
-    countMap.set(cave.originUserId, (countMap.get(cave.originUserId) || 0) + 1);
+    if (considerOriginUser) {
+      countMap.set(cave.originUserId, (countMap.get(cave.originUserId) || 0) + 1);
+    }
   });
   return countMap;
 }
-async function generateRankingText(ctx, session, countMap, period, topCount) {
+async function generateRankingText(ctx, session, countMap, topCount) {
   const sortedUsers = Array.from(countMap.entries()).sort(([, a], [, b]) => b - a).slice(0, topCount);
-  const periodText = session.text(`.period.${period}`);
-  let text = session.text(".rankingTitle", [periodText]) + "\n\n";
+  let text = "";
   if (sortedUsers.length === 0) {
     text += session.text(".noData");
   } else {
@@ -949,9 +950,14 @@ async function generateRankingText(ctx, session, countMap, period, topCount) {
           rankEmoji = "\u{1F949}";
           break;
         default:
-          rankEmoji = `#${rank}`;
+          rankEmoji = `${rank}.`;
+      }
+      const rankData = { rankEmoji, userName, count };
+      if (i === sortedUsers.length - 1) {
+        text += session.text(".rankFormat", rankData);
+      } else {
+        text += session.text(".rankFormat", rankData) + "\n";
       }
-      text += session.text(".rankFormat", [rankEmoji, userName, count]) + "\n";
     }
   }
   return text;
@@ -975,21 +981,13 @@ async function getRanking(ctx, session, cfg, period = "all") {
       $gte: startTime
     }
   });
-  const countMap = countUserOccurrences(caves);
-  const rankingText = await generateRankingText(
-    ctx,
-    session,
-    countMap,
-    normalizedPeriod,
-    topCount
-  );
+  const countMap = countUserOccurrences(caves, cfg.considerOriginUserAsRelated || false);
+  const rankingText = await generateRankingText(ctx, session, countMap, topCount);
   const botName = await getUserName(this.ctx, session, session.bot?.userId) || "Bot";
+  const periodText = session.text(`.period.${period}`);
+  let title = session.text(".rankingTitle", [periodText]);
   await session.onebot.sendGroupForwardMsg(channelId, [
-    createTextMsgNode(
-      session.bot?.userId || session.userId,
-      botName,
-      session.text(".rankingHeader")
-    ),
+    createTextMsgNode(session.bot?.userId || session.userId, botName, title),
     createTextMsgNode(session.bot?.userId || session.userId, botName, rankingText)
   ]);
 }
@@ -1044,7 +1042,8 @@ var Config = import_koishi2.Schema.object({
   maxRecordSize: import_koishi2.Schema.number().default(512),
   useBase64ForMedia: import_koishi2.Schema.boolean().default(false),
   sendAllAsForwardMsg: import_koishi2.Schema.boolean().default(false),
-  rankingTopCount: import_koishi2.Schema.number().default(10)
+  rankingTopCount: import_koishi2.Schema.number().default(10),
+  considerOriginUserAsRelated: import_koishi2.Schema.boolean().default(true)
 }).i18n({
   "zh-CN": require_zh_CN()
 });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-echo-cave",
   "description": "Group echo cave",
-  "version": "1.21.0",
+  "version": "1.22.0",
   "main": "lib/index.cjs",
   "typings": "lib/index.d.ts",
   "type": "module",