chattercatcher 0.1.10 → 0.1.12

package/dist/cli.js

@@ -8,7 +8,7 @@ import fs13 from "fs/promises";
 // package.json
 var package_default = {
   name: "chattercatcher",
-  version: "0.1.9",
+  version: "0.1.12",
   description: "\u672C\u5730\u4F18\u5148\u7684\u98DE\u4E66/Lark \u5BB6\u5EAD\u7FA4\u77E5\u8BC6\u5E93\u673A\u5668\u4EBA",
   type: "module",
   main: "dist/index.js",
@@ -88,6 +88,7 @@ var appConfigSchema = z.object({
   feishu: z.object({
     domain: z.enum(["feishu", "lark"]).default("feishu"),
     appId: z.string().default(""),
+    botOpenId: z.string().default(""),
     groupPolicy: z.enum(["open", "allowlist", "disabled"]).default("open"),
     requireMention: z.boolean().default(true)
   }),
@@ -2104,16 +2105,24 @@ function stripMentions(text, mentions) {
       }
     }
   }
-  return result.replace(/@\s*ChatterCatcher/gi, " ").replace(/@/g, " ").replace(/\s+/g, " ").trim();
+  return result.replace(/@/g, " ").replace(/\s+/g, " ").trim();
 }
-function isFeishuMessageAddressedToBot(payload) {
+function isMentionForBot(mention, config) {
+  if (!config.feishu.botOpenId) {
+    return false;
+  }
+  return mention.id?.open_id === config.feishu.botOpenId;
+}
+function getBotMentions(payload, config) {
+  const message = payload.event?.message;
+  return (message?.mentions ?? []).filter((mention) => isMentionForBot(mention, config));
+}
+function isFeishuMessageAddressedToBot(payload, config) {
   const message = payload.event?.message;
   if (!message || message.message_type !== "text") {
     return false;
   }
-  const mentions = message.mentions ?? [];
-  const text = parseTextContent(message.content);
-  return mentions.length > 0 || /@?ChatterCatcher/i.test(text);
+  return getBotMentions(payload, config).length > 0;
 }
 function getFeishuQuestionDecision(payload, config) {
   const message = payload.event?.message;
@@ -2123,9 +2132,9 @@ function getFeishuQuestionDecision(payload, config) {
       reason: "\u4E0D\u662F\u53EF\u56DE\u7B54\u7684\u6587\u672C\u6D88\u606F\u3002"
     };
   }
-  const mentions = message.mentions ?? [];
+  const mentions = getBotMentions(payload, config);
   const text = parseTextContent(message.content);
-  const hasMention = isFeishuMessageAddressedToBot(payload);
+  const hasMention = isFeishuMessageAddressedToBot(payload, config);
   if (config.feishu.requireMention && !hasMention) {
     return {
       shouldAnswer: false,
@@ -2302,7 +2311,7 @@ function createFeishuEventDispatcher(options) {
   return new lark2.EventDispatcher({}).register({
     "im.message.receive_v1": async (data2) => {
       const payload = { event: data2 };
-      if (options.questionHandler && isFeishuMessageAddressedToBot(payload)) {
+      if (options.questionHandler && isFeishuMessageAddressedToBot(payload, options.config)) {
         const platformMessageId = data2?.message?.message_id;
         if (platformMessageId && answeredMessageIds.has(platformMessageId)) {
           console.log("\u98DE\u4E66\u63D0\u95EE\u91CD\u590D\u6295\u9012\uFF1A\u5DF2\u8DF3\u8FC7\u56DE\u7B54\u3002");
@@ -3582,6 +3591,10 @@ async function promptForConfiguration(config, secrets) {
     default: config.feishu.domain
   });
   config.feishu.appId = await input({ message: "\u98DE\u4E66 App ID", default: config.feishu.appId });
+  config.feishu.botOpenId = await input({
+    message: "\u98DE\u4E66\u673A\u5668\u4EBA Open ID\uFF08\u5FC5\u586B\uFF0C\u7528\u4E8E\u533A\u5206 @ \u673A\u5668\u4EBA\u548C @ \u5176\u4ED6\u4EBA\uFF09",
+    default: config.feishu.botOpenId
+  });
   secrets.feishu.appSecret = applySecretInput(
     secrets.feishu.appSecret,
     await password({ message: secrets.feishu.appSecret ? "\u98DE\u4E66 App Secret\uFF08\u7559\u7A7A\u4FDD\u7559\uFF09" : "\u98DE\u4E66 App Secret", mask: "*" })
@@ -3613,7 +3626,7 @@ async function promptForConfiguration(config, secrets) {
   config.embedding.dimension = dimension ?? null;
   config.web.port = await number({ message: "Web UI \u7AEF\u53E3", default: config.web.port, required: true }) ?? config.web.port;
   config.feishu.requireMention = await confirm({
-    message: "\u7FA4\u804A\u56DE\u7B54\u662F\u5426\u8981\u6C42 @ChatterCatcher\uFF1F",
+    message: "\u7FA4\u804A\u56DE\u7B54\u662F\u5426\u8981\u6C42 @ \u673A\u5668\u4EBA\uFF1F",
     default: config.feishu.requireMention
   });
 }