From 7b6e4b3111745990fcd9bd76739182ae76510637 Mon Sep 17 00:00:00 2001
From: Hamza-Ayed <hamzaayedflutter@gmail.com>
Date: Mon, 18 May 2026 16:06:07 +0300
Subject: [PATCH] Sync update: 2026-05-18 16:06:07

---
 whatsapp_bridge/server.js | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/whatsapp_bridge/server.js b/whatsapp_bridge/server.js
index ce8983e..4b7fe50 100644
--- a/whatsapp_bridge/server.js
+++ b/whatsapp_bridge/server.js
@@ -59,9 +59,18 @@ function sendTo(ws, payload) {
 async function formatChat(chat) {
   let avatar = null;
   try {
-    const contact = await chat.getContact();
-    const pic = await contact.getProfilePicUrl();
-    if (pic) avatar = pic;
+    // Ultra-fast memory-based avatar fetch with strict 300ms fallback to prevent hangs
+    avatar = await Promise.race([
+      chat.client.pupPage.evaluate((chatId) => {
+        try {
+          const contact = window.Store.Contact.get(chatId);
+          return contact && contact.profilePicThumb ? (contact.profilePicThumb.imgFull || contact.profilePicThumb.img) : null;
+        } catch (_) {
+          return null;
+        }
+      }, chat.id._serialized),
+      new Promise(resolve => setTimeout(() => resolve(null), 300))
+    ]);
   } catch (_) {}
 
   // Last Message formatting