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-25 02:45:20 +00:00 · 2025-08-25 18:38:10 +02:00
parent 941be1b98f
commit 6fe6e049ad
15 changed files with 1153 additions and 173 deletions
@@ -78,6 +78,15 @@ class MessageHandler(private val myPeerID: String) {
                    val privateMessage = com.bitchat.android.model.PrivateMessagePacket.decode(noisePayload.data)
                    if (privateMessage != null) {
                        Log.d(TAG, "🔓 Decrypted TLV PM from $peerID: ${privateMessage.content.take(30)}...")
+
+                        // Handle favorite/unfavorite notifications embedded as PMs
+                        val pmContent = privateMessage.content
+                        if (pmContent.startsWith("[FAVORITED]") || pmContent.startsWith("[UNFAVORITED]")) {
+                            handleFavoriteNotificationFromMesh(pmContent, peerID)
+                            // Acknowledge delivery for UX parity
+                            sendDeliveryAck(privateMessage.messageID, peerID)
+                            return
+                        }
                        
                        // Create BitchatMessage - use local system time for incoming messages
                        val message = BitchatMessage(
@@ -426,6 +435,52 @@ class MessageHandler(private val myPeerID: String) {
    fun shutdown() {
        handlerScope.cancel()
    }
+
+    /**
+     * Handle favorite/unfavorite notification received over mesh as a private message.
+     * Content format: "[FAVORITED]:npub..." or "[UNFAVORITED]:npub..."
+     */
+    private fun handleFavoriteNotificationFromMesh(content: String, fromPeerID: String) {
+        try {
+            val isFavorite = content.startsWith("[FAVORITED]")
+            val npub = content.substringAfter(":", "").trim().takeIf { it.startsWith("npub1") }
+
+            // Update mutual favorite status in persistence
+            // Resolve full Noise key if available via delegate peer info
+            val peerInfo = delegate?.getPeerInfo(fromPeerID)
+            val noiseKey = peerInfo?.noisePublicKey
+            if (noiseKey != null) {
+                com.bitchat.android.favorites.FavoritesPersistenceService.shared.updatePeerFavoritedUs(noiseKey, isFavorite)
+                if (npub != null) {
+                    com.bitchat.android.favorites.FavoritesPersistenceService.shared.updateNostrPublicKey(noiseKey, npub)
+                }
+
+                // Determine iOS-style guidance text
+                val rel = com.bitchat.android.favorites.FavoritesPersistenceService.shared.getFavoriteStatus(noiseKey)
+                val guidance = if (isFavorite) {
+                    if (rel?.isFavorite == true) {
+                        " — mutual! You can continue DMs via Nostr when out of mesh."
+                    } else {
+                        " — favorite back to continue DMs later."
+                    }
+                } else {
+                    ". DMs over Nostr will pause unless you both favorite again."
+                }
+
+                // Emit system message via delegate callback
+                val action = if (isFavorite) "favorited" else "unfavorited"
+                val sys = com.bitchat.android.model.BitchatMessage(
+                    sender = "system",
+                    content = "${peerInfo.nickname} $action you$guidance",
+                    timestamp = java.util.Date(),
+                    isRelay = false
+                )
+                delegate?.onMessageReceived(sys)
+            }
+        } catch (_: Exception) {
+            // Best-effort; ignore errors
+        }
+    }
 }

 /**