koishi-plugin-cocoyyy-console 1.1.1 → 1.1.2-beta.1

package/lib/index.js

@@ -500,7 +500,7 @@ var gameFuncMenuList = [
   },
   {
     name: "endgame",
-    description: "结束游戏",
+    description: "游戏进行时使用，结束游戏",
     command: "endgame"
   }
 ];
@@ -1571,12 +1571,6 @@ __name(extractImageAndText, "extractImageAndText");
 async function checkShitOrNot(session, parttern_msg, config) {
   chatHistory = [];
   chatHistory.push({ role: "system", content: [{ type: "text", text: parttern_msg }] });
-  const { err, resp } = await callOpenRouter(config.api_url, config.api_key, config.api_model, chatHistory);
-  if (err != null) {
-    logger.error("[callOpenRouter Error 1]: " + err);
-    return null;
-  }
-  chatHistory.push({ role: "assistant", content: [{ type: "text", text: resp }] });
   const quoteContent = session.quote.content;
   logger.info("[checkShitOrNot Info]: 引用消息内容: " + quoteContent);
   const { imageUrls, text } = extractImageAndText(quoteContent);
@@ -1627,8 +1621,6 @@ son判断模式列表:
   ctx.command("son <参数>", "判定是否为史").action(async ({ session }, ...args) => {
     if (!dev_mode) {
       if (!is_at_bot_quote(session)) return "请提供正确格式，如： [引用消息] @bot son [判断模式]";
-    } else {
-      if (!session.quote) return "请引用消息后使用功能";
     }
     if (think_flag) return "请等待思考结果";
     const parttern = args?.[0];
@@ -2174,6 +2166,7 @@ __name(rerollSituationPuzzle, "rerollSituationPuzzle");
 // src/services/game_func/game_command.ts
 var local_config2 = null;
 var is_thinking = false;
+var now_game = null;
 var gameList = [
   {
     name: "AI海龟汤",
@@ -2182,7 +2175,6 @@ var gameList = [
   }
 ];
 var commandList = [
-  "endgame",
   "gamelist",
   "startgame"
 ];
@@ -2197,7 +2189,7 @@ function registerGameCommands(ctx, game_config, ai_config) {
   } else {
     logger.error("[loadYamlConfig Error]: 未配置 Game 配置文件路径");
   }
-  ctx.command("gamelist", "查看所有游戏").action(async ({ session }) => {
+  ctx.command("gamelist", "查看所有游戏").action(async ({}) => {
     return `[所有命令都需要@bot]
 游戏列表:
 	${gameList.map((item) => item.command + ": " + item.name).join("\n	")}
@@ -2217,6 +2209,7 @@ function registerGameCommands(ctx, game_config, ai_config) {
         case gameList[0].command:
           await session.send("正在开始游戏...后续问答请参照格式：@bot [问题]\n需要刷新谜题时发送：@bot reroll");
           const resp = await startSituationPuzzle(ai_config);
+          now_game = game;
           return checkResp(resp);
         default:
           return `游戏不存在，请输入gamelist查看所有游戏`;
@@ -2225,35 +2218,6 @@ function registerGameCommands(ctx, game_config, ai_config) {
       is_thinking = false;
     }
   });
-  ctx.command("endgame", "结束游戏").action(async ({ session }) => {
-    if (!dev_mode) {
-      if (!is_at_bot(session)) return;
-    }
-    if (!is_gaming) return "未开始游戏";
-    if (is_thinking) return "正在思考，请耐心等待...";
-    try {
-      is_thinking = true;
-      await session.send("正在结束游戏...");
-      const resp = await endSituationPuzzle(ai_config);
-      return checkResp(resp);
-    } finally {
-      is_thinking = false;
-    }
-  });
-  ctx.command("reroll", "重新生成新谜题").action(async ({ session }) => {
-    if (!dev_mode) {
-      if (!is_at_bot(session)) return;
-    }
-    if (!is_gaming) return "未开始游戏";
-    if (is_thinking) return "正在思考，请耐心等待...";
-    try {
-      is_thinking = true;
-      const resp = await rerollSituationPuzzle(ai_config);
-      return checkResp(resp);
-    } finally {
-      is_thinking = false;
-    }
-  });
 }
 __name(registerGameCommands, "registerGameCommands");
 function registerGameMiddleware(ctx, ai_config) {
@@ -2265,23 +2229,42 @@ function registerGameMiddleware(ctx, ai_config) {
     if (is_thinking) return "正在思考，请耐心等待...";
     const withoutTags = content.replace(/<[^>]+>/g, " ");
     const text = withoutTags.replace(/\s+/g, " ").trim();
-    commandList.forEach((element) => {
-      if (text.includes(element)) return next();
-    });
-    try {
-      is_thinking = true;
-      if (text.includes("reroll")) {
-        const resp2 = await rerollSituationPuzzle(ai_config);
-        return checkResp(resp2);
-      }
-      const resp = await questSituationPuzzle(text, ai_config);
-      return (0, import_koishi12.h)("at", { id: userId }) + " " + checkResp(resp);
-    } finally {
-      is_thinking = false;
+    for (const command of commandList) {
+      if (text.includes(command)) return "正在游戏中，请结束游戏后使用该命令";
+    }
+    switch (now_game) {
+      case gameList[0].command:
+        const resp = await situationPuzzleMiddleware(session, ai_config);
+        return resp;
+      default:
+        return next();
     }
   });
 }
 __name(registerGameMiddleware, "registerGameMiddleware");
+async function situationPuzzleMiddleware(session, ai_config) {
+  const { content, uid, userId } = session;
+  const withoutTags = content.replace(/<[^>]+>/g, " ");
+  const text = withoutTags.replace(/\s+/g, " ").trim();
+  try {
+    is_thinking = true;
+    if (text.includes("reroll")) {
+      const resp2 = await rerollSituationPuzzle(ai_config);
+      return checkResp(resp2);
+    }
+    if (text.includes("endgame")) {
+      await session.send("正在结束游戏...");
+      const resp2 = await endSituationPuzzle(ai_config);
+      now_game = null;
+      return checkResp(resp2);
+    }
+    const resp = await questSituationPuzzle(text, ai_config);
+    return (0, import_koishi12.h)("at", { id: userId }) + " " + checkResp(resp);
+  } finally {
+    is_thinking = false;
+  }
+}
+__name(situationPuzzleMiddleware, "situationPuzzleMiddleware");
 function checkResp(resp) {
   if (!resp) {
     return "返回有误，请检查日志";

package/lib/services/game_func/game_command.d.ts

@@ -2,6 +2,7 @@ import { Context } from 'koishi';
 import { GameConfig } from '../../utils/configs/game_config';
 import { AiAPIConfig } from '../../utils/config';
 declare let local_config: any;
+declare let now_game: any;
 declare function registerGameCommands(ctx: Context, game_config: GameConfig, ai_config: AiAPIConfig): void;
 declare function registerGameMiddleware(ctx: Context, ai_config: AiAPIConfig): void;
-export { local_config, registerGameCommands, registerGameMiddleware, };
+export { local_config, now_game, registerGameCommands, registerGameMiddleware, };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-cocoyyy-console",
   "description": "自用koishi插件，功能包含复读，记录黑历史，*人等",
-  "version": "1.1.1",
+  "version": "1.1.2-beta.1",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "contributors": [