Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the "Someone" nickname problem (whatsapp) #1931

Merged
merged 6 commits into from
Dec 14, 2022
Merged

Fix the "Someone" nickname problem (whatsapp) #1931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ffd9ec1
Apply patch to work around the "Someone" nickname problem
ilmaisin Nov 29, 2022
a975b14
Code cleanup (whatsapp)
ilmaisin Nov 29, 2022
fe39c5a
Cleanup
ilmaisin Dec 2, 2022
7cf4e4b
Code cleanup (whatsapp)
ilmaisin Dec 2, 2022
0b14df5
Re-examine if sender exists
ilmaisin Dec 2, 2022
2200a9c
Cleanup (whatsapp)
ilmaisin Dec 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 5 additions & 11 deletions bridge/whatsappmulti/handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,7 @@ func (b *Bwhatsapp) handleTextMessage(messageInfo types.MessageInfo, msg *proto.
senderJID := messageInfo.Sender
channel := messageInfo.Chat

senderName := b.getSenderName(messageInfo.Sender)
if senderName == "" {
senderName = "Someone" // don't expose telephone number
}
senderName := b.getSenderName(messageInfo)

if msg.GetExtendedTextMessage() == nil && msg.GetConversation() == "" {
b.Log.Debugf("message without text content? %#v", msg)
Expand Down Expand Up @@ -82,9 +79,6 @@ func (b *Bwhatsapp) handleTextMessage(messageInfo types.MessageInfo, msg *proto.
// mentions comes as telephone numbers and we don't want to expose it to other bridges
// replace it with something more meaninful to others
mention := b.getSenderNotify(types.NewJID(numberAndSuffix[0], types.DefaultUserServer))
if mention == "" {
mention = "someone"
}

text = strings.Replace(text, "@"+numberAndSuffix[0], "@"+mention, 1)
}
Expand Down Expand Up @@ -118,7 +112,7 @@ func (b *Bwhatsapp) handleImageMessage(msg *events.Message) {
imsg := msg.Message.GetImageMessage()

senderJID := msg.Info.Sender
senderName := b.getSenderName(senderJID)
senderName := b.getSenderName(msg.Info)
ci := imsg.GetContextInfo()

if senderJID == (types.JID{}) && ci.Participant != nil {
Expand Down Expand Up @@ -181,7 +175,7 @@ func (b *Bwhatsapp) handleVideoMessage(msg *events.Message) {
imsg := msg.Message.GetVideoMessage()

senderJID := msg.Info.Sender
senderName := b.getSenderName(senderJID)
senderName := b.getSenderName(msg.Info)
ci := imsg.GetContextInfo()

if senderJID == (types.JID{}) && ci.Participant != nil {
Expand Down Expand Up @@ -238,7 +232,7 @@ func (b *Bwhatsapp) handleAudioMessage(msg *events.Message) {
imsg := msg.Message.GetAudioMessage()

senderJID := msg.Info.Sender
senderName := b.getSenderName(senderJID)
senderName := b.getSenderName(msg.Info)
ci := imsg.GetContextInfo()

if senderJID == (types.JID{}) && ci.Participant != nil {
Expand Down Expand Up @@ -295,7 +289,7 @@ func (b *Bwhatsapp) handleDocumentMessage(msg *events.Message) {
imsg := msg.Message.GetDocumentMessage()

senderJID := msg.Info.Sender
senderName := b.getSenderName(senderJID)
senderName := b.getSenderName(msg.Info)
ci := imsg.GetContextInfo()

if senderJID == (types.JID{}) && ci.Participant != nil {
Expand Down
79 changes: 45 additions & 34 deletions bridge/whatsappmulti/helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,24 +18,7 @@ type ProfilePicInfo struct {
Status int16 `json:"status"`
}

func (b *Bwhatsapp) getSenderName(senderJid types.JID) string {
if sender, exists := b.contacts[senderJid]; exists {
if sender.FullName != "" {
return sender.FullName
}
// if user is not in phone contacts
// it is the most obvious scenario unless you sync your phone contacts with some remote updated source
// users can change it in their WhatsApp settings -> profile -> click on Avatar
if sender.PushName != "" {
return sender.PushName
}

if sender.FirstName != "" {
return sender.FirstName
}
}

// try to reload this contact
func (b *Bwhatsapp) reloadContacts(){
if _, err := b.wc.Store.Contacts.GetAllContacts(); err != nil {
b.Log.Errorf("error on update of contacts: %v", err)
}
Expand All @@ -48,32 +31,60 @@ func (b *Bwhatsapp) getSenderName(senderJid types.JID) string {
if len(allcontacts) > 0 {
b.contacts = allcontacts
}
}

func (b *Bwhatsapp) getSenderName(info types.MessageInfo) string {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Method Bwhatsapp.getSenderName has a Cognitive Complexity of 21 (exceeds 20 allowed). Consider refactoring.

// Parse AD JID
var senderJid types.JID
senderJid.User, senderJid.Server = info.Sender.User, info.Sender.Server

sender, exists := b.contacts[senderJid]

if !exists || (sender.FullName == "" && sender.FirstName == "") {
b.reloadContacts() // Contacts may need to be reloaded
sender, exists = b.contacts[senderJid]
}

if sender, exists := b.contacts[senderJid]; exists {
if sender.FullName != "" {
return sender.FullName
}
// if user is not in phone contacts
// it is the most obvious scenario unless you sync your phone contacts with some remote updated source
// users can change it in their WhatsApp settings -> profile -> click on Avatar
if sender.PushName != "" {
return sender.PushName
}

if sender.FirstName != "" {
return sender.FirstName
}
if exists && sender.FullName != "" {
return sender.FullName
}

if info.PushName != "" {
return info.PushName
}

if exists && sender.FirstName != "" {
return sender.FirstName
}

return "Someone"
}

func (b *Bwhatsapp) getSenderNotify(senderJid types.JID) string {
if sender, exists := b.contacts[senderJid]; exists {
sender, exists := b.contacts[senderJid]

if !exists || (sender.FullName == "" && sender.PushName == "" && sender.FirstName == "") {
b.reloadContacts() // Contacts may need to be reloaded
sender, exists = b.contacts[senderJid]
}

if !exists {
return "someone"
}

if exists && sender.FullName != "" {
return sender.FullName
}

if exists && sender.PushName != "" {
return sender.PushName
}

return ""
if exists && sender.FirstName != "" {
return sender.FirstName
}

return "someone"
}

func (b *Bwhatsapp) GetProfilePicThumb(jid string) (*types.ProfilePictureInfo, error) {
Expand Down