koishi-plugin-cocoyyy-console 1.2.1 → 1.2.2-alpha.1

package/lib/index.js

@@ -381,19 +381,62 @@ function loadGroupFunctionLimitConfig(config) {
   }
 }
 __name(loadGroupFunctionLimitConfig, "loadGroupFunctionLimitConfig");
+function getEffectiveMenuListForGuild(guildId) {
+  if (!groupFunctionLimitConfig || groupFunctionLimitConfig.length === 0) {
+    return [];
+  }
+  const explicit = groupFunctionLimitConfig.find(
+    (item) => String(item.group_id) === String(guildId)
+  );
+  if (explicit) {
+    return Array.isArray(explicit.menu_list) ? explicit.menu_list : [];
+  }
+  const defaultEntry = groupFunctionLimitConfig.find(
+    (item) => String(item.group_id) === "#"
+  );
+  if (defaultEntry) {
+    return Array.isArray(defaultEntry.menu_list) ? defaultEntry.menu_list : [];
+  }
+  return [];
+}
+__name(getEffectiveMenuListForGuild, "getEffectiveMenuListForGuild");
+function isFunctionAllowedForGuild(guildId, menuNumber) {
+  if (!groupFunctionLimitConfig || groupFunctionLimitConfig.length === 0) {
+    return null;
+  }
+  if (guildId === void 0 || guildId === null) {
+    return null;
+  }
+  return getEffectiveMenuListForGuild(guildId).includes(menuNumber);
+}
+__name(isFunctionAllowedForGuild, "isFunctionAllowedForGuild");
+function getAllowedMenuNumbersForGuild(guildId) {
+  if (!groupFunctionLimitConfig || groupFunctionLimitConfig.length === 0) {
+    return null;
+  }
+  if (guildId === void 0 || guildId === null) {
+    return null;
+  }
+  const allMenus = menuList ?? [];
+  if (allMenus.length === 0) {
+    return null;
+  }
+  const validNumbers = new Set(allMenus.map((item) => item.number));
+  return getEffectiveMenuListForGuild(guildId).filter((n) => validNumbers.has(n));
+}
+__name(getAllowedMenuNumbersForGuild, "getAllowedMenuNumbersForGuild");
 function getCtxForFunction(ctx, menuNumber) {
   if (!groupFunctionLimitConfig || groupFunctionLimitConfig.length === 0) {
     return ctx;
   }
-  const defaultEntry = groupFunctionLimitConfig.find((item) => String(item.group_id) === "#");
-  const defaultAllowed = defaultEntry ? defaultEntry.menu_list.includes(menuNumber) : false;
+  const defaultAllowed = isFunctionAllowedForGuild("#", menuNumber) ?? false;
   const explicitGroups = groupFunctionLimitConfig.filter((item) => String(item.group_id) !== "#");
   if (defaultAllowed) {
-    const excludedIds = explicitGroups.filter((item) => !item.menu_list.includes(menuNumber)).map((item) => String(item.group_id));
+    const excludedIds = explicitGroups.filter((item) => !getEffectiveMenuListForGuild(item.group_id).includes(menuNumber)).map((item) => String(item.group_id));
     if (excludedIds.length === 0) return ctx;
     return ctx.exclude((session) => !!session.guildId && excludedIds.includes(session.guildId));
   } else {
-    const includedIds = explicitGroups.filter((item) => item.menu_list.includes(menuNumber)).map((item) => String(item.group_id));
+    const includedIds = explicitGroups.filter((item) => getEffectiveMenuListForGuild(item.group_id).includes(menuNumber)).map((item) => String(item.group_id));
     if (includedIds.length === 0) {
       logger.info(`[getCtxForFunction Info]: 功能 ${menuNumber} 在所有群组中均未启用，跳过注册`);
       return null;
@@ -402,38 +445,16 @@ function getCtxForFunction(ctx, menuNumber) {
   }
 }
 __name(getCtxForFunction, "getCtxForFunction");
-function getGroupFunctionLimitConfig() {
-  return groupFunctionLimitConfig;
-}
-__name(getGroupFunctionLimitConfig, "getGroupFunctionLimitConfig");
 function getMenuList() {
   return menuList;
 }
 __name(getMenuList, "getMenuList");
 
 // src/services/menu_service.ts
-function getAllowedMenuNumbersForGuild(guildId) {
-  const groupList = getGroupFunctionLimitConfig();
-  if (!groupList || groupList.length === 0) return null;
-  if (guildId === void 0 || guildId === null) return null;
-  const allMenus = getMenuList() ?? [];
-  if (!allMenus || allMenus.length === 0) return null;
-  const match = groupList.find(
-    (item) => String(item.group_id) === String(guildId)
-  );
-  if (!match) return null;
-  if (!Array.isArray(match.menu_list)) return null;
-  const menuByNumber = /* @__PURE__ */ new Map();
-  for (const item of allMenus) {
-    menuByNumber.set(item.number, item.number);
-  }
-  return match.menu_list.map((menuNum) => Number(menuByNumber.get(menuNum)));
-}
-__name(getAllowedMenuNumbersForGuild, "getAllowedMenuNumbersForGuild");
 function isCommandAllowedForGuild(commandNumber, guildId) {
-  const allowed = getAllowedMenuNumbersForGuild(guildId);
-  if (!allowed) return true;
-  return allowed.includes(commandNumber);
+  const allowed = isFunctionAllowedForGuild(guildId, commandNumber);
+  if (allowed === null) return true;
+  return allowed;
 }
 __name(isCommandAllowedForGuild, "isCommandAllowedForGuild");
 function buildFuncMenu(menuTitle, featureName, commandList2) {
@@ -444,7 +465,7 @@ ${menuTitle}:
 }
 __name(buildFuncMenu, "buildFuncMenu");
 function getMenuListByCommand(command = null, functionConfig, session) {
-  const guildId = session?.event?.guild?.id;
+  const guildId = session?.guildId;
   const allMenus = getMenuList() ?? [];
   if (allMenus.length === 0) return "当前没有可用的功能，请联系管理员配置功能";
   const menuByNumber = /* @__PURE__ */ new Map();
@@ -517,7 +538,7 @@ function getMenuListByCommand(command = null, functionConfig, session) {
       return buildFuncMenu("禁漫下载功能菜单", "禁漫下载功能", jmFuncMenuList);
     default:
       const allowedMenuNumbers = getAllowedMenuNumbersForGuild(guildId);
-      const finalMenuList = allowedMenuNumbers ? allMenus.filter((item) => allowedMenuNumbers.includes(item.number)) : allMenus;
+      const finalMenuList = allowedMenuNumbers === null ? allMenus : allMenus.filter((item) => allowedMenuNumbers.includes(item.number));
       return `[所有命令都需要@bot]
 当前可用功能列表:
 	${finalMenuList.map((item) => item.name + ": " + item.description).join("\n	")}
@@ -1760,6 +1781,68 @@ function extractImageAndText(content) {
   return { imageUrls, text };
 }
 __name(extractImageAndText, "extractImageAndText");
+function extractFromForwardChildren(children) {
+  const allTexts = [];
+  const allImageUrls = [];
+  for (const msgEl of children) {
+    if (msgEl.type !== "message") continue;
+    const msgChildren = msgEl.children ?? [];
+    const authorEl = msgChildren.find((c) => c.type === "author");
+    const senderName = authorEl?.attrs?.name ?? String(authorEl?.attrs?.id ?? "未知");
+    const msgTexts = [];
+    for (const child of msgChildren) {
+      if (child.type === "text") {
+        const t = child.attrs?.content ?? "";
+        if (t) msgTexts.push(t);
+      } else if (child.type === "img" || child.type === "image") {
+        const url = child.attrs?.src ?? child.attrs?.url ?? "";
+        if (url) allImageUrls.push(url);
+      }
+    }
+    if (msgTexts.length > 0) {
+      allTexts.push(`[${senderName}]: ${msgTexts.join("")}`);
+    }
+  }
+  return { imageUrls: allImageUrls, text: allTexts.join("\n") };
+}
+__name(extractFromForwardChildren, "extractFromForwardChildren");
+async function fetchForwardMessages(session, forwardId) {
+  try {
+    const result = await session.bot.internal.getForwardMsg({ id: forwardId });
+    const messages = result?.messages ?? [];
+    const allTexts = [];
+    const allImageUrls = [];
+    for (const msg of messages) {
+      const sender = msg?.sender?.nickname ?? String(msg?.sender?.user_id ?? "未知");
+      const segments = msg?.message ?? msg?.content ?? [];
+      const msgTexts = [];
+      for (const seg of segments) {
+        if (seg.type === "text") {
+          const t = seg.data?.text ?? "";
+          if (t) msgTexts.push(t);
+        } else if (seg.type === "image") {
+          const url = seg.data?.url ?? seg.data?.file ?? "";
+          if (url) allImageUrls.push(url);
+        }
+      }
+      if (msgTexts.length > 0) {
+        allTexts.push(`[${sender}]: ${msgTexts.join("")}`);
+      }
+    }
+    return { imageUrls: allImageUrls, text: allTexts.join("\n") };
+  } catch (e) {
+    logger.error("[fetchForwardMessages Error]: 获取转发消息失败: " + e);
+    return { imageUrls: [], text: "" };
+  }
+}
+__name(fetchForwardMessages, "fetchForwardMessages");
+function extractForwardId(elements, content) {
+  const forwardEl = elements.find((el) => el.type === "forward");
+  if (forwardEl?.attrs?.id) return String(forwardEl.attrs.id);
+  const match = content.match(/<forward\b[^>]*\bid=["']?([^"'\s>/]+)["']?/i);
+  return match?.[1] ?? null;
+}
+__name(extractForwardId, "extractForwardId");
 async function checkShitOrNot(session, parttern_msg, config) {
   chatHistory = [];
   chatHistory.push({ role: "system", content: [{ type: "text", text: parttern_msg }] });
@@ -1784,6 +1867,59 @@ async function checkShitOrNot(session, parttern_msg, config) {
   return resp2;
 }
 __name(checkShitOrNot, "checkShitOrNot");
+async function checkShitOrNot_v2(session, parttern_msg, config) {
+  chatHistory = [];
+  chatHistory.push({ role: "system", content: [{ type: "text", text: parttern_msg }] });
+  const quoteContent = session.quote.content;
+  const quoteElements = session.quote.elements ?? [];
+  logger.info("[checkShitOrNot_v2 Info]: 引用消息内容: " + quoteContent);
+  let imageUrls = [];
+  let text = "";
+  let isForward = false;
+  const forwardId = extractForwardId(quoteElements, quoteContent);
+  if (forwardId) {
+    isForward = true;
+    logger.info("[checkShitOrNot_v2 Info]: 检测到转发聊天记录，ID: " + forwardId);
+    const forwardEl = quoteElements.find((el) => el.type === "forward");
+    const forwardChildren = forwardEl?.children ?? [];
+    if (forwardChildren.length > 0) {
+      const extracted = extractFromForwardChildren(forwardChildren);
+      imageUrls = extracted.imageUrls;
+      text = extracted.text;
+      logger.info("[checkShitOrNot_v2 Info]: 从 children 提取转发内容，共 " + forwardChildren.length + " 条");
+    }
+    if (!text && imageUrls.length === 0) {
+      logger.info("[checkShitOrNot_v2 Info]: children 为空，尝试通过 NapCat API 拉取转发消息");
+      const extracted = await fetchForwardMessages(session, forwardId);
+      imageUrls = extracted.imageUrls;
+      text = extracted.text;
+    }
+  } else {
+    const extracted = extractImageAndText(quoteContent);
+    imageUrls = extracted.imageUrls;
+    text = extracted.text;
+  }
+  if (!text && imageUrls.length === 0) {
+    logger.warn("[checkShitOrNot_v2 Warn]: 引用消息中未发现文本或图片");
+    return isForward ? "转发聊天记录中未发现可分析的文本或图片" : "引用消息中未发现文本或图片";
+  }
+  logger.info("[checkShitOrNot_v2 Info]: 提取图片 URL: " + imageUrls.join(", "));
+  const displayText = isForward ? `以下是转发聊天记录的内容:
+
+${text}` : text;
+  const targetContent = [
+    ...displayText ? [{ type: "text", text: displayText }] : [],
+    ...imageUrls.map((url) => ({ type: "image_url", image_url: { url } }))
+  ];
+  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("[checkShitOrNot_v2 Error]: " + err2);
+    return null;
+  }
+  return resp2;
+}
+__name(checkShitOrNot_v2, "checkShitOrNot_v2");
 
 // src/services/son_func/shit_or_not_command.ts
 var local_config = null;
@@ -1830,6 +1966,26 @@ son判断模式列表:
       think_flag = false;
     }
   });
+  ctx.command("sonv2 <参数>", "判定是否为史").action(async ({ session }, ...args) => {
+    if (!dev_mode) {
+      if (!is_at_bot_quote(session)) return "请提供正确格式，如： [引用消息] @bot son [判断模式]";
+    }
+    if (think_flag) return "请等待思考结果";
+    const parttern = args?.[0];
+    if (!parttern) return "请提供正确判断模式，如： [引用消息] @bot son [判断模式]";
+    if (!local_config) return "未加载配置文件，请查看日志";
+    const parttern_msg = local_config.shit_or_not?.prompts[parttern];
+    if (!parttern_msg) return "未找到判断模式，请查看日志";
+    await session.send("已收到，正在品鉴中...");
+    think_flag = true;
+    try {
+      let exec = await checkShitOrNot_v2(session, parttern_msg, ai_config);
+      if (exec == null) return "品鉴失败，请查看日志";
+      return exec;
+    } finally {
+      think_flag = false;
+    }
+  });
 }
 __name(registerShitOrNotCommands, "registerShitOrNotCommands");
 function extractAtId(content) {

package/lib/services/group_func_limit_service.d.ts

@@ -11,6 +11,16 @@ type MenuList = {
     description: string;
 };
 declare function loadGroupFunctionLimitConfig(config: my_config.GroupFunctionLimitConfig): boolean;
+/**
+ * 判断指定群聊是否允许使用某功能编号。
+ * 返回 null 表示未加载功能限制配置（不做限制）。
+ */
+declare function isFunctionAllowedForGuild(guildId: string | number | undefined, menuNumber: number): boolean | null;
+/**
+ * 返回指定群聊允许使用的功能编号列表。
+ * 返回 null 表示未加载功能限制配置（不做限制）。
+ */
+declare function getAllowedMenuNumbersForGuild(guildId: string | number | undefined): number[] | null;
 /**
  * 根据 groupFuncLimit.json 的 groupList 配置，为指定功能编号返回对应的 Koishi Context：
  *
@@ -21,7 +31,7 @@ declare function loadGroupFunctionLimitConfig(config: my_config.GroupFunctionLim
  * - 若未加载功能限制配置：直接返回原始 ctx（不加限制）
  */
 declare function getCtxForFunction(ctx: Context, menuNumber: number): Context | null;
-export { groupFunctionLimitConfig, loadGroupFunctionLimitConfig, getCtxForFunction, };
+export { groupFunctionLimitConfig, loadGroupFunctionLimitConfig, getCtxForFunction, isFunctionAllowedForGuild, getAllowedMenuNumbersForGuild, };
 declare function getGroupFunctionLimitConfig(): GroupFunctionLimitItem[];
 declare function getMenuList(): MenuList[];
 export { getGroupFunctionLimitConfig, getMenuList, };

package/lib/services/son_func/shit_or_not_service.d.ts

@@ -2,4 +2,5 @@ import { Session } from 'koishi';
 import { AiAPIConfig } from '../../config/config';
 declare function ocrImage(buffer: Buffer): Promise<string>;
 declare function checkShitOrNot(session: Session, parttern_msg: string, config: AiAPIConfig): Promise<string>;
-export { checkShitOrNot, ocrImage };
+declare function checkShitOrNot_v2(session: Session, parttern_msg: string, config: AiAPIConfig): Promise<string>;
+export { checkShitOrNot, checkShitOrNot_v2, ocrImage };

package/package.json

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