koishi-plugin-ggcevo-game 0.4.6 → 0.4.8

package/lib/index.d.ts

@@ -66,6 +66,7 @@ export interface rank {
     name: string;
     rank: number;
     matches: number;
+    Blacklist: boolean;
 }
 export interface Punishment {
     id: number;

package/lib/index.js

@@ -96,8 +96,13 @@ function apply(ctx, config) {
     // 玩家名称
     rank: "integer",
     // rank分数（带正负）
-    matches: "unsigned"
+    matches: "unsigned",
     // 比赛次数
+    Blacklist: {
+      type: "boolean",
+      // 该字段的默认值
+      initial: false
+    }
   }, {
     primary: ["regionId", "realmId", "profileId"]
     // 复合主键
@@ -823,8 +828,8 @@ ID：${activity.id}
     if (pageNum < 1) return "请输入有效的页码。";
     const offset = (pageNum - 1) * 10;
     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))
+      ctx.database.select("ggcevo_rank").where({ Blacklist: false }).orderBy("rank", "desc").limit(10).offset(offset).execute(),
+      ctx.database.select("ggcevo_rank").where({ Blacklist: false }).execute((row) => import_koishi.$.count(row.profileId))
     ]);
     const pageSize = 10;
     const totalPages = Math.ceil(total / pageSize);
@@ -839,11 +844,12 @@ ID：${activity.id}
       (item, index) => `${offset + index + 1}. ${item.displayName} | 积分: ${item.rank} | 参赛: ${item.matches} 次`
     ).join("\n");
     return [
-      `🏆 GGCEvo 胜点榜 第 ${pageNum} 页 / 共 ${totalPages} 页 🏆`,
+      `🏆 GGCEvo 胜点榜 🏆`,
+      `第 ${pageNum} 页 共 ${totalPages} 页`,
       "------------------------------",
       rankingText,
       "------------------------------",
-      pageNum < totalPages ? `输入“胜点榜 ${pageNum + 1}”查看下一页` : "已是最后一页"
+      pageNum < totalPages ? `输入 胜点榜 ${pageNum + 1} 查看下一页` : "已是最后一页"
     ].join("\n");
   });
   ctx.command("ggcevo/排名 [player]", "查询个人排名").alias("rank").usage("输入“排名”查看自己的排名信息").action(async (argv, player) => {
@@ -860,7 +866,8 @@ ID：${activity.id}
         profileId
       });
       if (!user) return "未找到您的排名信息。";
-      const allRanks = await ctx.database.select("ggcevo_rank").orderBy("rank", "desc").execute();
+      if (user.Blacklist) return "您已经被禁止参加胜点榜。";
+      const allRanks = await ctx.database.select("ggcevo_rank").where({ Blacklist: false }).orderBy("rank", "desc").execute();
       const userRank = allRanks.findIndex(
         (u) => u.regionId === regionId && u.realmId === realmId && u.profileId === profileId
       ) + 1;
@@ -892,7 +899,8 @@ ID：${activity.id}
         profileId
       });
       if (!user) return "未找到他/她的排名信息。";
-      const allRanks = await ctx.database.select("ggcevo_rank").orderBy("rank", "desc").execute();
+      if (user.Blacklist) return "他/她已经被禁止参加胜点榜。";
+      const allRanks = await ctx.database.select("ggcevo_rank").where({ Blacklist: false }).orderBy("rank", "desc").execute();
       const userRank = allRanks.findIndex(
         (u) => u.regionId === regionId && u.realmId === realmId && u.profileId === profileId
       ) + 1;
@@ -929,8 +937,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 });
@@ -950,8 +960,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} 条记录不存在`;
@@ -972,11 +982,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.6",
+  "version": "0.4.8",
   "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": {