koishi-plugin-group-verification 1.0.21 → 1.0.23

package/lib/index.d.ts

@@ -100,4 +100,5 @@ export declare function verifyApplication(config: GroupVerificationConfig, messa
     matchedCount: number;
     requiredThreshold: string;
 }>;
+export declare function handleFailedVerification(ctx: Context, session: any, config: GroupVerificationConfig, matchedCount?: number, requiredThreshold?: string): Promise<void>;
 export declare function apply(ctx: Context, config: Config): void;

package/lib/index.js

@@ -22,6 +22,7 @@ var src_exports = {};
 __export(src_exports, {
   Config: () => Config,
   apply: () => apply,
+  handleFailedVerification: () => handleFailedVerification,
   inject: () => inject,
   mergeReminder: () => mergeReminder,
   name: () => name,
@@ -287,6 +288,47 @@ async function verifyApplication(config, message, session) {
   return { isValid, matchedCount, requiredThreshold };
 }
 __name(verifyApplication, "verifyApplication");
+async function handleFailedVerification(ctx, session, config, matchedCount, requiredThreshold) {
+  const guildId = (session.guildId || session.channelId || "").toString().trim();
+  const userId = session.userId;
+  if (!guildId) {
+    logger.warn("handleFailedVerification invoked without guildId, aborting");
+    return;
+  }
+  const username = session.username || "未知用户";
+  const message = session.content || "";
+  logger.info(`处理失败验证 guild=${guildId} user=${userId} msg="${message}" matched=${matchedCount} threshold=${requiredThreshold}`);
+  if (matchedCount === void 0 || requiredThreshold === void 0) {
+    const result = await verifyApplication(config, message, session);
+    matchedCount = result.matchedCount;
+    requiredThreshold = result.requiredThreshold;
+  }
+  let groupName = "未知群组";
+  try {
+    const guild = await session.bot.getGuild(guildId);
+    groupName = guild.name || groupName;
+  } catch (error) {
+  }
+  await ctx.database.create("group_verification_pending", {
+    groupId: guildId,
+    userId,
+    userName: username,
+    requestMessage: message,
+    applyTime: (/* @__PURE__ */ new Date()).toISOString()
+  });
+  if (!config.reminderEnabled || !config.reminderMessage || config.reminderMessage === "") {
+    logger.info(`群 ${guildId} 的提醒消息已被禁用，跳过发送`);
+    return;
+  }
+  let reminderMsg = config.reminderMessage;
+  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;
+  const target = rawChannel ? [channel, guildId] : guildId;
+  logger.debug("broadcast target", { channel, guildId, target });
+  await ctx.broadcast([target], reminderMsg);
+}
+__name(handleFailedVerification, "handleFailedVerification");
 function apply(ctx, config) {
   ctx.model.extend("group_verification_config", {
     id: "unsigned",
@@ -367,7 +409,7 @@ function apply(ctx, config) {
         }
       }
     } else {
-      await handleFailedVerification(ctx, session, config2);
+      await handleFailedVerification(ctx, session, config2, matchedCount, requiredThreshold);
     }
   });
   ctx.on("guild-member-added", async (session) => {
@@ -393,39 +435,6 @@ function apply(ctx, config) {
       logger.info(`用户 ${userId} 被手动邀请加入群 ${groupId}，手动批准统计已更新`);
     }
   });
-  async function handleFailedVerification(ctx2, session, config2, matchedCount, requiredThreshold) {
-    const guildId = (session.guildId || session.channelId || "").toString().trim();
-    const userId = session.userId;
-    const username = session.username || "未知用户";
-    const message = session.content || "";
-    logger.info(`处理失败验证 guild=${guildId} user=${userId} msg="${message}" matched=${matchedCount} threshold=${requiredThreshold}`);
-    if (matchedCount === void 0 || requiredThreshold === void 0) {
-      const result = await verifyApplication(config2, message, session);
-      matchedCount = result.matchedCount;
-      requiredThreshold = result.requiredThreshold;
-    }
-    let groupName = "未知群组";
-    try {
-      const guild = await session.bot.getGuild(guildId);
-      groupName = guild.name || groupName;
-    } catch (error) {
-    }
-    await ctx2.database.create("group_verification_pending", {
-      groupId: guildId,
-      userId,
-      userName: username,
-      requestMessage: message,
-      applyTime: (/* @__PURE__ */ new Date()).toISOString()
-    });
-    if (!config2.reminderEnabled || !config2.reminderMessage || config2.reminderMessage === "") {
-      logger.info(`群 ${guildId} 的提醒消息已被禁用，跳过发送`);
-      return;
-    }
-    let reminderMsg = config2.reminderMessage;
-    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);
-    await ctx2.broadcast([guildId], reminderMsg);
-  }
-  __name(handleFailedVerification, "handleFailedVerification");
   async function updateStats(groupId, action) {
     const existingStats = await ctx.database.get("group_verification_stats", { groupId });
     if (existingStats.length > 0) {
@@ -1155,6 +1164,7 @@ __name(apply, "apply");
 0 && (module.exports = {
   Config,
   apply,
+  handleFailedVerification,
   inject,
   mergeReminder,
   name,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-group-verification",
   "description": "[WIP] Koishi 群组加群验证插件，支持多关键词匹配审核、多种审核方式和详细统计功能（开发中）",
-  "version": "1.0.21",
+  "version": "1.0.23",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [

package/readme.md

@@ -146,7 +146,13 @@ group-verify.stats total
 - **手动批准**：管理员手动同意的用户数
 - **拒绝**：被拒绝的申请数
 - **手动入群**：管理员直接邀请入群的用户数
-
+### ⚠️ OneBot/QQ 适配器注意
+默认情况下插件会使用 `ctx.broadcast` 发送提醒消息，
+为了兼容 OneBot、QQ 等需要同时指定频道和群号的协议，
+插件会自动将 `session.channelId` 与 `session.guildId` 一起
+传给 `broadcast`。如果你使用的适配器出现无法发送消息的
+情况，请确保群号与频道 ID 正确无空格，或者手动在配置
+中补充 channelId（目前是自动处理）。
 ## 🛠️ 开发配置
 
 ### 全局配置

package/src/index.ts

@@ -405,6 +405,76 @@ export async function verifyApplication(config: GroupVerificationConfig, message
   return { isValid, matchedCount, requiredThreshold }
 }
 
+// 处理验证失败的情况并发送提醒消息（可由 tests 调用）
+export async function handleFailedVerification(
+  ctx: Context,
+  session: any,
+  config: GroupVerificationConfig,
+  matchedCount?: number,
+  requiredThreshold?: string
+) {
+  const guildId = (session.guildId || session.channelId || '').toString().trim();
+  const userId = session.userId
+  // 如果没有可用的群号，直接退出（防止错误插入数据库）
+  if (!guildId) {
+    logger.warn('handleFailedVerification invoked without guildId, aborting')
+    return
+  }
+  const username = session.username || '未知用户'
+  const message = session.content || ''
+  logger.info(`处理失败验证 guild=${guildId} user=${userId} msg="${message}" matched=${matchedCount} threshold=${requiredThreshold}`)
+  // 如果未传入匹配信息，则重新计算一次（老调用）
+  if (matchedCount === undefined || requiredThreshold === undefined) {
+    const result = await verifyApplication(config, message, session)
+    matchedCount = result.matchedCount
+    requiredThreshold = result.requiredThreshold
+  }
+
+  // 获取群信息
+  let groupName = '未知群组'
+  try {
+    const guild = await session.bot.getGuild(guildId)
+    groupName = guild.name || groupName
+  } catch (error) {
+    // 无法获取群名称时使用默认值
+  }
+
+  // 将申请加入待审核列表
+  await ctx.database.create('group_verification_pending', {
+    groupId: guildId,
+    userId: userId,
+    userName: username,
+    requestMessage: message,
+    applyTime: new Date().toISOString()
+  })
+  // 如果提醒消息被禁用，直接返回
+  if (!config.reminderEnabled || !config.reminderMessage || config.reminderMessage === '') {
+    logger.info(`群 ${guildId} 的提醒消息已被禁用，跳过发送`)
+    return
+  }
+
+  // 替换提醒消息中的变量
+  let reminderMsg = config.reminderMessage
+  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!)
+
+  // 发送提醒消息到群内
+  // OneBot 等适配器需要同时指定 channelId 与 guildId，否则会无法定位到具体频道
+  // ctx.broadcast 接收的元素可以是字符串、[channel, guild] 或者 session
+  const rawChannel = (session.channelId || '').toString().trim()
+  const channel = rawChannel || guildId
+  const target: string | [string, string] = rawChannel ? [channel, guildId] : guildId
+  logger.debug('broadcast target', { channel, guildId, target })
+  // cast to any to satisfy overloaded typings on ctx.broadcast
+  await (ctx.broadcast as any)([target], reminderMsg)
+}
+
 export function apply(ctx: Context, config: Config) {
   // 创建数据库表
   ctx.model.extend('group_verification_config', {
@@ -511,7 +581,7 @@ export function apply(ctx: Context, config: Config) {
         }
       }
     } else {
-      await handleFailedVerification(ctx, session, config);
+      await handleFailedVerification(ctx, session, config, matchedCount, requiredThreshold);
     }
   });
 
@@ -548,65 +618,6 @@ export function apply(ctx: Context, config: Config) {
     }
   })
 
-  // 处理验证失败的情况
-  // 处理验证失败的情况并发送提醒消息
-  // matchedCount/requiredThreshold 可选，为空时内部重新计算（兼容旧调用）
-  async function handleFailedVerification(
-    ctx: Context,
-    session: any,
-    config: GroupVerificationConfig,
-    matchedCount?: number,
-    requiredThreshold?: string
-  ) {
-    const guildId = (session.guildId || session.channelId || '').toString().trim();
-    const userId = session.userId
-    const username = session.username || '未知用户'
-    const message = session.content || ''
-    logger.info(`处理失败验证 guild=${guildId} user=${userId} msg="${message}" matched=${matchedCount} threshold=${requiredThreshold}`)
-    // 如果未传入匹配信息，则重新计算一次（老调用）
-    if (matchedCount === undefined || requiredThreshold === undefined) {
-      const result = await verifyApplication(config, message, session)
-      matchedCount = result.matchedCount
-      requiredThreshold = result.requiredThreshold
-    }
-
-    // 获取群信息
-    let groupName = '未知群组'
-    try {
-      const guild = await session.bot.getGuild(guildId)
-      groupName = guild.name || groupName
-    } catch (error) {
-      // 无法获取群名称时使用默认值
-    }
-
-    // 将申请加入待审核列表
-    await ctx.database.create('group_verification_pending', {
-      groupId: guildId,
-      userId: userId,
-      userName: username,
-      requestMessage: message,
-      applyTime: new Date().toISOString()
-    })
-    // 如果提醒消息被禁用，直接返回
-    if (!config.reminderEnabled || !config.reminderMessage || config.reminderMessage === '') {
-      logger.info(`群 ${guildId} 的提醒消息已被禁用，跳过发送`)
-      return
-    }
-
-    // 替换提醒消息中的变量
-    let reminderMsg = config.reminderMessage
-    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!)
-
-    // 发送提醒消息到群内
-    await ctx.broadcast([guildId], reminderMsg)
-  }
 
 
   // 更新统计信息