koishi-plugin-xxck-1 0.2.49 → 0.2.50

package/lib/index.js

@@ -630,8 +630,17 @@ async function _do_register(ctx, session, nickname, masterQQ) {
 __name(_do_register, "_do_register");
 async function _do_check(ctx, session, check_qq, masterQQ, all) {
   ctx.logger.info("========== _do_check 被调用 ==========");
-  const userQQ = session.unifiedQQ || session.userId;
-  ctx.logger.info(`[DEBUG] userQQ=${userQQ}, masterQQ=${masterQQ}`);
+  const userId = session.userId;
+  const isNumeric = /^\d+$/.test(userId);
+  let userQQ = userId;
+  if (!isNumeric) {
+    const records = await ctx.database.get("user_platform_map", {
+      platform_user_id: userId
+    });
+    ctx.logger.info("[手动查询] 映射表结果: " + JSON.stringify(records));
+    if (records.length) userQQ = records[0].qq;
+  }
+  ctx.logger.info(`[手动查询] userQQ=${userQQ}, masterQQ=${masterQQ}`);
   if (userQQ !== masterQQ) {
     return await session.send(build_msg(session, session.text("error.common.noPermission")));
   }
@@ -726,7 +735,6 @@ async function _do_sign(ctx, session, signResetHour, signResetMinute) {
     `${session.text("tip.sign.success")}
 ${session.text("tip.sign.getDraw", { count: SIGN_DRAW_COUNT, left: newDrawCount })}`
   ));
-  await giveDailyBattleShard(ctx, qq);
 }
 __name(_do_sign, "_do_sign");
 async function _do_add_card(ctx, session, card_lines, masterQQ) {
@@ -1802,23 +1810,6 @@ async function _do_reject(ctx, session, rejectQQ, masterQQ) {
   }
 }
 __name(_do_reject, "_do_reject");
-async function giveDailyBattleShard(ctx, qq) {
-  let user = await ctx.database.get("gacha_user_battle_shard", { qq });
-  let data = user[0] || { qq, target_card_id: "", shard: 0, awake_ticket: 0 };
-  const own = await ctx.database.get("gacha_user_card", { qq });
-  const pool = await ctx.database.get("gacha_battle_card", {});
-  const avail = own.filter(
-    (o) => pool.some((p) => p.card_id === o.card_id)
-  ).map((o) => o.card_id);
-  if (avail.length === 0) return;
-  let target = data.target_card_id;
-  if (!target || !avail.includes(target)) {
-    target = avail[Math.floor(Math.random() * avail.length)];
-  }
-  data.shard += 2;
-  await ctx.database.upsert("gacha_user_battle_shard", [data]);
-}
-__name(giveDailyBattleShard, "giveDailyBattleShard");
 async function _do_help(ctx, session) {
   const helpMsg = session.text("command.wwc.help.title") + "\n" + session.text("command.wwc.help.register") + "\n" + session.text("command.wwc.help.sign") + "\n" + session.text("command.wwc.help.draw") + "\n" + session.text("command.wwc.help.warehouse") + "\n" + session.text("command.wwc.help.shop") + "\n" + session.text("command.wwc.help.upgrade") + "\n" + session.text("command.wwc.help.exchange") + "\n" + session.text("command.wwc.help.collection") + "\n" + session.text("command.wwc.help.ranking") + "\n" + session.text("command.wwc.help.eventStatus") + "\n" + session.text("command.wwc.help.eventDraw") + "\n" + session.text("command.wwc.help.eventExchange") + "\n" + session.text("command.wwc.help.tip");
   await session.send(build_msg(session, helpMsg));
@@ -1974,15 +1965,11 @@ async function apply(ctx, config) {
     await _do_register(ctx, session, nickname, config.masterQQ);
   });
   ctx.command("WWC审核 [QQ]", "审核用户昵称，仅主人可用").option("-a, --all", "通过所有待审核用户").alias("wwc审核").alias("WWC通过").action(async (argv, qq) => {
-    ctx.logger.info("[WWC审核] action 被触发，argv.options=" + JSON.stringify(argv.options));
-    if (!argv.session) {
-      ctx.logger.info("[WWC审核] argv.session 为空，返回");
-      return;
-    }
-    const session = argv.session;
-    const isAll = !!argv.options?.["all"];
+    ctx.logger.info("[WWC审核] action 触发，argv.options=" + JSON.stringify(argv.options));
+    if (!argv.session) return;
+    const isAll = !!(argv.options?.["-a"] || argv.options?.["--all"] || argv.options?.["all"]);
     ctx.logger.info("[WWC审核] isAll=" + isAll + ", qq=" + qq);
-    await _do_check(ctx, session, qq, config.masterQQ, isAll);
+    await _do_check(ctx, argv.session, qq, config.masterQQ, isAll);
   });
   ctx.command("WWC驳回 <QQ:string>", "驳回昵称申请，显示QQ或原昵称").alias("wwc驳回").action(async (argv, qq) => {
     if (!argv.session) return;
@@ -2133,7 +2120,6 @@ async function apply(ctx, config) {
     if (!raw.startsWith("WWC")) return next();
     if (raw.startsWith("WWC绑定QQ")) return next();
     const userId = session.userId;
-    const platform = session.platform;
     const isNumeric = /^\d+$/.test(userId);
     let unifiedQQ = null;
     if (isNumeric) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-xxck-1",
   "description": "抽卡系统|完整指令说明见readme|建议使用skia-canvas",
-  "version": "0.2.49",
+  "version": "0.2.50",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [