koishi-plugin-ggcevo-game 0.4.7 → 0.4.9

package/lib/index.d.ts

@@ -7,6 +7,7 @@ export interface Config {
     signrequire: boolean;
     autorank: boolean;
     ignoreGlobalLimit: boolean;
+    admins: string[];
 }
 export declare const Config: Schema<Config>;
 export declare const inject: {
@@ -66,6 +67,7 @@ export interface rank {
     name: string;
     rank: number;
     matches: number;
+    Blacklist: boolean;
 }
 export interface Punishment {
     id: number;

package/lib/index.js

@@ -34,7 +34,8 @@ var Config = import_koishi.Schema.object({
   ggcqun: import_koishi.Schema.string().description("开启咕咕虫排行榜的群组").required(),
   signrequire: import_koishi.Schema.boolean().description("是否开启签到要求进行一场游戏").default(true),
   autorank: import_koishi.Schema.boolean().description("是否开启每小时自动同步rank数据").default(true),
-  ignoreGlobalLimit: import_koishi.Schema.boolean().description("是否开启无限制兑换").default(false)
+  ignoreGlobalLimit: import_koishi.Schema.boolean().description("是否开启无限制兑换").default(false),
+  admins: import_koishi.Schema.array(import_koishi.Schema.string()).description("管理员QQ号列表，支持配置多个").default([]).role("table")
 });
 var inject = {
   required: ["database"]
@@ -96,8 +97,13 @@ function apply(ctx, config) {
     // 玩家名称
     rank: "integer",
     // rank分数（带正负）
-    matches: "unsigned"
+    matches: "unsigned",
     // 比赛次数
+    Blacklist: {
+      type: "boolean",
+      // 该字段的默认值
+      initial: false
+    }
   }, {
     primary: ["regionId", "realmId", "profileId"]
     // 复合主键
@@ -234,7 +240,7 @@ function apply(ctx, config) {
     const handle = `${regionId}-S2-${realmId}-${profileId}`;
     const existingEntries = await ctx.database.get("ggcevo_blacklist", { handle });
     if (existingEntries.length > 0) {
-      return `${handle} 已被加入黑名单。`;
+      return `❌拒绝访问，您已被列入活动黑名单。`;
     }
     const [backpack] = await ctx.database.get("ggcevo_backpack", { handle, itemId: 1 });
     if (!backpack) {
@@ -273,7 +279,7 @@ function apply(ctx, config) {
     const handle = `${regionId}-S2-${realmId}-${profileId}`;
     const existingEntries = await ctx.database.get("ggcevo_blacklist", { handle });
     if (existingEntries.length > 0) {
-      return `${handle} 已被加入黑名单。`;
+      return `❌拒绝访问，您已被列入活动黑名单。`;
     }
     const [backpack] = await ctx.database.get("ggcevo_backpack", { handle, itemId: 1 });
     if (!backpack) {
@@ -306,7 +312,7 @@ function apply(ctx, config) {
     const handle = `${regionId}-S2-${realmId}-${profileId}`;
     const existingEntries = await ctx.database.get("ggcevo_blacklist", { handle });
     if (existingEntries.length > 0) {
-      return `${handle} 已被加入黑名单。`;
+      return `❌拒绝访问，您已被列入活动黑名单。`;
     }
     const [backpack] = await ctx.database.get("ggcevo_backpack", { handle, itemId: 1 });
     if (!backpack) {
@@ -380,7 +386,7 @@ ${itemDetails.join("\n")}`;
       const handle = `${regionId}-S2-${realmId}-${profileId}`;
       const existingEntries = await ctx.database.get("ggcevo_blacklist", { handle });
       if (existingEntries.length > 0) {
-        return `${handle} 已被加入黑名单。`;
+        return `❌拒绝访问，您已被列入活动黑名单。`;
       }
       if (config.signrequire) {
         const getconfig = {
@@ -456,7 +462,7 @@ ${itemDetails.join("\n")}`;
       const handle = `${regionId}-S2-${realmId}-${profileId}`;
       const existingEntries = await ctx.database.get("ggcevo_blacklist", { handle });
       if (existingEntries.length > 0) {
-        return `${handle} 已被加入黑名单。`;
+        return `❌拒绝访问，您已被列入活动黑名单。`;
       }
       const [record] = await ctx.database.get("ggcevo_sign", { handle });
       if (!record) return "请先完成一次正常签到后再进行补签。";
@@ -535,7 +541,7 @@ ${itemDetails.join("\n")}`;
     const handle = `${regionId}-S2-${realmId}-${profileId}`;
     const existingEntries = await ctx.database.get("ggcevo_blacklist", { handle });
     if (existingEntries.length > 0) {
-      return `${handle} 已被加入黑名单。`;
+      return `❌拒绝访问，您已被列入活动黑名单。`;
     }
     const [backpack] = await ctx.database.get("ggcevo_backpack", { handle, itemId: 1 });
     if (!backpack) return "您还没有签到过哦";
@@ -582,7 +588,7 @@ ${itemDetails.join("\n")}`;
     const handle = `${regionId}-S2-${realmId}-${profileId}`;
     const existingEntries = await ctx.database.get("ggcevo_blacklist", { handle });
     if (existingEntries.length > 0) {
-      return `${handle} 已被加入黑名单。`;
+      return `❌拒绝访问，您已被列入活动黑名单。`;
     }
     const [backpack] = await ctx.database.get("ggcevo_backpack", { handle, itemId: 1 });
     if (!backpack) return "您还没有签到过哦";
@@ -823,8 +829,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,7 +845,7 @@ ID：${activity.id}
       (item, index) => `${offset + index + 1}. ${item.displayName} | 积分: ${item.rank} | 参赛: ${item.matches} 次`
     ).join("\n");
     return [
-      `🏆 GGCEvo 胜点榜 🏆`,
+      `🏆 GGCEvo 胜点榜 (S1赛季至3月31日结算) 🏆`,
       `第 ${pageNum} 页 共 ${totalPages} 页`,
       "------------------------------",
       rankingText,
@@ -861,7 +867,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;
@@ -893,7 +900,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;
@@ -1032,7 +1040,7 @@ ${items.join("、")}
       const handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
       const existingEntries = await ctx.database.get("ggcevo_blacklist", { handle });
       if (existingEntries.length > 0) {
-        return `${handle} 已被加入黑名单。`;
+        return `❌拒绝访问，您已被列入活动黑名单。`;
       }
       const configname = itemConfig[name2];
       if (!configname) return "无效的物品名称，请重新输入";
@@ -1120,7 +1128,7 @@ ${output}`;
     const handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
     const existingEntries = await ctx.database.get("ggcevo_blacklist", { handle });
     if (existingEntries.length > 0) {
-      return `${handle} 已被加入黑名单。`;
+      return `❌拒绝访问，您已被列入活动黑名单。`;
     }
     const [backpack] = await ctx.database.get("ggcevo_backpack", { handle, itemId: 3 });
     const [coupon] = await ctx.database.get("ggcevo_backpack", { handle, itemId: 2 });
@@ -1149,7 +1157,7 @@ ${output}`;
     const handle = `${regionId}-S2-${realmId}-${profileId}`;
     const existingEntries = await ctx.database.get("ggcevo_blacklist", { handle });
     if (existingEntries.length > 0) {
-      return `${handle} 已被加入黑名单。`;
+      return `❌拒绝访问，您已被列入活动黑名单。`;
     }
     const [backpack] = await ctx.database.get("ggcevo_backpack", { handle, itemId: 3 });
     if (!backpack || backpack.quantity < 1) {
@@ -1177,8 +1185,14 @@ ${output}`;
     }]);
     return `🎉 恭喜获得：${itemName}`;
   });
-  ctx.command("ggcevo/拉黑 <handle>", "添加用户到黑名单", { authority: 3 }).action(async (_, handle) => {
-    if (!handle) return "请指定需要拉黑的用户";
+  ctx.command("ggcevo/活动拉黑", "添加用户到活动黑名单").action(async (argv) => {
+    const session = argv.session;
+    if (!ctx.config.admins.includes(session.userId)) {
+      return "⚠️ 没有操作权限，请联系机器人管理员";
+    }
+    await session.send("请在30秒内输入需要拉黑的句柄:\n(句柄格式为: [区域ID]-S2-[服务器ID]-[档案ID])");
+    const handle = await session.prompt(3e4);
+    if (!handle) return "输入超时，请重新输入指令。";
     try {
       const handleRegex = /^([1235])-S2-([12])-(\d+)$/;
       if (!handleRegex.test(handle)) {
@@ -1186,13 +1200,43 @@ ${output}`;
       }
       const existingEntries = await ctx.database.get("ggcevo_blacklist", { handle });
       if (existingEntries.length > 0) {
-        return `${handle} 已在黑名单中`;
+        return `${handle} 已在活动黑名单中`;
       }
       await ctx.database.create("ggcevo_blacklist", {
         handle,
         createdAt: /* @__PURE__ */ new Date()
       });
-      return `✅ 用户 ${handle} 已被列入黑名单`;
+      return `✅ 用户 ${handle} 已被列入活动黑名单（永久）`;
+    } catch (error) {
+      console.error("黑名单操作失败:", error);
+      return "操作失败，请稍后重试。错误详情已记录";
+    }
+  });
+  ctx.command("ggcevo/胜点榜拉黑", "添加用户到胜点榜黑名单").action(async (argv) => {
+    const session = argv.session;
+    if (!ctx.config.admins.includes(session.userId)) {
+      return "⚠️ 没有操作权限，请联系机器人管理员";
+    }
+    await session.send("请在30秒内输入需要拉黑的句柄:\n(句柄格式为: [区域ID]-S2-[服务器ID]-[档案ID])");
+    const handle = await session.prompt(3e4);
+    if (!handle) return "输入超时，请重新输入指令。";
+    try {
+      const handleRegex = /^([1235])-S2-([12])-(\d+)$/;
+      if (!handleRegex.test(handle)) {
+        return "句柄格式错误，请重新输入";
+      }
+      const [, regionId, realmId, profileId] = handle.match(handleRegex).map(Number);
+      const existingEntries = await ctx.database.get("ggcevo_rank", { regionId, realmId, profileId, Blacklist: true });
+      if (existingEntries.length > 0) {
+        return `${handle} 已在胜点榜黑名单中`;
+      }
+      await ctx.database.upsert("ggcevo_rank", [{
+        regionId,
+        realmId,
+        profileId,
+        Blacklist: true
+      }]);
+      return `✅ 用户 ${handle} 已被列入胜点榜黑名单（仅限当前赛季）`;
     } catch (error) {
       console.error("黑名单操作失败:", error);
       return "操作失败，请稍后重试。错误详情已记录";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-ggcevo-game",
   "description": "星际争霸2游戏大厅咕咕虫-Evo地图专属插件",
-  "version": "0.4.7",
+  "version": "0.4.9",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [