Hotfix: Fix ChatID sync migration and real-time message updates

Author: TeleGhost Dev

app.go

@@ -420,12 +420,12 @@ func (a *App) SetAppFocus(focused bool) {
 	}
 }
 
-// RequestProfileUpdate запрашивает обновление профиля у контакта
-func (a *App) RequestProfileUpdate(address string) error {
-	if a.core != nil && a.core.Messenger != nil {
-		return a.core.Messenger.SendProfileRequest(address)
+// RequestProfile запрашивает обновление профиля у контакта
+func (a *App) RequestProfile(address string) error {
+	if a.core != nil {
+		return a.core.RequestProfile(address)
 	}
-	return fmt.Errorf("messenger not initialized")
+	return fmt.Errorf("core not initialized")
 }
 
 // ExportReseed wraps AppCore.ExportReseed

frontend/src/App.svelte

@@ -147,9 +147,12 @@
         // Более надежная проверка на принадлежность сообщения текущему чату
         const isCurrentChat = selectedContact && (
             msg.ChatID === selectedContact.ChatID || 
+            msg.chat_id === selectedContact.ChatID ||
             msg.ChatID === selectedContact.ID ||
             msg.SenderID === selectedContact.PublicKey ||
-            (msg.IsOutgoing && msg.ChatID === selectedContact.ChatID)
+            msg.sender_id === selectedContact.PublicKey ||
+            (msg.sender_addr && msg.sender_addr === selectedContact.I2PAddress) ||
+            (msg.IsOutgoing && (msg.ChatID === selectedContact.ChatID || msg.chat_id === selectedContact.ChatID))
         );
 
         if (isCurrentChat) {
@@ -185,7 +188,8 @@
             if (updated) {
                 // Critical: Check if ChatID changed
                 if (updated.ChatID !== selectedContact.ChatID) {
-                    console.log("[App] Selected contact updated (ChatID changed), reloading chat...");
+                    console.log("[App] Selected contact updated (ChatID changed), reloading chat from", selectedContact.ChatID, "to", updated.ChatID);
+                    // Update local reference immediately so new_message can match it while loadMessages is pending
                     selectedContact = updated;
                     await loadMessages(updated.ID);
                 } else if (

internal/appcore/appcore.go

@@ -689,7 +689,7 @@ func (a *AppCore) formatProfileAvatarURL(userID, path string) string {
 }
 
 // onProfileUpdate обрабатывает входящее обновление профиля от контакта
-func (a *AppCore) onProfileUpdate(senderPubKey, nickname, bio string, avatar []byte) {
+func (a *AppCore) onProfileUpdate(senderPubKey, nickname, bio string, avatar []byte, senderAddr string) {
 	if a.Repo == nil {
 		return
 	}
@@ -701,7 +701,25 @@ func (a *AppCore) onProfileUpdate(senderPubKey, nickname, bio string, avatar []b
 
 	contact, _ := a.Repo.GetContactByPublicKey(a.Ctx, senderPubKey)
 	if contact == nil {
-		return
+		// Try to find by address (important for b32-only contacts discovery)
+		contact, _ = a.Repo.GetContactByAddress(a.Ctx, senderAddr)
+		if contact != nil {
+			oldChatID := contact.ChatID
+			newChatID := identity.CalculateChatID(a.Identity.Keys.PublicKeyBase64, senderPubKey)
+
+			log.Printf("[AppCore] Discovered PublicKey via ProfileUpdate for %s (%s). Migrating ChatID: %s -> %s", contact.Nickname, senderAddr, oldChatID, newChatID)
+
+			contact.PublicKey = senderPubKey
+			contact.ChatID = newChatID
+			contact.UpdatedAt = time.Now()
+
+			if err := a.Repo.UpdateContactAndMigrateChatID(a.Ctx, contact, oldChatID, newChatID); err != nil {
+				log.Printf("[AppCore] Failed to migrate ChatID via ProfileUpdate for %s: %v", contact.Nickname, err)
+			}
+		} else {
+			// Not a contact we know, just return
+			return
+		}
 	}
 
 	contact.Nickname = nickname
@@ -752,6 +770,14 @@ func (a *AppCore) onProfileRequest(requestorPubKey string) {
 	}
 }
 
+// RequestProfile запрашивает обновление профиля у контакта
+func (a *AppCore) RequestProfile(address string) error {
+	if a.Messenger == nil {
+		return fmt.Errorf("messenger not initialized")
+	}
+	return a.Messenger.SendProfileRequest(address)
+}
+
 // ─── Обработчики входящих сообщений ─────────────────────────────────────────
 
 // OnMessageReceived — обработчик входящих сообщений.
@@ -761,6 +787,7 @@ func (a *AppCore) OnMessageReceived(msg *core.Message, senderPubKey, senderAddr
 		return
 	}
 
+	msg.SenderAddr = senderAddr
 	var contact *core.Contact
 	contact, _ = a.Repo.GetContactByPublicKey(a.Ctx, senderPubKey)
 	if contact == nil {

internal/core/models.go

@@ -141,6 +141,9 @@ type Message struct {
 	// SenderID — ID отправителя (User.ID или Contact.ID)
 	SenderID string `json:"sender_id" db:"sender_id"`
 
+	// SenderAddr — I2P адрес отправителя (для сопоставления до того как узнаем PubKey)
+	SenderAddr string `json:"sender_addr,omitempty" db:"-"`
+
 	// Content — содержимое сообщения (расшифрованное)
 	Content string `json:"content" db:"content"`
 

internal/network/messenger/messenger.go

@@ -49,7 +49,7 @@ type MessageHandler func(msg *core.Message, senderPubKey, senderAddr string)
 type ContactRequestHandler func(senderPubKey, nickname, i2pAddress string)
 
 // ProfileUpdateHandler обработчик обновлений профиля
-type ProfileUpdateHandler func(senderPubKey, nickname, bio string, avatar []byte)
+type ProfileUpdateHandler func(senderPubKey, nickname, bio string, avatar []byte, senderAddr string)
 
 // Service — мессенджер сервис
 type Service struct {
@@ -535,7 +535,7 @@ func (s *Service) handlePacket(packet *pb.Packet, remoteAddr string) {
 		s.handleTextMessage(packet, senderPubKey, remoteAddr)
 
 	case pb.PacketType_PROFILE_UPDATE:
-		s.handleProfileUpdate(packet, senderPubKey)
+		s.handleProfileUpdate(packet, senderPubKey, remoteAddr)
 
 	case pb.PacketType_HANDSHAKE:
 		s.handleHandshake(packet, senderPubKey)
@@ -735,7 +735,7 @@ func (s *Service) handleTextMessage(packet *pb.Packet, senderPubKey, remoteAddr
 }
 
 // handleProfileUpdate обрабатывает обновление профиля
-func (s *Service) handleProfileUpdate(packet *pb.Packet, senderPubKey string) {
+func (s *Service) handleProfileUpdate(packet *pb.Packet, senderPubKey, senderAddr string) {
 	profileUpdate := &pb.ProfileUpdate{}
 	if err := proto.Unmarshal(packet.Payload, profileUpdate); err != nil {
 		log.Printf("[Messenger] Failed to unmarshal ProfileUpdate: %v", err)
@@ -744,7 +744,7 @@ func (s *Service) handleProfileUpdate(packet *pb.Packet, senderPubKey string) {
 
 	log.Printf("[Messenger] Profile update from %s: %s", senderPubKey[:min(16, len(senderPubKey))], profileUpdate.Nickname)
 	if s.profileHandler != nil {
-		s.profileHandler(senderPubKey, profileUpdate.Nickname, profileUpdate.Bio, profileUpdate.Avatar)
+		s.profileHandler(senderPubKey, profileUpdate.Nickname, profileUpdate.Bio, profileUpdate.Avatar, senderAddr)
 	}
 }
 

mobile/mobile.go

@@ -479,6 +479,11 @@ func dispatch(app *appcore.AppCore, method string, args []json.RawMessage) (inte
 		parseArgs(args, &id)
 		return nil, app.DeleteContact(id)
 
+	case "RequestProfile":
+		var address string
+		parseArgs(args, &address)
+		return nil, app.RequestProfile(address)
+
 	// === Messages ===
 	case "SendText":
 		var contactID, text, replyToID string