koishi-plugin-ggcevo-game 0.3.21 → 0.3.23

package/lib/index.d.ts

@@ -91,7 +91,6 @@ export interface adminbenefit {
     lastSign: Date;
 }
 export interface blacklist {
-    userId: string;
     handle: string;
     createdAt: Date;
 }

package/lib/index.js

@@ -149,16 +149,15 @@ function apply(ctx, config) {
     lastSign: "timestamp"
   }, {
     // 额外配置
-    primary: "userId"
+    primary: "handle"
   });
   ctx.model.extend("ggcevo_blacklist", {
     // 各字段定义
-    userId: "string",
     handle: "string",
     createdAt: "timestamp"
   }, {
     // 额外配置
-    primary: "userId"
+    primary: "handle"
   });
   const initDefaultItems = {
     "咕咕币": { id: 1, type: "抽奖道具", description: "用于进行抽奖" },
@@ -240,6 +239,10 @@ function apply(ctx, config) {
     }
     const { regionId, realmId, profileId } = profile;
     const handle = `${regionId}-S2-${realmId}-${profileId}`;
+    const existingEntries = await ctx.database.get("ggcevo_blacklist", { handle });
+    if (existingEntries.length > 0) {
+      return `${handle} 已被加入黑名单。`;
+    }
     const [backpack] = await ctx.database.get("ggcevo_backpack", { handle, itemId: 1 });
     if (!backpack) {
       return "您还没有进行过签到。";
@@ -275,6 +278,10 @@ function apply(ctx, config) {
     }
     const { regionId, realmId, profileId } = profile;
     const handle = `${regionId}-S2-${realmId}-${profileId}`;
+    const existingEntries = await ctx.database.get("ggcevo_blacklist", { handle });
+    if (existingEntries.length > 0) {
+      return `${handle} 已被加入黑名单。`;
+    }
     const [backpack] = await ctx.database.get("ggcevo_backpack", { handle, itemId: 1 });
     if (!backpack) {
       return "您还没有进行过签到。";
@@ -304,6 +311,10 @@ function apply(ctx, config) {
     }
     const { regionId, realmId, profileId } = profile;
     const handle = `${regionId}-S2-${realmId}-${profileId}`;
+    const existingEntries = await ctx.database.get("ggcevo_blacklist", { handle });
+    if (existingEntries.length > 0) {
+      return `${handle} 已被加入黑名单。`;
+    }
     const [backpack] = await ctx.database.get("ggcevo_backpack", { handle, itemId: 1 });
     if (!backpack) {
       return "您还没有进行过签到。";
@@ -374,6 +385,10 @@ ${itemDetails.join("\n")}`;
       }
       const { regionId, realmId, profileId } = profile;
       const handle = `${regionId}-S2-${realmId}-${profileId}`;
+      const existingEntries = await ctx.database.get("ggcevo_blacklist", { handle });
+      if (existingEntries.length > 0) {
+        return `${handle} 已被加入黑名单。`;
+      }
       if (config.signrequire) {
         const getconfig = {
           url: `https://api.sc2arcade.com/profiles/${regionId}/${realmId}/${profileId}/matches?orderDirection=desc`,
@@ -446,6 +461,10 @@ ${itemDetails.join("\n")}`;
       if (!profile) return "您的 QQ 未绑定句柄。";
       const { regionId, realmId, profileId } = profile;
       const handle = `${regionId}-S2-${realmId}-${profileId}`;
+      const existingEntries = await ctx.database.get("ggcevo_blacklist", { handle });
+      if (existingEntries.length > 0) {
+        return `${handle} 已被加入黑名单。`;
+      }
       const [record] = await ctx.database.get("ggcevo_sign", { handle });
       if (!record) return "请先完成一次正常签到后再进行补签。";
       const lastSignChina = convertUTCtoChinaTime(new Date(record.lastSign));
@@ -453,8 +472,6 @@ ${itemDetails.join("\n")}`;
       targetDateChina.setDate(targetDateChina.getDate() + 1);
       const targetDateUTC = new Date(targetDateChina.getTime() - 8 * 60 * 60 * 1e3);
       const nowChina = convertUTCtoChinaTime(/* @__PURE__ */ new Date());
-      console.log(targetDateChina);
-      console.log(nowChina);
       if (isSameDate(targetDateChina, nowChina)) {
         return "您需要补签的日期是今天，请进行正常签到。";
       }
@@ -523,6 +540,10 @@ ${itemDetails.join("\n")}`;
     if (!profile) return "您的 QQ 未绑定句柄。";
     const { regionId, realmId, profileId } = profile;
     const handle = `${regionId}-S2-${realmId}-${profileId}`;
+    const existingEntries = await ctx.database.get("ggcevo_blacklist", { handle });
+    if (existingEntries.length > 0) {
+      return `${handle} 已被加入黑名单。`;
+    }
     const [backpack] = await ctx.database.get("ggcevo_backpack", { handle, itemId: 1 });
     if (!backpack) return "您还没有签到过哦";
     const memberInfo = await session.event?.member?.roles;
@@ -566,6 +587,10 @@ ${itemDetails.join("\n")}`;
     if (!profile) return "您的 QQ 未绑定句柄。";
     const { regionId, realmId, profileId } = profile;
     const handle = `${regionId}-S2-${realmId}-${profileId}`;
+    const existingEntries = await ctx.database.get("ggcevo_blacklist", { handle });
+    if (existingEntries.length > 0) {
+      return `${handle} 已被加入黑名单。`;
+    }
     const [backpack] = await ctx.database.get("ggcevo_backpack", { handle, itemId: 1 });
     if (!backpack) return "您还没有签到过哦";
     const [activity] = await ctx.database.get("ggcevo_activity", {
@@ -1000,6 +1025,10 @@ ${items.join("、")}
       const name2 = await session.prompt(3e4);
       if (!name2) return "输入超时，请重新输入指令。";
       const handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
+      const existingEntries = await ctx.database.get("ggcevo_blacklist", { handle });
+      if (existingEntries.length > 0) {
+        return `${handle} 已被加入黑名单。`;
+      }
       const configname = itemConfig[name2];
       if (!configname) return "无效的物品名称，请重新输入";
       const userRecords = await ctx.database.get("ggcevo_exchange", { handle, item: name2 });
@@ -1081,6 +1110,10 @@ ${output}`;
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
     if (!profile) return "您的 QQ 未绑定句柄";
     const handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
+    const existingEntries = await ctx.database.get("ggcevo_blacklist", { handle });
+    if (existingEntries.length > 0) {
+      return `${handle} 已被加入黑名单。`;
+    }
     const [backpack] = await ctx.database.get("ggcevo_backpack", { handle, itemId: 3 });
     const [coupon] = await ctx.database.get("ggcevo_backpack", { handle, itemId: 2 });
     if (!coupon || coupon.quantity < 3) {
@@ -1106,6 +1139,10 @@ ${output}`;
     }
     const { regionId, realmId, profileId } = profile;
     const handle = `${regionId}-S2-${realmId}-${profileId}`;
+    const existingEntries = await ctx.database.get("ggcevo_blacklist", { handle });
+    if (existingEntries.length > 0) {
+      return `${handle} 已被加入黑名单。`;
+    }
     const [backpack] = await ctx.database.get("ggcevo_backpack", { handle, itemId: 3 });
     if (!backpack || backpack.quantity < 1) {
       return `当前扭蛋币不足，剩余：${backpack?.quantity || 0}枚`;
@@ -1139,21 +1176,11 @@ ${output}`;
       if (!handleRegex.test(handle)) {
         return "句柄格式错误，请重新输入";
       }
-      const [, regionId, realmId, profileId] = handle.match(handleRegex).map(Number);
       const existingEntries = await ctx.database.get("ggcevo_blacklist", { handle });
       if (existingEntries.length > 0) {
         return `${handle} 已在黑名单中`;
       }
-      const [profile] = await ctx.database.get("sc2arcade_player", {
-        regionId,
-        realmId,
-        profileId
-      }, ["userId"]);
-      if (!profile) {
-        return `未找到与 ${handle} 绑定的QQ号`;
-      }
       await ctx.database.create("ggcevo_blacklist", {
-        userId: profile.userId,
         handle,
         createdAt: /* @__PURE__ */ new Date()
       });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-ggcevo-game",
   "description": "星际争霸2游戏大厅地图咕咕虫-evo小游戏",
-  "version": "0.3.21",
+  "version": "0.3.23",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [