koishi-plugin-ggcevo-game 0.4.5 → 0.4.7

package/lib/index.js

@@ -103,7 +103,6 @@ function apply(ctx, config) {
     // 复合主键
   });
   ctx.model.extend("ggcevo_Punishment", {
-    // 各字段定义
     id: "unsigned",
     // 自增序号
     name: "string",
@@ -123,13 +122,11 @@ function apply(ctx, config) {
     comment: "text"
     // 备注信息（可选）
   }, {
-    // 额外配置
     primary: "id",
     autoInc: true
     // 启用自增ID
   });
   ctx.model.extend("ggcevo_exchange", {
-    // 各字段定义
     userId: "string",
     handle: "string",
     // 句柄
@@ -139,26 +136,20 @@ function apply(ctx, config) {
     date: "timestamp",
     GlobalLimit: "boolean"
   }, {
-    // 额外配置
     primary: ["handle", "item"]
   });
   ctx.model.extend("ggcevo_adminbenefit", {
-    // 各字段定义
     userId: "string",
     handle: "string",
-    // 句柄
     signmonth: "unsigned",
     lastSign: "timestamp"
   }, {
-    // 额外配置
     primary: "userId"
   });
   ctx.model.extend("ggcevo_blacklist", {
-    // 各字段定义
     handle: "string",
     createdAt: "timestamp"
   }, {
-    // 额外配置
     primary: "handle"
   });
   const initDefaultItems = {
@@ -677,7 +668,7 @@ ID：${activity.id}
       hour12: false
     }), "formatTime");
     const output = activities.map((activity) => [
-      `[ID: ${activity.id}] ${activity.name}`,
+      `活动： ${activity.name}`,
       `时间：${formatTime(activity.startTime)} ~ ${formatTime(activity.endTime)}`,
       `描述：${activity.description}`,
       `奖励：${activity.quantity} 枚咕咕币`,
@@ -831,27 +822,30 @@ ID：${activity.id}
     const pageNum = parseInt(page) || 1;
     if (pageNum < 1) return "请输入有效的页码。";
     const offset = (pageNum - 1) * 10;
-    const records = await ctx.database.select("ggcevo_rank").orderBy("rank", "desc").limit(10).offset(offset).execute();
-    if (!records.length) return `第 ${pageNum} 页暂无数据。`;
+    const [records, total] = await Promise.all([
+      ctx.database.select("ggcevo_rank").orderBy("rank", "desc").limit(10).offset(offset).execute(),
+      ctx.database.select("ggcevo_rank").execute((row) => import_koishi.$.count(row.profileId))
+    ]);
+    const pageSize = 10;
+    const totalPages = Math.ceil(total / pageSize);
+    if (pageNum > totalPages) return `最多有 ${totalPages} 页`;
     const processedRecords = await Promise.all(
-      records.map(async (item) => {
-        const isSafe = await checkSensitiveWord(item.name);
-        return {
-          ...item,
-          displayName: isSafe ? item.name : (item.name[0] || "") + "***"
-          // 处理空名字的情况
-        };
-      })
+      records.map(async (item) => ({
+        ...item,
+        displayName: await checkSensitiveWord(item.name) ? item.name : (item.name[0] || "") + "***"
+      }))
     );
-    const rankingText = processedRecords.map((item, index) => {
-      const globalRank = offset + index + 1;
-      return `${globalRank}. ${item.displayName} | 积分: ${item.rank.toString()} | 参赛: ${item.matches} 次`;
-    }).join("\n");
-    return `🏆 GGCEvo 胜点榜 第 ${pageNum} 页 🏆
-------------------------------
-` + rankingText + `
-------------------------------
-输入 胜点榜 ${pageNum + 1} 查看下一页`;
+    const rankingText = processedRecords.map(
+      (item, index) => `${offset + index + 1}. ${item.displayName} | 积分: ${item.rank} | 参赛: ${item.matches} 次`
+    ).join("\n");
+    return [
+      `🏆 GGCEvo 胜点榜 🏆`,
+      `第 ${pageNum} 页 共 ${totalPages} 页`,
+      "------------------------------",
+      rankingText,
+      "------------------------------",
+      pageNum < totalPages ? `输入 胜点榜 ${pageNum + 1} 查看下一页` : "已是最后一页"
+    ].join("\n");
   });
   ctx.command("ggcevo/排名 [player]", "查询个人排名").alias("rank").usage("输入“排名”查看自己的排名信息").action(async (argv, player) => {
     const session = argv.session;
@@ -936,8 +930,10 @@ ID：${activity.id}
       return "操作失败，请稍后再试";
     }
   });
-  ctx.command("ggcevo/违规记录 [page] [user]", "违规记录查询").usage("输入 违规记录 [页码] 查看你的处罚记录，每页1条").action(async (argv, page, user) => {
+  ctx.command("ggcevo/违规记录 [user]", "违规记录查询").usage("输入 违规记录 [@用户] -p 页码 查看处罚记录，每页1条").option("p", "-p <page:number> 指定页码").action(async (argv) => {
     const session = argv.session;
+    const pageNum = argv.options.p ? argv.options.p : 1;
+    const user = argv.args[0];
     let handle;
     if (!user) {
       const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
@@ -957,8 +953,8 @@ ID：${activity.id}
       const { regionId, realmId, profileId } = profile;
       handle = `${regionId}-S2-${realmId}-${profileId}`;
     }
-    const pageNum = parseInt(page) || 1;
     if (pageNum < 1) return "请输入有效的页码。";
+    const totalPages = await ctx.database.select("ggcevo_Punishment").where({ handle }).execute((row) => import_koishi.$.count(row.id));
     const records = await ctx.database.select("ggcevo_Punishment").where({ handle }).orderBy("id", "desc").limit(1).offset(pageNum - 1).execute();
     if (!records.length) {
       return pageNum === 1 ? `【${handle}】暂无违规记录` : `【${handle}】第 ${pageNum} 条记录不存在`;
@@ -979,11 +975,12 @@ ID：${activity.id}
       return finalText;
     }).join("\n------------------------------\n");
     return [
-      `🚨 违规记录 第 ${pageNum} 条 🚨`,
+      `🚨 违规记录 🚨`,
+      `第 ${pageNum} 条 共 ${totalPages} 条`,
       "------------------------------",
       recordText,
       "------------------------------",
-      `输入 违规记录 ${pageNum + 1} 查看下一条`
+      pageNum < totalPages ? `输入 违规记录 -p ${pageNum + 1} 查看下一条` : "已是最后一页"
     ].join("\n");
   });
   const itemConfig = {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-ggcevo-game",
   "description": "星际争霸2游戏大厅咕咕虫-Evo地图专属插件",
-  "version": "0.4.5",
+  "version": "0.4.7",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -17,7 +17,7 @@
   "peerDependencies": {
     "koishi": "^4.18.7",
     "@koishijs/plugin-proxy-agent": "^0.3.3",
-    "koishi-plugin-sc2arcade-search": "^0.3.4"
+    "koishi-plugin-sc2arcade-search": "^1.0.3"
   },
   "koishi": {
     "service": {