koishi-plugin-cocoyyy-console 1.1.3-alpha.6 → 1.1.4

package/lib/index.js

@@ -333,70 +333,71 @@ __name(loadYamlConfig, "loadYamlConfig");
 var menuList = [
   {
     name: "tag",
-    description: "标签功能，用于记录黑历史",
-    command: "maketag [标签]"
+    description: "标签功能，用于记录黑历史"
   },
   {
     name: "repeat",
-    description: "复读功能，用于复读",
-    command: "无"
+    description: "复读功能，用于复读"
   },
   {
     name: "rbq",
-    description: "*人功能，用于*人",
-    command: "无"
+    description: "*人功能，用于*人"
   },
   {
     name: "son",
-    description: "shit_or_not功能，用于鉴别史消息",
-    command: "无"
+    description: "shit_or_not功能，用于鉴别史消息"
   },
   {
     name: "setu",
-    description: "随机涩图功能，用于获取涩图",
-    command: "无"
+    description: "随机涩图功能，用于获取涩图"
+  },
+  {
+    name: "wish",
+    description: "许愿功能，用于许愿"
   },
   {
     name: "game",
-    description: "游戏功能，用于游玩游戏",
-    command: "无"
+    description: "游戏功能，用于游玩游戏"
   },
   {
     name: "kuro",
-    description: "库洛相关功能，用于鸣潮相关功能",
-    command: "无"
+    description: "库洛相关功能，用于鸣潮相关功能"
   }
 ];
 function getMenuList(command = null, functionConfig) {
   switch (command) {
-    case "tag":
+    case menuList[0].name:
       if (!functionConfig.tag_flag)
         return "标签功能已关闭";
       return getTagFuncMenu(command);
-    case "repeat":
+    case menuList[1].name:
       if (!functionConfig.repeat_flag)
         return "复读功能已关闭";
       return `[所有命令都需要@bot]
 复读功能菜单:
 群内重复一定次数的消息会进行复读
 如果遇到问题请联系开发人员。`;
-    case "rbq":
+    case menuList[2].name:
       if (!functionConfig.rbq_flag)
         return "*人功能已关闭";
       return getRbqFuncMenu(command);
-    case "son":
+    case menuList[3].name:
       if (!functionConfig.son_flag)
         return "son功能已关闭";
       return getSonFuncMenu(command);
-    case "setu":
+    case menuList[4].name:
       if (!functionConfig.setu_flag)
         return "son功能已关闭";
       return getSetuFuncMenu(command);
-    case "game":
+    case menuList[5].name:
+      if (!functionConfig.wish_flag)
+        return "许愿功能已关闭";
+      return getWishFuncMenu(command);
+    case menuList[6].name:
       if (!functionConfig.game_flag)
         return "游戏功能已关闭";
       return getGameFuncMenu(command);
-    case "kuro":
+    case menuList[7].name:
       if (!functionConfig.kuro_flag)
         return "库洛相关功能已关闭";
       return getKuroFuncMenu(command);
@@ -524,6 +525,20 @@ setu功能菜单:
 输入对应指令使用setu功能，如果遇到问题请联系开发人员。`;
 }
 __name(getSetuFuncMenu, "getSetuFuncMenu");
+var wishFuncMenuList = [
+  {
+    name: "wish",
+    description: "许愿功能",
+    command: "wish [愿望消息(不要超过80字)]"
+  }
+];
+function getWishFuncMenu(command = null) {
+  return `[所有命令都需要@bot]
+许愿功能菜单:
+	${wishFuncMenuList.map((item) => item.command + ": " + item.description).join("\n	")}
+输入对应指令使用许愿功能，如果遇到问题请联系开发人员。`;
+}
+__name(getWishFuncMenu, "getWishFuncMenu");
 var gameFuncMenuList = [
   {
     name: "gamelist",
@@ -1749,13 +1764,14 @@ async function randomHImg(keywords, ...args) {
     const params = new URLSearchParams();
     params.append("excludeAI", "true");
     params.append("size", "regular");
-    const random = new import_koishi13.Random(() => Math.random());
+    let r18_flag = 0;
     if (r18) {
       if (r18.toLowerCase() === "r18") {
-        params.append("r18", "1");
+        r18_flag = 1;
         tags = keywords?.slice(1);
       }
     }
+    params.append("r18", r18_flag.toString());
     if (args[0]) {
       params.append("num", args[0].toString());
     }
@@ -1878,6 +1894,22 @@ var tools = [
     }
   }
 ];
+function safeParseJSON(jsonString) {
+  if (!jsonString || typeof jsonString !== "string") {
+    throw new Error("输入不是有效的字符串");
+  }
+  let cleaned = jsonString.trim();
+  cleaned = cleaned.replace(/^```(?:json)?\s*\n?/i, "");
+  cleaned = cleaned.replace(/\n?```\s*$/i, "");
+  cleaned = cleaned.trim();
+  try {
+    return JSON.parse(cleaned);
+  } catch (error) {
+    logger.error(`[safeParseJSON Error]: 无法解析 JSON，原始内容: ${jsonString.substring(0, 200)}...`);
+    throw error;
+  }
+}
+__name(safeParseJSON, "safeParseJSON");
 async function checkAudit(local_config4, wish_content, config, wish_config) {
   let prompt_msg = "";
   if (!local_config4) return { result: false, reason: "未加载配置文件，请查看日志" };
@@ -1904,7 +1936,7 @@ async function checkAudit(local_config4, wish_content, config, wish_config) {
       logger.error("[checkAudit Error]: API返回为空");
       return { result: false, reason: "API返回为空" };
     }
-    const json = JSON.parse(resp);
+    const json = safeParseJSON(resp);
     if (json.category == "block") {
       logger.info("[checkAudit Info]: 愿望被拒绝，原因: " + json.reason);
       return { result: false, reason: json.reason };
@@ -1942,7 +1974,11 @@ async function gernerationSoluation(local_config4, wish_content, config, wish_co
       logger.error("[gernerationSoluation Error]: " + err);
       return null;
     }
-    const json = JSON.parse(resp);
+    if (!resp) {
+      logger.error("[gernerationSoluation Error]: API返回为空");
+      return null;
+    }
+    const json = safeParseJSON(resp);
     const scenario = json.scenario;
     if (!scenario) {
       logger.info("[gernerationSoluation Info]: API返回有误: " + resp);
@@ -1974,7 +2010,6 @@ function registerWishCommands(ctx, ai_config, wish_config) {
     if (!dev_mode) {
       if (!is_at_bot(session)) return "请提供正确格式，如： @bot wish [愿望消息(不要超过80字)]";
     }
-    if (think_flag2) return "请等待上一位的祈祷结果";
     const wish_content = args?.[0];
     if (!wish_content) return "输入愿望消息，不要超过80字";
     await session.send("已收到，正在祈祷中...");
@@ -1984,7 +2019,7 @@ function registerWishCommands(ctx, ai_config, wish_config) {
       if (!exec) return "愿望不合规被拒绝，请重新许愿";
       let exec_generation = await gernerationSoluation(local_config2, wish_content, ai_config, wish_config);
       if (!exec_generation) return "愿望实现失败，请重新许愿";
-      return (0, import_koishi14.h)("at", { id: session.userId }) + "\n" + exec_generation;
+      return (0, import_koishi14.h)("at", { id: session.userId }) + " 祈祷成功，愿梦想成真！\n" + exec_generation;
     } finally {
       think_flag2 = false;
     }

package/package.json

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