fixes #432 - prioritize names from own address book over lid public names

Author: d99kris

lib/common/src/version.h

@@ -7,4 +7,4 @@
 
 #pragma once
 
-#define NCHAT_VERSION "5.12.4"
+#define NCHAT_VERSION "5.12.5"

lib/wmchat/go/gowm.go

@@ -1127,19 +1127,45 @@ func GetContacts(connId int) {
 		LOG_WARNING(fmt.Sprintf("get all contacts failed %#v", contErr))
 	} else {
 		LOG_TRACE(fmt.Sprintf("contacts %#v", contacts))
+		var userIdName map[string]string = make(map[string]string)
+
+		// add lid-based data first (public names)
 		for jid, contactInfo := range contacts {
-			name := GetNameFromContactInfo(contactInfo)
-			if len(name) > 0 {
-				userId := JidToStr(client, jid)
-				phone := PhoneFromUserId(userId)
-				isSelf := BoolToInt(userId == selfId)
-				LOG_TRACE(fmt.Sprintf("Call CWmNewContactsNotify %s %s", userId, name))
-				CWmNewContactsNotify(connId, userId, name, phone, isSelf, isNotify)
-				AddContactName(connId, userId, name)
-			} else {
-				LOG_WARNING(fmt.Sprintf("Skip CWmNewContactsNotify %s %#v", JidToStr(client, jid), contactInfo))
+			if jid.Server == types.HiddenUserServer {
+				name := GetNameFromContactInfo(contactInfo)
+				if len(name) > 0 {
+					userId := JidToStr(client, jid)
+					userIdName[userId] = name
+				} else {
+					LOG_WARNING(fmt.Sprintf("Skip empty name %s %#v", JidToStr(client, jid), contactInfo))
+				}
 			}
 		}
+
+		// add regular data second (address book names)
+		for jid, contactInfo := range contacts {
+			if jid.Server != types.HiddenUserServer {
+				name := GetNameFromContactInfo(contactInfo)
+				if len(name) > 0 {
+					userId := JidToStr(client, jid)
+					if oldName, ok := userIdName[userId]; ok {
+						LOG_TRACE(fmt.Sprintf("Replace public name %s with %s", oldName, name))
+					}
+					userIdName[userId] = name
+				} else {
+					LOG_WARNING(fmt.Sprintf("Skip empty name %s %#v", JidToStr(client, jid), contactInfo))
+				}
+			}
+		}
+
+		// propagate data
+		for userId, name := range userIdName {
+			phone := PhoneFromUserId(userId)
+			isSelf := BoolToInt(userId == selfId)
+			LOG_TRACE(fmt.Sprintf("Call CWmNewContactsNotify %s %s", userId, name))
+			CWmNewContactsNotify(connId, userId, name, phone, isSelf, isNotify)
+			AddContactName(connId, userId, name)
+		}
 	}
 
 	// groups

src/nchat.1

@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man.
-.TH NCHAT "1" "November 2025" "nchat 5.12.4" "User Commands"
+.TH NCHAT "1" "November 2025" "nchat 5.12.5" "User Commands"
 .SH NAME
 nchat \- ncurses chat
 .SH SYNOPSIS