Nip17 dms to extend the mesh (#313)

* favorite each other * show favorites as system messsages * wip show glove when offline but mayb edoesnt work * send and receive works * wip kinda works but no * getting there * kinda * show offline peers in peer list * kinda wonky but almost works * fixes * nostr user goes offline works * nostr -> mesh works * handoff works * background message processing * read works * seen message store was missing
2026-07-27 02:25:21 +00:00 · 2025-08-25 18:38:10 +02:00
parent 941be1b98f
commit 6fe6e049ad
15 changed files with 1153 additions and 173 deletions
@@ -0,0 +1,82 @@
+package com.bitchat.android.services
+
+import com.bitchat.android.ui.ChatState
+
+object ConversationAliasResolver {
+
+    fun resolveCanonicalPeerID(
+        selectedPeerID: String,
+        connectedPeers: List<String>,
+        meshNoiseKeyForPeer: (String) -> ByteArray?,
+        meshHasPeer: (String) -> Boolean,
+        nostrPubHexForAlias: (String) -> String?,
+        findNoiseKeyForNostr: (String) -> ByteArray?
+    ): String {
+        var peer = selectedPeerID
+        try {
+            if (peer.startsWith("nostr_")) {
+                val pubHex = nostrPubHexForAlias(peer)
+                if (pubHex != null) {
+                    val noiseKey = findNoiseKeyForNostr(pubHex)
+                    if (noiseKey != null) {
+                        val noiseHex = noiseKey.joinToString("") { b -> "%02x".format(b) }
+                        // Prefer a connected mesh peer that matches this noise key
+                        val meshPeer = connectedPeers.firstOrNull { pid ->
+                            meshNoiseKeyForPeer(pid)?.contentEquals(noiseKey) == true
+                        }
+                        peer = meshPeer ?: noiseHex
+                    }
+                }
+            } else if (peer.length == 64 && peer.matches(Regex("^[0-9a-fA-F]+$"))) {
+                // Peer is full noise key hex: upgrade to active mesh peer if available
+                val noiseKey = peer.chunked(2).map { it.toInt(16).toByte() }.toByteArray()
+                val meshPeer = connectedPeers.firstOrNull { pid ->
+                    meshNoiseKeyForPeer(pid)?.contentEquals(noiseKey) == true
+                }
+                if (meshPeer != null) {
+                    peer = meshPeer
+                }
+            }
+        } catch (_: Exception) { /* no-op */ }
+        return peer
+    }
+
+    fun unifyChatsIntoPeer(
+        state: ChatState,
+        targetPeerID: String,
+        keysToMerge: List<String>
+    ) {
+        if (keysToMerge.isEmpty()) return
+        val currentChats = state.getPrivateChatsValue().toMutableMap()
+        val targetList = currentChats[targetPeerID]?.toMutableList() ?: mutableListOf()
+        var didMerge = false
+        keysToMerge.distinct().forEach { key ->
+            if (key == targetPeerID) return@forEach
+            val list = currentChats[key]
+            if (!list.isNullOrEmpty()) {
+                targetList.addAll(list)
+                currentChats.remove(key)
+                didMerge = true
+            }
+        }
+        if (didMerge) {
+            targetList.sortBy { it.timestamp }
+            currentChats[targetPeerID] = targetList
+            state.setPrivateChats(currentChats)
+
+            // Move unread flags
+            val unread = state.getUnreadPrivateMessagesValue().toMutableSet()
+            var hadUnread = false
+            keysToMerge.forEach { key -> if (unread.remove(key)) hadUnread = true }
+            if (hadUnread) unread.add(targetPeerID)
+            state.setUnreadPrivateMessages(unread)
+
+            // Switch selection if currently viewing an alias that got merged
+            val selected = state.getSelectedPrivateChatPeerValue()
+            if (selected != null && keysToMerge.contains(selected)) {
+                state.setSelectedPrivateChatPeer(targetPeerID)
+            }
+        }
+    }
+}
+