chattercatcher 0.1.11 → 0.1.13

package/dist/index.d.ts

@@ -10,6 +10,7 @@ declare const appConfigSchema: z.ZodObject<{
             lark: "lark";
         }>>;
         appId: z.ZodDefault<z.ZodString>;
+        botOpenId: z.ZodDefault<z.ZodString>;
         groupPolicy: z.ZodDefault<z.ZodEnum<{
             open: "open";
             allowlist: "allowlist";
@@ -516,7 +517,7 @@ interface FeishuQuestionDecision {
     chatId?: string;
     reason?: string;
 }
-declare function isFeishuMessageAddressedToBot(payload: FeishuReceiveMessageEvent): boolean;
+declare function isFeishuMessageAddressedToBot(payload: FeishuReceiveMessageEvent, config: AppConfig): boolean;
 declare function getFeishuQuestionDecision(payload: FeishuReceiveMessageEvent, config: AppConfig): FeishuQuestionDecision;
 declare class FeishuQuestionHandler {
     private readonly options;

package/dist/index.js

@@ -9,6 +9,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)
   }),
@@ -2031,12 +2032,22 @@ function stripMentions(text, mentions) {
   }
   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;
   }
-  return (message.mentions ?? []).length > 0;
+  return getBotMentions(payload, config).length > 0;
 }
 function getFeishuQuestionDecision(payload, config) {
   const message = payload.event?.message;
@@ -2046,9 +2057,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,
@@ -2225,7 +2236,7 @@ function createFeishuEventDispatcher(options) {
   return new lark2.EventDispatcher({}).register({
     "im.message.receive_v1": async (data) => {
       const payload = { event: data };
-      if (options.questionHandler && isFeishuMessageAddressedToBot(payload)) {
+      if (options.questionHandler && isFeishuMessageAddressedToBot(payload, options.config)) {
         const platformMessageId = data?.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");