koishi-plugin-cocoyyy-console 1.0.16-beta.8 → 1.0.16

package/lib/index.js

@@ -30,7 +30,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
-  Config: () => Config2,
+  Config: () => Config,
   apply: () => apply,
   dev_mode: () => dev_mode,
   logger: () => logger,
@@ -300,6 +300,11 @@ var menuList = [
     description: "*人功能，用于*人",
     command: "无"
   },
+  {
+    name: "son",
+    description: "shit_or_not功能，用于鉴别史消息",
+    command: "无"
+  },
   {
     name: "kuro",
     description: "库洛相关功能，用于鸣潮相关功能",
@@ -1434,7 +1439,7 @@ async function callOpenRouter(api_url, api_key, api_model = "gpt-4o-mini", messa
     const { data } = await import_axios.default.post(
       api_url,
       {
-        api_model,
+        model: api_model,
         messages
       },
       {
@@ -1491,19 +1496,17 @@ function extractImageAndText(content) {
     }
     return " ";
   });
-  const text = stripped.replace(/\s+/g, " ").trim();
+  const withoutTags = stripped.replace(/<[^>]+>/g, " ");
+  const text = withoutTags.replace(/\s+/g, " ").trim();
   return { imageUrls, text };
 }
 __name(extractImageAndText, "extractImageAndText");
 async function checkShitOrNot(session, parttern_msg, config) {
   chatHistory = [];
   chatHistory.push({ role: "user", content: [{ type: "text", text: parttern_msg }] });
-  if (dev_mode) {
-    logger.info("[checkShitOrNot Info]: chatHistory", { chatHistory });
-  }
   const { err, resp } = await callOpenRouter(config.api_url, config.api_key, config.api_model, chatHistory);
   if (err != null) {
-    logger.error("[callOpenRouter Error1]: " + err);
+    logger.error("[callOpenRouter Error 1]: " + err);
     return null;
   }
   chatHistory.push({ role: "assistant", content: [{ type: "text", text: resp }] });
@@ -1520,7 +1523,7 @@ async function checkShitOrNot(session, parttern_msg, config) {
   chatHistory.push({ role: "user", content: targetContent });
   const { err: err2, resp: resp2 } = await callOpenRouter(config.api_url, config.api_key, config.api_model, chatHistory);
   if (err2 != null) {
-    logger.error("[callOpenRouter Error2]: " + err2);
+    logger.error("[callOpenRouter Error 2]: " + err2);
     return null;
   }
   return resp2;
@@ -1529,38 +1532,6 @@ __name(checkShitOrNot, "checkShitOrNot");
 
 // src/services/son_func/shit_or_not_command.ts
 var local_config = null;
-var mode_intro = {
-  "esu": "【图文】ohno妈咪饿素啊😨，恶俗慎用！🈲",
-  "nov": "【图文】来段微小说📕",
-  "lit": "【图文】文楠魅力时刻📕👨",
-  "zhi": "【图文】分享你刚编的故事🤓",
-  "boa": "【图文】《答案之书》🔮",
-  "scp": "【图文】控制-收容-保护，献上你的异常👽",
-  "phi": "【图文】我思，故我在🧠",
-  "see": "【图像】让我康康怎么个事👀",
-  "ccb": "【图像】压抑笑传之踩踩背🐘"
-};
-function loadYamlConfig(configPath) {
-  if (!configPath) {
-    logger.error("[loadYamlConfig Error]: SON 配置文件路径未配置");
-    return null;
-  }
-  try {
-    const trimmedPath = configPath.trim();
-    const fullPath = import_path3.default.isAbsolute(trimmedPath) ? trimmedPath : import_path3.default.resolve(process.cwd(), trimmedPath);
-    if (!(0, import_fs3.existsSync)(fullPath)) {
-      logger.error(`[loadYamlConfig Error]: SON 配置文件不存在: ${fullPath}`);
-      return null;
-    }
-    const fileContent = (0, import_fs3.readFileSync)(fullPath, "utf-8");
-    const config = yaml.load(fileContent);
-    return config;
-  } catch (error) {
-    logger.error(`[loadYamlConfig Error]: SON 读取配置文件失败: ${configPath}`, error);
-    return null;
-  }
-}
-__name(loadYamlConfig, "loadYamlConfig");
 function registerShitOrNotCommands(ctx, config) {
   if (config?.config_path) {
     local_config = loadYamlConfig(config.config_path);
@@ -1572,19 +1543,25 @@ function registerShitOrNotCommands(ctx, config) {
   } else {
     logger.error("[loadYamlConfig Error]: 未配置 SON 配置文件路径");
   }
-  ctx.command("sonlist <参数>", "查看son判断模式列表").action(() => {
+  ctx.command("sonlist <参数>", "查看son判断模式列表").action(async ({ session }) => {
+    if (!dev_mode) {
+      if (!is_at_bot(session)) return;
+    }
+    if (!local_config) return "未加载配置文件，请查看日志";
+    const mode_intro = local_config?.shit_or_not?.menu;
+    if (!mode_intro) return "未找到判断模式列表，请查看日志";
     return `[所有命令都需要@bot]
 son判断模式列表:
 	${Object.keys(mode_intro).map((item) => item + ": " + mode_intro[item]).join("\n	")}`;
   });
   ctx.command("son <参数>", "判定是否为史").action(async ({ session }, ...args) => {
     if (!dev_mode) {
-      if (!is_at_bot_quote(session)) return "请提供正确格式1，如： [引用消息] @bot son [判断模式]";
+      if (!is_at_bot_quote(session)) return "请提供正确格式，如： [引用消息] @bot son [判断模式]";
     } else {
-      if (!session.quote) return "请提供正确格式2，如： [引用消息] @bot son [判断模式]";
+      if (!session.quote) return "请引用消息后使用功能";
     }
     const parttern = args?.[0];
-    if (!parttern) return "请提供正确格式3，如： [引用消息] @bot son [判断模式]";
+    if (!parttern) return "请提供正确判断模式，如： [引用消息] @bot son [判断模式]";
     if (!local_config) return "未加载配置文件，请查看日志";
     const parttern_msg = local_config.shit_or_not?.prompts[parttern];
     if (!parttern_msg) return "未找到判断模式，请查看日志";
@@ -1593,6 +1570,32 @@ son判断模式列表:
   });
 }
 __name(registerShitOrNotCommands, "registerShitOrNotCommands");
+function loadYamlConfig(configPath) {
+  if (!configPath) {
+    logger.error("[loadYamlConfig Error]: SON 配置文件路径未配置");
+    return null;
+  }
+  try {
+    const trimmedPath = configPath.trim();
+    const fullPath = import_path3.default.isAbsolute(trimmedPath) ? trimmedPath : import_path3.default.resolve(process.cwd(), trimmedPath);
+    if (!(0, import_fs3.existsSync)(fullPath)) {
+      logger.error(`[loadYamlConfig Error]: SON 配置文件不存在: ${fullPath}`);
+      return null;
+    }
+    const fileContent = (0, import_fs3.readFileSync)(fullPath, "utf-8");
+    const config = yaml.load(fileContent);
+    return config;
+  } catch (error) {
+    logger.error(`[loadYamlConfig Error]: SON 读取配置文件失败: ${configPath}`, error);
+    return null;
+  }
+}
+__name(loadYamlConfig, "loadYamlConfig");
+function extractAtId(content) {
+  const match = content.match(/<at\b[^>]*id=["']?(\d+)["']?[^>]*>/i);
+  return match ? match[1] : null;
+}
+__name(extractAtId, "extractAtId");
 function is_at_bot_quote(session) {
   if (!session.quote)
     return false;
@@ -1601,17 +1604,10 @@ function is_at_bot_quote(session) {
   const quoteUserId = quote.user.id;
   const quoteContent = quote.content;
   const botId = session?.bot?.selfId ?? session?.selfId;
-  if (dev_mode)
-    logger.info(`command: quoteContent: ${quoteContent}, quoteUserId: ${quoteUserId},content: ${content} userId: ${userId}`);
   const elements = quote.elements || [];
-  for (const elem of elements) {
-    if (elem.type === "at") {
-      const atId = elem.attrs.id;
-      if (String(atId) === String(botId)) {
-        return true;
-      }
-    }
-  }
+  const atId = extractAtId(session.content);
+  if (atId === botId)
+    return true;
   return false;
 }
 __name(is_at_bot_quote, "is_at_bot_quote");
@@ -2027,7 +2023,7 @@ __name(registerKuroCommands, "registerKuroCommands");
 // src/index.ts
 var name = "cocoyyy-console";
 var dev_mode;
-var Config2 = import_koishi10.Schema.object({
+var Config = import_koishi10.Schema.object({
   function_config: FunctionConfigSchema.description("功能开关配置"),
   redis_config: RedisConfigSchema.description("Redis配置"),
   mysql_config: MysqlConfigSchema.description("MySQL 数据库配置"),

package/package.json

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