From 0b14df521f019fab6ac39a188dec888e927283d0 Mon Sep 17 00:00:00 2001
From: Iiro Laiho <iiro.laiho@iki.fi>
Date: Sat, 3 Dec 2022 00:04:18 +0200
Subject: [PATCH] Re-examine if sender exists

---
 bridge/whatsappmulti/helpers.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bridge/whatsappmulti/helpers.go b/bridge/whatsappmulti/helpers.go
index 08716f06..08043d2d 100644
--- a/bridge/whatsappmulti/helpers.go
+++ b/bridge/whatsappmulti/helpers.go
@@ -42,6 +42,7 @@ func (b *Bwhatsapp) getSenderName(info types.MessageInfo) string {
 
 	if !exists || (sender.FullName == "" && sender.FirstName == "") {
 		b.reloadContacts() // Contacts may need to be reloaded
+		sender, exists = b.contacts[senderJid]
 	}
 
 	if exists && ( sender.FullName != "" ) {
@@ -64,6 +65,7 @@ func (b *Bwhatsapp) getSenderNotify(senderJid types.JID) string {
 
 	if !exists || (sender.FullName == "" && sender.PushName == "" && sender.FirstName == "") {
 		b.reloadContacts() // Contacts may need to be reloaded
+		sender, exists = b.contacts[senderJid]
 	}
 
 	if !exists {