koishi-plugin-group-verification 1.0.34 → 1.0.35

package/lib/index.js

@@ -45,7 +45,7 @@ var import_koishi = require("koishi");
 var name = "group-verification";
 var logger = console;
 var Config = import_koishi.Schema.object({
-  defaultReminderMessage: import_koishi.Schema.string().description("默认提醒消息模板（使用 \\n 表示换行，可包含下方变量）").default("{user}({id}) 申请加入群 {gname}({group})\n申请理由: {question}\n匹配情况: {answer}/{threshold}\n使用 gva 同意或 gvr 拒绝申请"),
+  defaultReminderMessage: import_koishi.Schema.string().description("默认提醒消息模板（使用 \\n 表示换行，可包含下方变量）").default("{user}({id}) 申请入群\\n申请理由: {question}\\n匹配情况: {answer}/{threshold}\\n使用 gva 同意或 gvr 拒绝申请"),
   enableStrictGroupCheck: import_koishi.Schema.boolean().description("是否启用严格的群号检查（检查群号长度）").default(false),
   logLevel: import_koishi.Schema.union(["debug", "info", "warn", "error"]).description("日志级别").default("info"),
   permissionDeniedMessage: import_koishi.Schema.string().description("权限不足时返回给调用者的提示").default("权限不足: 需要群主/管理员权限或koishi三级以上权限"),
@@ -194,7 +194,7 @@ function usageString() {
 __name(usageString, "usageString");
 function mergeReminder(existingConfig, cleanedOptions, hasRealMessageParam, hasRealEnableMessageParam, hasRealDisableMessageParam, logger2, defaultMessage) {
   let reminderEnabled = true;
-  let reminderMessage = defaultMessage || "{user}({id}) 申请加入群 {gname}({group})\n申请理由: {question}\n匹配情况: {answer}/{threshold}";
+  let reminderMessage = defaultMessage || "{user}({id}) 申请入群\\n申请理由: {question}\\n匹配情况: {answer}/{threshold}\\n使用 gva 同意或 gvr 拒绝申请";
   if (existingConfig) {
     reminderEnabled = existingConfig.reminderEnabled;
     reminderMessage = existingConfig.reminderMessage || reminderMessage;
@@ -208,7 +208,7 @@ function mergeReminder(existingConfig, cleanedOptions, hasRealMessageParam, hasR
   } else if (hasRealMessageParam) {
     reminderEnabled = true;
     if (cleanedOptions.message !== void 0) {
-      reminderMessage = cleanedOptions.message.replace(/\\n/g, "\n");
+      reminderMessage = cleanedOptions.message;
       logger2.debug(`设置自定义提醒消息: ${reminderMessage.substring(0, 50)}...`);
     }
   }
@@ -359,17 +359,17 @@ async function checkPermission(session, targetGroupId) {
   }
   try {
     const member = await session.bot.getGuildMember(groupId, session.userId);
-    logger.info(`权限检查 - 获取到成员信息:`, {
+    logger.debug(`权限检查 - 获取到成员信息:`, {
       roles: member?.roles,
       permissions: member?.permissions
     });
     if (member) {
       if (member.permissions?.includes("OWNER") || member.roles?.includes("owner")) {
-        logger.info(`权限检查 - 用户是群主`);
+        logger.debug(`权限检查 - 用户是群主`);
         return [true];
       }
       if (member.roles?.includes("admin") || member.permissions?.includes("ADMINISTRATOR")) {
-        logger.info(`权限检查 - 用户是管理员`);
+        logger.debug(`权限检查 - 用户是管理员`);
         return [true];
       }
     }
@@ -461,7 +461,7 @@ function parseConfigArgs(raw) {
     }
   }
   tokens = tokens.map(
-    (t) => t.replace(new RegExp(ESC_QUOTE, "g"), '"').replace(new RegExp(ESC_BACKSLASH, "g"), "\\")
+    (t) => t.replace(new RegExp(ESC_QUOTE, "g"), '"').replace(new RegExp(ESC_BACKSLASH, "g"), "\\\\")
   );
   for (let i = 0; i < tokens.length; i++) {
     const tok = tokens[i];
@@ -606,7 +606,7 @@ async function handleFailedVerification(ctx, session, config, matchedCount, requ
     logger.debug(`群 ${guildId} 的提醒消息已被禁用，跳过发送`);
     return;
   }
-  let reminderMsg = config.reminderMessage;
+  let reminderMsg = config.reminderMessage.replace(/\\\\n/g, "
").replace(/\\n/g, "\n").replace(/\x01/g, "\\n");
   reminderMsg = reminderMsg.replace(/{user}/g, username).replace(/{id}/g, userId).replace(/{group}/g, guildId).replace(/{gname}/g, groupName).replace(/{question}/g, message).replace(/{answer}/g, matchedCount.toString()).replace(/{threshold}/g, requiredThreshold);
   const rawChannel = (session.channelId || "").toString().trim();
   const channel = rawChannel || guildId;
@@ -616,7 +616,7 @@ async function handleFailedVerification(ctx, session, config, matchedCount, requ
     try {
       await session.bot.broadcast([target], reminderMsg);
     } catch (err) {
-      logger.warn("bot.broadcast failed, fallback to ctx.broadcast", err);
+      logger.warn("bot.broadcast 失败，回退到 ctx.broadcast", err);
       if (typeof ctx.broadcast === "function") {
         await ctx.broadcast([target], reminderMsg);
       } else {
@@ -875,8 +875,8 @@ function apply(ctx, config) {
     manuallyApproved: "integer",
     rejected: "integer",
     totalJoined: "integer",
-    // store as string (ISO timestamp) to preserve full date+time;
-    // Koishi `date` type truncates to day which leads to 00:00:00.
+    // 以字符串（ISO 时间戳）格式存储，保留完整日期+时间；
+    // Koishi 的 date 类型会截断到天，导致时间显示为 00:00:00。
     lastUpdated: "string"
   }, {
     primary: "id",
@@ -890,7 +890,7 @@ function apply(ctx, config) {
     requestMessage: "string",
     // 保存 OneBot 事件提供的原始 requestId；用于同意/拒绝操作
     requestId: "string",
-    // record full timestamp as string to keep time component
+    // 以字符串格式记录完整时间戳，保留时间分量
     applyTime: "string"
   }, {
     primary: "id",
@@ -906,7 +906,7 @@ function apply(ctx, config) {
     indexes: [["groupId"]]
   });
   ctx.on("guild-member-request", async (session) => {
-    logger.info("收到 guild-member-request 事件，转发给处理函数");
+    logger.debug("收到 guild-member-request 事件，转发给处理函数");
     await handleGuildMemberRequestEvent(ctx, session);
   });
   ctx.on("guild-member-added", async (session) => {
@@ -979,7 +979,7 @@ function apply(ctx, config) {
       });
       if (member) {
         if (member.permissions?.includes("OWNER") || member.roles?.includes("owner")) {
-          logger.info(`权限检查 - 用户是群主`);
+          logger.debug(`权限检查 - 用户是群主`);
           return [true];
         }
         if (member.roles?.includes("admin") || member.permissions?.includes("ADMINISTRATOR")) {
@@ -1007,16 +1007,16 @@ ${debugInfo}`];
     "group-verify.配置",
     "gvc"
   ).option("groupId", "-i <groupId> 指定群号").option("method", "-m <method> 审核方式 (0-3)").option("threshold", "-t <threshold> 阈值参数").option("message", "-msg [message] 自定义提醒消息").option("disableMessage", "-nomsg 禁用提醒消息").option("query", "-? 查询当前配置").option("remove", "-r 删除配置").action(async ({ session, options }, keywords) => {
-    logger.info(`=== 命令解析调试 ===`);
-    logger.info(`session内容: guildId=${session.guildId}, userId=${session.userId}`);
+    logger.debug(`=== 命令解析调试 ===`);
+    logger.debug(`session内容: guildId=${session.guildId}, userId=${session.userId}`);
     const rawInput = session.content.split(/\s+/).slice(1).join(" ");
-    logger.info(`原始命令参数: "${rawInput}"`);
+    logger.debug(`原始命令参数: "${rawInput}"`);
     const parsed = parseConfigArgs(rawInput);
     const { keywords: parsedKeywords, flags, error: parseError } = parsed;
     if (parseError) {
       return parseError;
     }
-    logger.info(`解析结果 flags=${JSON.stringify(flags)}, keywords=[${parsedKeywords.join(", ")}]`);
+    logger.debug(`解析结果 flags=${JSON.stringify(flags)}, keywords=[${parsedKeywords.join(", ")}]`);
     const cleanedOptions = {
       groupId: flags.groupId || options.groupId,
       method: flags.method || (options.method === "" ? void 0 : options.method),
@@ -1028,7 +1028,7 @@ ${debugInfo}`];
       query: flags.query || options.query,
       remove: flags.remove || options.remove
     };
-    logger.info(`合并后options: ${JSON.stringify(cleanedOptions, null, 2)}`);
+    logger.debug(`合并后options: ${JSON.stringify(cleanedOptions, null, 2)}`);
     if ((cleanedOptions.query || cleanedOptions.remove) && (parsedKeywords.length > 0 || cleanedOptions.method !== void 0 || cleanedOptions.threshold !== void 0 || cleanedOptions.message !== void 0 || cleanedOptions.enableMessage || cleanedOptions.disableMessage)) {
       return config.parameterConflictMessage || "参数冲突: -? 或 -r 不能与其他参数或关键词一起使用（仅可搭配 -i）";
     }
@@ -1113,13 +1113,14 @@ ${debugInfo}`];
         const createTime = new Date(config2.createdAt).toLocaleString("zh-CN", { timeZone: "Asia/Shanghai" });
         const updateTime = new Date(config2.updatedAt).toLocaleString("zh-CN", { timeZone: "Asia/Shanghai" });
         const reminderStatus = config2.reminderEnabled ? "启用" : "禁用";
+        const displayMsg = (config2.reminderMessage || "无").replace(/\\\\n/g, "
").replace(/\\n/g, "\n").replace(/\x01/g, "\\n");
         return `群 ${targetGroupId} 配置: 
 关键词: ${decodedKeywords2.join(", ")}
 审核方式: ${methodDesc}
 阈值: ${thresholdInfo}
 提醒消息: ${reminderStatus}
 自定义消息:
-${config2.reminderMessage || "无"}
+${displayMsg}
 创建时间: ${createTime}
 更新时间: ${updateTime}
 创建者: ${config2.createdBy}
@@ -1129,7 +1130,7 @@ ${config2.reminderMessage || "无"}
       }
     }
     let keywordList = parsedKeywords.slice();
-    logger.info(`关键词解析结果: [${keywordList.join(", ")}] - 原始输入: "${rawInput}"`);
+    logger.debug(`关键词解析结果: [${keywordList.join(", ")}] - 原始输入: "${rawInput}"`);
     if (keywordList.length === 0 && !cleanedOptions.query && !cleanedOptions.remove) {
       const hasConfigParams = cleanedOptions.method !== void 0 || cleanedOptions.threshold !== void 0 || hasRealMessageParam || hasRealEnableMessageParam || hasRealDisableMessageParam;
       if (!hasConfigParams) {
@@ -1162,7 +1163,7 @@ ${config2.reminderMessage || "无"}
       reviewMethod = existingConfig.reviewMethod;
       if (existingConfig.reviewParameters === void 0 || existingConfig.reviewParameters === null || isNaN(existingConfig.reviewParameters)) {
         reviewParameters = 0;
-        logger.info(`检测到老版本数据或无效值，使用默认阈值: 0`);
+        logger.debug(`检测到老版本数据或无效值，使用默认阈值: 0`);
       } else {
         reviewParameters = existingConfig.reviewParameters;
       }
@@ -1215,7 +1216,7 @@ ${config2.reminderMessage || "无"}
     const encodedKeywords = keywordList.map((keyword) => {
       return keyword.replace(/,/g, "[[COMMA]]");
     });
-    logger.info(`编码后准备存储的关键词: ${JSON.stringify(encodedKeywords)}`);
+    logger.debug(`编码后准备存储的关键词: ${JSON.stringify(encodedKeywords)}`);
     const dbData = {
       keywords: encodedKeywords,
       reviewMethod,
@@ -1259,24 +1260,25 @@ ${config2.reminderMessage || "无"}
     feedbackMessage += `提醒状态: ${reminderEnabled ? "启用" : "禁用"}
 `;
     if (reminderMessage && reminderEnabled) {
+      const displayReminder = reminderMessage.replace(/\\\\n/g, "
").replace(/\\n/g, "\n").replace(/\x01/g, "\\n");
       feedbackMessage += `提醒消息:
-${reminderMessage}
+${displayReminder}
 `;
     }
-    logger.info(`准备存储到数据库的关键词: ${JSON.stringify(encodedKeywords)}`);
-    logger.info(`=== 配置处理详情 ===`);
-    logger.info(`原始输入: ${keywords || "无关键词"}`);
-    logger.info(`审核方式: ${reviewMethod} (${["全部同意", "按数量", "按比例", "全部拒绝"][reviewMethod]})`);
-    logger.info(`阈值参数: ${JSON.stringify(reviewParameters)}`);
-    logger.info(`关键词列表: [${keywordList.map((k) => `"${k}"`).join(", ")}]`);
-    logger.info(`现有配置: ${existingConfig ? "存在" : "不存在"}`);
+    logger.debug(`准备存储到数据库的关键词: ${JSON.stringify(encodedKeywords)}`);
+    logger.debug(`=== 配置处理详情 ===`);
+    logger.debug(`原始输入: ${keywords || "无关键词"}`);
+    logger.debug(`审核方式: ${reviewMethod} (${["全部同意", "按数量", "按比例", "全部拒绝"][reviewMethod]})`);
+    logger.debug(`阈值参数: ${JSON.stringify(reviewParameters)}`);
+    logger.debug(`关键词列表: [${keywordList.map((k) => `"${k}"`).join(", ")}]`);
+    logger.debug(`现有配置: ${existingConfig ? "存在" : "不存在"}`);
     if (existingConfig) {
-      logger.info(`原审核方式: ${existingConfig.reviewMethod}`);
-      logger.info(`原阈值: ${JSON.stringify(existingConfig.reviewParameters)}`);
-      logger.info(`原关键词数: ${existingConfig.keywords.length}`);
-      logger.info(`新关键词数: ${keywordList.length}`);
+      logger.debug(`原审核方式: ${existingConfig.reviewMethod}`);
+      logger.debug(`原阈值: ${JSON.stringify(existingConfig.reviewParameters)}`);
+      logger.debug(`原关键词数: ${existingConfig.keywords.length}`);
+      logger.debug(`新关键词数: ${keywordList.length}`);
     }
-    logger.info(`==================`);
+    logger.debug(`==================`);
     logger.info(feedbackMessage.replace(/\n/g, "; "));
     return feedbackMessage;
   });

package/package.json

@@ -8,7 +8,7 @@
   "bugs": {
     "url": "https://github.com/LHDyx/koishi-plugin-group-verification/issues"
   },
-  "version": "1.0.34",
+  "version": "1.0.35",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -44,7 +44,7 @@
     "koishi": "^4.15.0"
   },
   "devDependencies": {
-    "typescript": "^4.9.0",
-    "@types/node": "^16.0.0"
+    "@types/node": "^16.0.0",
+    "typescript": "^4.9.0"
   }
 }

package/readme.md

@@ -138,11 +138,11 @@ group-verify.blacklist i <用户ID> [群号|all]
 
 插件启动时会输出运行状态，并根据 `logLevel` 调整输出量。
 - `debug`：打印所有调试细节，包括权限检查、命令解析等。
-- `info`：默认值，记录关键事件（插件启动、配置修改、自动拒绝、黑名单踢人等）。
+- `info`：默认值，记录关键事件（插件启动、配置修改、自动拒绝、黑名单踢人等），包括成功踢人日志。
 - `warn`：记录可恢复的异常，例如尝试踢出用户失败、数据库操作问题。
 - `error`：仅在遇到严重错误时输出。
 
-添加黑名单时会尝试在对应群踢出该用户，成功记为 `info`，失败记为 `warn`。
+添加黑名单时会尝试在对应群踢出该用户，成功记为 `info`，失败记为 `warn`。权限检查的详细过程则只会在 `debug` 级别输出。
 
 ### 严格群号检查