koishi-plugin-onebot-verifier 1.0.5 → 1.0.7

package/lib/index.d.ts

@@ -7,6 +7,7 @@ export declare const usage = "\n<div style=\"border-radius: 10px; border: 1px so
 export interface Config {
     notifyTarget?: string;
     debugMode?: boolean;
+    kickBan?: boolean;
     timeout?: number;
     timeoutAction?: 'accept' | 'reject';
     friendLevel?: number;

package/lib/index.js

@@ -45,7 +45,8 @@ var usage = `
 var Config = import_koishi.Schema.intersect([
   import_koishi.Schema.object({
     notifyTarget: import_koishi.Schema.string().description("通知目标(guild/private:number)").required(),
-    debugMode: import_koishi.Schema.boolean().description("输出调试日志").default(false)
+    debugMode: import_koishi.Schema.boolean().description("输出调试日志").default(false),
+    kickBan: import_koishi.Schema.boolean().description("被踢自动处理").default(false)
   }).description("基础配置"),
   import_koishi.Schema.object({
     timeout: import_koishi.Schema.number().description("请求超时时长").default(360).min(0),
@@ -78,10 +79,12 @@ var Config = import_koishi.Schema.intersect([
 function apply(ctx, config = {}) {
   const logger = new import_koishi.Logger("onebot-verifier");
   const activeTasks = /* @__PURE__ */ new Map();
+  const inviterMap = /* @__PURE__ */ new Map();
   const executeAction = /* @__PURE__ */ __name(async (session, kind, pass, reason = "", remark = "") => {
     try {
       const eventData = session.event?._data || {};
       if (config.debugMode) logger.info(`[执行操作] 类型:${kind} 结果:${pass ? "同意" : "拒绝"} 原因:${reason || "无"}`);
+      if (pass && kind === "guild" && session.guildId && session.userId) inviterMap.set(session.guildId, session.userId);
       if (!pass && kind === "guild" && session.guildId && (session.event?.type === "guild-added" || eventData.notice_type === "group_increase")) {
         if (reason) {
           try {
@@ -111,14 +114,26 @@ function apply(ctx, config = {}) {
       const eventData = session.event?._data || {};
       const userInfo = session.userId ? await session.bot.getUser?.(session.userId)?.catch(() => null) : null;
       const groupInfo = kind !== "friend" && session.guildId ? await session.bot.getGuild?.(session.guildId)?.catch(() => null) : null;
-      const adminInfo = eventData.operator_id && session.userId && eventData.operator_id !== session.userId ? await session.bot.getUser?.(eventData.operator_id)?.catch(() => null) : null;
+      const adminId = eventData.operator_id || session.event.operator?.id;
+      const adminInfo = adminId && session.userId && adminId !== session.userId ? await session.bot.getUser?.(adminId)?.catch(() => null) : null;
       const infoLines = [];
       if (userInfo?.avatar) infoLines.push(`<image url="${userInfo.avatar}"/>`);
-      const typeName = kind === "friend" ? "好友申请" : kind === "member" ? "加群请求" : "群组邀请";
-      const statusText = status === "auto_pass" ? "[自动通过]" : status === "auto_reject" ? "[自动拒绝]" : "[等待处理]";
-      infoLines.push(`类型：${typeName} ${statusText}`);
-      if (kind !== "guild" || session.userId !== session.selfId) infoLines.push(`用户：${userInfo?.name || session.userId}${session.userId ? `(${session.userId})` : ""}`);
-      if (adminInfo) infoLines.push(`管理：${adminInfo.name ? `${adminInfo.name}(${eventData.operator_id})` : eventData.operator_id}`);
+      let typeName = "";
+      if (kind === "friend") typeName = "好友申请";
+      else if (kind === "member") typeName = "加群请求";
+      else if (kind === "guild") typeName = "群组邀请";
+      else if (kind === "removed") typeName = eventData.sub_type === "kick_me" ? "机器人被踢" : "机器人退群";
+      let statusText = "";
+      if (kind === "removed") {
+        if (eventData.sub_type === "kick_me" && config.kickBan) statusText = " [自动清理]";
+      } else {
+        statusText = status === "auto_pass" ? " [自动通过]" : status === "auto_reject" ? " [自动拒绝]" : " [等待处理]";
+      }
+      infoLines.push(`类型：${typeName}${statusText}`);
+      if (kind !== "guild" && kind !== "removed" || session.userId !== session.selfId) {
+        infoLines.push(`用户：${userInfo?.name || session.userId}${session.userId ? `(${session.userId})` : ""}`);
+      }
+      if (adminInfo) infoLines.push(`管理：${adminInfo.name ? `${adminInfo.name}(${adminId})` : adminId}`);
       if (groupInfo) infoLines.push(`群组：${groupInfo.name ? `${groupInfo.name}(${session.guildId})` : session.guildId}`);
       if (eventData.comment) infoLines.push(`验证信息：${eventData.comment}`);
       const content = infoLines.join("\n");
@@ -130,7 +145,7 @@ function apply(ctx, config = {}) {
   }, "sendNotice");
   const checkCriteria = /* @__PURE__ */ __name(async (session, kind) => {
     const rawText = session.event?._data?.comment || "";
-    const cleanLines = rawText.split(/[\r\n]+/).map((s) => s.trim()).filter((s) => /^(回答)[:：]/i.test(s)).map((s) => s.replace(/^(回答)[:：]\s*/i, ""));
+    const cleanLines = rawText.split(/[\r\n]+/).map((s) => s.trim()).filter((s) => /^(回答|答案)[:：]/i.test(s)).map((s) => s.replace(/^(回答|答案)[:：]\s*/i, ""));
     const verifyText = cleanLines.length > 0 ? cleanLines.join("\n") : rawText;
     if (kind === "friend") {
       try {
@@ -155,7 +170,7 @@ function apply(ctx, config = {}) {
       try {
         const userData = session.userId ? await ctx.database.getUser(session.platform, session.userId) : null;
         if (userData && userData.authority > 1) {
-          if (config.debugMode) logger.info(`[规则匹配] : ${userData.authority}`);
+          if (config.debugMode) logger.info(`[规则匹配] 白名单: ${userData.authority}`);
           return true;
         }
       } catch {
@@ -205,13 +220,15 @@ function apply(ctx, config = {}) {
   }, "setupManual");
   const handleEvent = /* @__PURE__ */ __name(async (session, kind) => {
     try {
-      if (config.debugMode) logger.info(`[收到请求] 类型:${kind} 数据:${JSON.stringify(session.event?._data || {})}`);
+      if (config.debugMode) logger.info(`[收到请求] 类型: ${kind} 数据:${JSON.stringify(session.event?._data || {})}`);
       if (kind === "member") {
-        const rule = config.verifyRules?.find((r) => r.guildId === session.guildId);
+        const rule = config.verifyRules?.find((r) => String(r.guildId) === String(session.guildId));
         if (rule) {
           const rawText = session.event?._data?.comment || "";
+          const cleanLines = rawText.split(/[\r\n]+/).map((s) => s.trim()).filter((s) => /^(回答|答案)[:：]/i.test(s)).map((s) => s.replace(/^(回答|答案)[:：]\s*/i, ""));
+          const verifyText = cleanLines.length > 0 ? cleanLines.join("\n") : rawText;
           const stats = (rule.minLevel ?? -1) >= 0 && session.onebot && session.userId ? await session.onebot.getStrangerInfo(session.userId, true).catch(() => ({})) : null;
-          const keywordMatch = !rule.keyword || new RegExp(rule.keyword, "i").test(rawText);
+          const keywordMatch = !rule.keyword || new RegExp(rule.keyword, "i").test(verifyText);
           const levelMatch = !stats || (stats.qqLevel ?? 0) >= rule.minLevel;
           const isMatch = keywordMatch && levelMatch;
           if (config.debugMode) logger.info(`[规则判定] ${rule.guildId}: 关键词=${keywordMatch}, 等级=${levelMatch}, 结果=${isMatch}`);
@@ -248,6 +265,19 @@ function apply(ctx, config = {}) {
   ctx.on("guild-request", hookEvent("guild"));
   ctx.on("guild-member-request", hookEvent("member"));
   ctx.on("guild-added", hookEvent("guild"));
+  ctx.on("guild-removed", async (session) => {
+    const subType = session.event?._data?.sub_type;
+    if (subType === "kick_me") {
+      const inviterId = inviterMap.get(session.guildId);
+      if (inviterId) {
+        await session.onebot?.deleteFriend(inviterId);
+        inviterMap.delete(session.guildId);
+      }
+      await session.execute(`analyse.clear -g ${session.guildId}`).catch(() => {
+      });
+    }
+    await sendNotice(session, "removed");
+  });
   ctx.middleware(async (session, next) => {
     if (typeof session.content !== "string" || !session.quote?.id) return next();
     const activeTask = activeTasks.get(session.quote.id);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-onebot-verifier",
   "description": "适用于 Onebot 的审核插件，支持自动审核好友/加群/邀请请求",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "contributors": [
     "Yis_Rime <yis_rime@outlook.com>"
   ],