From 1277f6e27bd18d47a66d8a1eecee532fdfece6ab Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Sat, 10 Jan 2026 00:08:30 +0100
Subject: [PATCH] fix: prefer FN for WhatsApp contact cards (#622) (thanks
 @mahmoudashraf93)

---
 CHANGELOG.md            |  2 +-
 src/web/inbound.test.ts | 16 ++++++++++++++++
 src/web/inbound.ts      | 25 +++++++++++++------------
 3 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 79768229a..03c27cef6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,7 +41,7 @@
 - WhatsApp: improve "no active web listener" errors (include account + relink hint). (#612) — thanks @YuriNachos
 - WhatsApp: add broadcast groups for multi-agent replies. (#547) — thanks @pasogott
 - WhatsApp: resolve @lid inbound senders via auth-dir mapping fallback + shared resolver. (#365)
-- WhatsApp: treat shared contact cards as inbound messages. (#622) — thanks @mahmoudashraf93
+- WhatsApp: treat shared contact cards as inbound messages (prefer vCard FN). (#622) — thanks @mahmoudashraf93
 - iMessage: isolate group-ish threads by chat_id. (#535) — thanks @mdahmann
 - Models: add OAuth expiry checks in doctor, expanded `models status` auth output (missing auth + `--check` exit codes). (#538) — thanks @latitudeki5223
 - Deps: bump Pi to 0.40.0 and drop pi-ai patch (upstream 429 fix). (#543) — thanks @mcinteerj
diff --git a/src/web/inbound.test.ts b/src/web/inbound.test.ts
index 19c641240..32817adfe 100644
--- a/src/web/inbound.test.ts
+++ b/src/web/inbound.test.ts
@@ -44,6 +44,22 @@ describe("web inbound helpers", () => {
     expect(body).toBe("<contact: Ada Lovelace, +15555550123>");
   });
 
+  it("prefers FN over N in WhatsApp vcards", () => {
+    const body = extractText({
+      contactMessage: {
+        vcard: [
+          "BEGIN:VCARD",
+          "VERSION:3.0",
+          "N:Lovelace;Ada;;;",
+          "FN:Ada Lovelace",
+          "TEL;TYPE=CELL:+15555550123",
+          "END:VCARD",
+        ].join("\n"),
+      },
+    } as unknown as import("@whiskeysockets/baileys").proto.IMessage);
+    expect(body).toBe("<contact: Ada Lovelace, +15555550123>");
+  });
+
   it("extracts multiple WhatsApp contact cards", () => {
     const body = extractText({
       contactsArrayMessage: {
diff --git a/src/web/inbound.ts b/src/web/inbound.ts
index d25768a55..e44d4065d 100644
--- a/src/web/inbound.ts
+++ b/src/web/inbound.ts
@@ -735,9 +735,7 @@ export function extractText(
   const contactPlaceholder =
     extractContactPlaceholder(message) ??
     (extracted && extracted !== message
-      ? extractContactPlaceholder(
-          extracted as proto.IMessage | undefined,
-        )
+      ? extractContactPlaceholder(extracted as proto.IMessage | undefined)
       : undefined);
   if (contactPlaceholder) return contactPlaceholder;
   return undefined;
@@ -791,12 +789,11 @@ function describeContact(input: {
   return { name, phone };
 }
 
-function parseVcard(
-  vcard?: string,
-): { name?: string; phones: string[] } {
+function parseVcard(vcard?: string): { name?: string; phones: string[] } {
   if (!vcard) return { phones: [] };
   const lines = vcard.split(/\r?\n/);
-  let name: string | undefined;
+  let nameFromN: string | undefined;
+  let nameFromFn: string | undefined;
   const phones: string[] = [];
   for (const rawLine of lines) {
     const line = rawLine.trim();
@@ -808,15 +805,19 @@ function parseVcard(
     if (!rawValue) continue;
     const value = cleanVcardValue(rawValue);
     if (!value) continue;
-    if ((key === "FN" || key === "N") && !name) {
-      name = normalizeVcardName(value);
+    if (key === "FN" && !nameFromFn) {
+      nameFromFn = normalizeVcardName(value);
+      continue;
+    }
+    if (key === "N" && !nameFromN) {
+      nameFromN = normalizeVcardName(value);
       continue;
     }
     if (key.startsWith("TEL") || key.includes(".TEL")) {
       phones.push(value);
     }
   }
-  return { name, phones };
+  return { name: nameFromFn ?? nameFromN, phones };
 }
 
 function cleanVcardValue(value: string): string {
@@ -832,8 +833,8 @@ function normalizeVcardName(value: string): string {
 }
 
 function formatContactPlaceholder(name?: string, phone?: string): string {
-  const parts = [name, phone].filter(
-    (value): value is string => Boolean(value),
+  const parts = [name, phone].filter((value): value is string =>
+    Boolean(value),
   );
   if (parts.length === 0) return "<contact>";
   return `<contact: ${parts.join(", ")}>`;