@satorijs/adapter-lark 3.10.2 → 3.10.4

package/lib/index.cjs

@@ -71,10 +71,12 @@ async function adaptMessage(bot, data, session, details = true) {
       text.split(" ").forEach((word) => {
         if (word.startsWith("@")) {
           const mention = data.message.mentions.find((mention2) => mention2.key === word);
-          content.push(import_core.h.at(mention.id.open_id, { name: mention.name }));
-        } else {
-          content.push(word);
+          if (mention) {
+            content.push(import_core.h.at(mention.id.open_id, { name: mention.name }));
+            return;
+          }
         }
+        content.push(word);
       });
       break;
     }
@@ -145,8 +147,10 @@ async function adaptSession(bot, body) {
         }, "setOption");
         for (const [key, value] of Object.entries(body.event.action.form_value ?? {})) {
           if (key.startsWith("@@")) {
-            if (value) args.push(key.slice(2));
+            if (value === false) continue;
+            args.push(key.slice(2));
           } else if (key.startsWith("@")) {
+            if (value === false) continue;
             const [_key] = key.slice(1).split("=", 1);
             setOption(_key, key.slice(2 + _key.length));
           } else if (+key * 0 === 0) {
@@ -203,10 +207,12 @@ async function decodeMessage(bot, body, details = true) {
       text.split(" ").forEach((word) => {
         if (word.startsWith("@")) {
           const mention = body.mentions.find((mention2) => mention2.key === word);
-          content.push(import_core.h.at(mention.id, { name: mention.name }));
-        } else {
-          content.push(import_core.h.text(word));
+          if (mention) {
+            content.push(import_core.h.at(mention.id, { name: mention.name }));
+            return;
+          }
         }
+        content.push(import_core.h.text(word));
       });
       break;
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@satorijs/adapter-lark",
   "description": "Lark (飞书) Adapter for Satorijs",
-  "version": "3.10.2",
+  "version": "3.10.4",
   "type": "module",
   "main": "lib/index.cjs",
   "types": "lib/index.d.ts",

package/src/utils.ts

@@ -188,10 +188,12 @@ export async function adaptMessage<C extends Context = Context>(
       text.split(' ').forEach((word) => {
         if (word.startsWith('@')) {
           const mention = data.message.mentions.find((mention) => mention.key === word)!
-          content.push(h.at(mention.id.open_id, { name: mention.name }))
-        } else {
-          content.push(word)
+          if (mention) {
+            content.push(h.at(mention.id.open_id, { name: mention.name }))
+            return
+          }
         }
+        content.push(word)
       })
       break
     }
@@ -265,8 +267,10 @@ export async function adaptSession<C extends Context>(bot: LarkBot<C>, body: Eve
         }
         for (const [key, value] of Object.entries(body.event.action.form_value ?? {})) {
           if (key.startsWith('@@')) {
-            if (value) args.push(key.slice(2))
+            if (value === false) continue
+            args.push(key.slice(2))
           } else if (key.startsWith('@')) {
+            if (value === false) continue
             const [_key] = key.slice(1).split('=', 1)
             setOption(_key, key.slice(2 + _key.length))
           } else if (+key * 0 === 0) {
@@ -327,10 +331,12 @@ export async function decodeMessage<C extends Context = Context>(bot: LarkBot<C>
       text.split(' ').forEach((word) => {
         if (word.startsWith('@')) {
           const mention = body.mentions!.find((mention) => mention.key === word)!
-          content.push(h.at(mention.id, { name: mention.name }))
-        } else {
-          content.push(h.text(word))
+          if (mention) {
+            content.push(h.at(mention.id, { name: mention.name }))
+            return
+          }
         }
+        content.push(h.text(word))
       })
       break
     }