@lih-x-x/kmr 1.0.16 → 1.0.17

package/dist/index.js

@@ -13,7 +13,25 @@ function createLarkClient(config) {
     appType: lark.AppType.SelfBuild
   });
 }
-function createEventDispatcher(onMessage) {
+async function getBotOpenId(client) {
+  try {
+    const res = await client.request({
+      method: "GET",
+      url: "/open-apis/bot/v3/info"
+    });
+    const openId = res.data?.bot?.open_id || "";
+    if (openId) {
+      console.log(`[bot] \u673A\u5668\u4EBA open_id: ${openId}`);
+    } else {
+      console.warn(`[bot] \u672A\u80FD\u83B7\u53D6\u673A\u5668\u4EBA open_id\uFF0C\u7FA4\u804A @\u5224\u65AD\u53EF\u80FD\u4E0D\u51C6\u786E`);
+    }
+    return openId;
+  } catch (err) {
+    console.error(`[bot] \u83B7\u53D6\u673A\u5668\u4EBA\u4FE1\u606F\u5931\u8D25:`, err.message);
+    return "";
+  }
+}
+function createEventDispatcher(botOpenId, onMessage) {
   const dispatcher = new lark.EventDispatcher({});
   const processedMessages = /* @__PURE__ */ new Set();
   dispatcher.register({
@@ -47,10 +65,11 @@ function createEventDispatcher(onMessage) {
       const content = JSON.parse(message.content);
       let text = content.text || "";
       const chatId = message.chat_id;
-      const isMentioned = message.mentions && message.mentions.length > 0;
+      const mentions = message.mentions || [];
+      const isMentioned = botOpenId ? mentions.some((m) => m.id?.open_id === botOpenId) : mentions.some((m) => m.id?.open_id && data.sender?.sender_type !== "user");
       const isGroup = message.chat_type === "group";
-      if (isMentioned) {
-        for (const mention of message.mentions) {
+      if (mentions.length > 0) {
+        for (const mention of mentions) {
           if (mention.key) {
             text = text.replace(mention.key, "").trim();
           }
@@ -1101,7 +1120,8 @@ async function main() {
   const taskCreator = new TaskCreator(client);
   const userResolver = new UserResolver(client);
   const pendingConfirmations = /* @__PURE__ */ new Map();
-  const dispatcher = createEventDispatcher(async (messageId, text, chatId, senderId, meta) => {
+  const botOpenId = await getBotOpenId(client);
+  const dispatcher = createEventDispatcher(botOpenId, async (messageId, text, chatId, senderId, meta) => {
     const parsed = parseMessage(text);
     console.log(`[route] \u6D88\u606F\u8DEF\u7531: type=${parsed.type}, messageId=${messageId}, isGroup=${meta.isGroup}, isMentioned=${meta.isMentioned}`);
     if (meta.isGroup && !meta.isMentioned && parsed.type === "document_link" /* DOCUMENT_LINK */) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lih-x-x/kmr",
-  "version": "1.0.16",
+  "version": "1.0.17",
   "type": "module",
   "main": "dist/index.js",
   "bin": {