koishi-plugin-cocoyyy-console 1.2.1-alpha.2 → 1.2.2-alpha.0

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	")}

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/package.json

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