diff --git a/bridge/whatsappmulti/handlers.go b/bridge/whatsappmulti/handlers.go index c6b96a5e..dd7e87bd 100644 --- a/bridge/whatsappmulti/handlers.go +++ b/bridge/whatsappmulti/handlers.go @@ -51,7 +51,7 @@ func (b *Bwhatsapp) handleTextMessage(messageInfo types.MessageInfo, msg *proto. senderJID := messageInfo.Sender channel := messageInfo.Chat - senderName := b.getSenderName(messageInfo.Sender) + senderName := b.getSenderName(messageInfo.Sender, messageInfo.PushName) if senderName == "" { senderName = "Someone" // don't expose telephone number } @@ -118,7 +118,7 @@ func (b *Bwhatsapp) handleImageMessage(msg *events.Message) { imsg := msg.Message.GetImageMessage() senderJID := msg.Info.Sender - senderName := b.getSenderName(senderJID) + senderName := b.getSenderName(senderJID, msg.Info.PushName) ci := imsg.GetContextInfo() if senderJID == (types.JID{}) && ci.Participant != nil { @@ -181,7 +181,7 @@ func (b *Bwhatsapp) handleVideoMessage(msg *events.Message) { imsg := msg.Message.GetVideoMessage() senderJID := msg.Info.Sender - senderName := b.getSenderName(senderJID) + senderName := b.getSenderName(senderJID, msg.Info.PushName) ci := imsg.GetContextInfo() if senderJID == (types.JID{}) && ci.Participant != nil { @@ -238,7 +238,7 @@ func (b *Bwhatsapp) handleAudioMessage(msg *events.Message) { imsg := msg.Message.GetAudioMessage() senderJID := msg.Info.Sender - senderName := b.getSenderName(senderJID) + senderName := b.getSenderName(senderJID, msg.Info.PushName) ci := imsg.GetContextInfo() if senderJID == (types.JID{}) && ci.Participant != nil { @@ -295,7 +295,7 @@ func (b *Bwhatsapp) handleDocumentMessage(msg *events.Message) { imsg := msg.Message.GetDocumentMessage() senderJID := msg.Info.Sender - senderName := b.getSenderName(senderJID) + senderName := b.getSenderName(senderJID, msg.Info.PushName) ci := imsg.GetContextInfo() if senderJID == (types.JID{}) && ci.Participant != nil { diff --git a/bridge/whatsappmulti/helpers.go b/bridge/whatsappmulti/helpers.go index 5b1ec86c..767a5086 100644 --- a/bridge/whatsappmulti/helpers.go +++ b/bridge/whatsappmulti/helpers.go @@ -18,7 +18,7 @@ type ProfilePicInfo struct { Status int16 `json:"status"` } -func (b *Bwhatsapp) getSenderName(senderJid types.JID) string { +func (b *Bwhatsapp) getSenderName(senderJid types.JID, AltName string) string { if sender, exists := b.contacts[senderJid]; exists { if sender.FullName != "" { return sender.FullName @@ -65,6 +65,10 @@ func (b *Bwhatsapp) getSenderName(senderJid types.JID) string { } } + if AltName != "" { + return AltName + } + return "Someone" }