koishi-plugin-xxck-1 0.2.6 → 0.2.7

package/lib/index.js

@@ -2087,13 +2087,29 @@ async function apply(ctx, config) {
     const session = argv.session;
     if (!session) return;
     const content = session.content || "";
-    const atMatch = content.match(/\[CQ:at,qq=(\d+)\]/);
-    if (!atMatch) return await session.send(build_msg(session, "请@你要挑战的人"));
-    await doBattleChallenge(ctx, session, atMatch[1]);
+    let targetQQ = null;
+    const cqMatch = content.match(/\[CQ:at,qq=(\d+)\]/i);
+    if (cqMatch) {
+      targetQQ = cqMatch[1];
+    } else {
+      const atMatch = content.match(/@(\d+)/);
+      if (atMatch) {
+        targetQQ = atMatch[1];
+      }
+    }
+    if (!targetQQ) {
+      return await session.send(build_msg(session, "请@你要挑战的人，如：WWC对战@123456"));
+    }
+    await doBattleChallenge(ctx, session, targetQQ);
   });
   ctx.command("同意", "同意对战").action(async (argv) => {
     const session = argv.session;
-    if (session) await doBattleAgree(ctx, session);
+    if (!session) return;
+    const qq = session.userId?.toString();
+    if (!qq || !battlePending2.has(qq)) {
+      return await session.send(build_msg(session, "没有待处理的对战请求"));
+    }
+    await doBattleAgree(ctx, session);
   });
   ctx.command("拒绝", "拒绝对战").action(async (argv) => {
     const session = argv.session;
@@ -2101,7 +2117,9 @@ async function apply(ctx, config) {
     const qq = session.userId?.toString();
     if (qq && battlePending2.has(qq)) {
       battlePending2.delete(qq);
-      await session.send(build_msg(session, "已拒绝"));
+      await session.send(build_msg(session, "已拒绝对战"));
+    } else {
+      await session.send(build_msg(session, "没有待处理的对战请求"));
     }
   });
   ctx.command("WWC对战记录", "查看对战记录").action(async (argv) => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-xxck-1",
   "description": "自用（？）抽卡系统|完整指令说明见readme|建议使用skia-canvas|指令与本地化已经基本完成",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [