Merge branch 'main' into amber

app/src/main/java/com/vitorpamplona/amethyst/model/Note.kt

@@ -142,7 +142,7 @@ open class Note(val idHex: String) {
      * This method caches signatures during each execution to avoid recalculation in longer threads
      */
     fun replyLevelSignature(
-        eventsToConsider: Set<Note>,
+        eventsToConsider: Set<HexKey>,
         cachedSignatures: MutableMap<Note, LevelSignature>,
         account: User,
         accountFollowingSet: Set<String>,
@@ -151,7 +151,7 @@ open class Note(val idHex: String) {
         val replyTo = replyTo
         if (event is RepostEvent || event is GenericRepostEvent || replyTo == null || replyTo.isEmpty()) {
             return LevelSignature(
-                signature = "/" + formattedDateTime(createdAt() ?: 0) + ";",
+                signature = "/" + formattedDateTime(createdAt() ?: 0) + idHex.substring(0, 8) + ";",
                 createdAt = createdAt(),
                 author = author
             )
@@ -159,7 +159,7 @@ open class Note(val idHex: String) {
 
         val parent = (
             replyTo
-                .filter { it in eventsToConsider } // This forces the signature to be based on a branch, avoiding two roots
+                .filter { it.idHex in eventsToConsider } // This forces the signature to be based on a branch, avoiding two roots
                 .map {
                     cachedSignatures[it] ?: it.replyLevelSignature(
                         eventsToConsider,
@@ -176,13 +176,13 @@ open class Note(val idHex: String) {
 
         val threadOrder = if (parent?.author == author && createdAt() != null) {
             // author of the thread first, in **ascending** order
-            "9" + formattedDateTime((parent?.createdAt ?: 0) + (now - (createdAt() ?: 0)))
+            "9" + formattedDateTime((parent?.createdAt ?: 0) + (now - (createdAt() ?: 0))) + idHex.substring(0, 8)
         } else if (author?.pubkeyHex == account.pubkeyHex) {
-            "8" + formattedDateTime(createdAt() ?: 0) // my replies
+            "8" + formattedDateTime(createdAt() ?: 0) + idHex.substring(0, 8) // my replies
         } else if (author?.pubkeyHex in accountFollowingSet) {
-            "7" + formattedDateTime(createdAt() ?: 0) // my follows replies.
+            "7" + formattedDateTime(createdAt() ?: 0) + idHex.substring(0, 8) // my follows replies.
         } else {
-            "0" + formattedDateTime(createdAt() ?: 0) // everyone else.
+            "0" + formattedDateTime(createdAt() ?: 0) + idHex.substring(0, 8) // everyone else.
         }
 
         val mySignature = LevelSignature(

app/src/main/java/com/vitorpamplona/amethyst/service/lnurl/LightningAddressResolver.kt

@@ -164,9 +164,16 @@ class LightningAddressResolver() {
                                     onProgress(0.7f)
                                     onSuccess(pr)
                                 } else {
+                                    onProgress(0.0f)
                                     onError("Incorrect invoice amount (${invoiceAmount.toLong()} sats) from server")
                                 }
-                            } ?: onError("Invoice Not Created (element pr not found in the resulting JSON)")
+                            } ?: lnInvoice?.get("reason")?.asText()?.ifBlank { null }?.let { reason ->
+                                onProgress(0.0f)
+                                onError("Unable to create a lightning invoice before sending the zap. The receiver's lightning wallet sent the following error: $reason")
+                            } ?: run {
+                                onProgress(0.0f)
+                                onError("nable to create a lightning invoice before sending the zap. Element pr not found in the resulting JSON.")
+                            }
                         },
                         onError = onError
                     )

app/src/main/java/com/vitorpamplona/amethyst/service/notifications/EventNotificationConsumer.kt

@@ -19,6 +19,7 @@ import com.vitorpamplona.quartz.events.LnZapEvent
 import com.vitorpamplona.quartz.events.LnZapRequestEvent
 import com.vitorpamplona.quartz.events.PrivateDmEvent
 import com.vitorpamplona.quartz.events.SealedGossipEvent
+import com.vitorpamplona.quartz.utils.TimeUtils
 import kotlinx.collections.immutable.persistentSetOf
 import java.math.BigDecimal
 
@@ -75,7 +76,11 @@ class EventNotificationConsumer(private val applicationContext: Context) {
             if (acc != null && acc.userProfile().pubkeyHex == giftWrap.recipientPubKey()) {
                 val chatEvent = unwrapAndConsume(giftWrap, account = acc)
 
-                if (chatEvent is ChatMessageEvent && acc.keyPair.privKey != null) {
+                if (chatEvent is ChatMessageEvent && // must be messages, not any other event
+                    acc.keyPair.privKey != null && // can't decrypt
+                    chatEvent.createdAt > TimeUtils.fiveMinutesAgo() && // old event being re-broadcasted
+                    chatEvent.pubKey != acc.userProfile().pubkeyHex // from the user
+                ) {
                     val chatNote = LocalCache.notes[chatEvent.id] ?: return
                     val chatRoom = chatEvent.chatroomKey(acc.keyPair.pubKey.toHexKey())
 
@@ -101,6 +106,9 @@ class EventNotificationConsumer(private val applicationContext: Context) {
     private fun notify(event: PrivateDmEvent) {
         val note = LocalCache.notes[event.id] ?: return
 
+        // old event being re-broadcast
+        if (event.createdAt < TimeUtils.fiveMinutesAgo()) return
+
         LocalPreferences.allSavedAccounts().forEach {
             val acc = LocalPreferences.loadFromEncryptedStorage(it.npub)
 
@@ -130,6 +138,9 @@ class EventNotificationConsumer(private val applicationContext: Context) {
     private fun notify(event: LnZapEvent) {
         val noteZapEvent = LocalCache.notes[event.id] ?: return
 
+        // old event being re-broadcast
+        if (event.createdAt < TimeUtils.fiveMinutesAgo()) return
+
         val noteZapRequest = event.zapRequest?.id?.let { LocalCache.checkGetOrCreateNote(it) } ?: return
         val noteZapped = event.zappedPost().firstOrNull()?.let { LocalCache.checkGetOrCreateNote(it) }
 

app/src/main/java/com/vitorpamplona/amethyst/service/relays/Relay.kt

@@ -47,6 +47,7 @@ class Relay(
     private var listeners = setOf<Listener>()
     private var socket: WebSocket? = null
     private var isReady: Boolean = false
+    private var usingCompression: Boolean = false
 
     var eventDownloadCounterInBytes = 0
     var eventUploadCounterInBytes = 0
@@ -85,6 +86,9 @@ class Relay(
     private var connectingBlock = AtomicBoolean()
 
     fun connectAndRun(onConnected: (Relay) -> Unit) {
+        // BRB is crashing OkHttp Deflater object :(
+        if (url.contains("brb.io")) return
+
         // If there is a connection, don't wait.
         if (connectingBlock.getAndSet(true)) {
             return
@@ -115,7 +119,10 @@ class Relay(
         override fun onOpen(webSocket: WebSocket, response: Response) {
             checkNotInMainThread()
 
-            markConnectionAsReady(response.receivedResponseAtMillis - response.sentRequestAtMillis)
+            markConnectionAsReady(
+                pingInMs = response.receivedResponseAtMillis - response.sentRequestAtMillis,
+                usingCompression = response.headers.get("Sec-WebSocket-Extensions")?.contains("permessage-deflate") ?: false
+            )
 
             // Log.w("Relay", "Relay OnOpen, Loading All subscriptions $url")
             onConnected(this@Relay)
@@ -175,15 +182,17 @@ class Relay(
         }
     }
 
-    fun markConnectionAsReady(pingInMs: Long) {
+    fun markConnectionAsReady(pingInMs: Long, usingCompression: Boolean) {
         this.afterEOSE = false
         this.isReady = true
         this.pingInMs = pingInMs
+        this.usingCompression = usingCompression
     }
 
     fun markConnectionAsClosed() {
         this.socket = null
         this.isReady = false
+        this.usingCompression = false
         this.afterEOSE = false
         this.closingTimeInSeconds = TimeUtils.now()
     }
@@ -239,6 +248,7 @@ class Relay(
         socket?.close(1000, "Normal close")
         socket = null
         isReady = false
+        usingCompression = false
         afterEOSE = false
     }
 

app/src/main/java/com/vitorpamplona/amethyst/ui/dal/ThreadFeedFilter.kt

@@ -18,11 +18,12 @@ class ThreadFeedFilter(val account: Account, val noteId: String) : FeedFilter<No
         val cachedSignatures: MutableMap<Note, Note.LevelSignature> = mutableMapOf()
         val followingSet = account.selectedUsersFollowList(KIND3_FOLLOWS) ?: emptySet()
         val eventsToWatch = ThreadAssembler().findThreadFor(noteId)
+        val eventsInHex = eventsToWatch.map { it.idHex }.toSet()
         val now = TimeUtils.now()
 
         // Currently orders by date of each event, descending, at each level of the reply stack
         val order = compareByDescending<Note> {
-            it.replyLevelSignature(eventsToWatch, cachedSignatures, account.userProfile(), followingSet, now).signature
+            it.replyLevelSignature(eventsInHex, cachedSignatures, account.userProfile(), followingSet, now).signature
         }
 
         return eventsToWatch.sortedWith(order)

app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt

@@ -2700,14 +2700,14 @@ private fun BadgeBox(
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit
 ) {
-    val isRepost by remember {
+    val isRepost by remember(baseNote) {
         derivedStateOf {
             baseNote.event is RepostEvent || baseNote.event is GenericRepostEvent
         }
     }
 
     if (isRepost) {
-        val baseReply by remember {
+        val baseReply by remember(baseNote) {
             derivedStateOf {
                 baseNote.replyTo?.lastOrNull()
             }

app/src/main/java/com/vitorpamplona/amethyst/ui/note/ReactionsRow.kt

@@ -1025,11 +1025,29 @@ fun ZapReaction(
         }
 
         if (wantsToChangeZapAmount) {
-            UpdateZapAmountDialog({ wantsToChangeZapAmount = false }, accountViewModel = accountViewModel)
+            UpdateZapAmountDialog(
+                onClose = { wantsToChangeZapAmount = false },
+                accountViewModel = accountViewModel
+            )
         }
 
         if (wantsToSetCustomZap) {
-            ZapCustomDialog({ wantsToSetCustomZap = false }, accountViewModel, baseNote)
+            ZapCustomDialog(
+                onClose = { wantsToSetCustomZap = false },
+                onError = {
+                    scope.launch {
+                        zappingProgress = 0f
+                        showErrorMessageDialog = it
+                    }
+                },
+                onProgress = {
+                    scope.launch(Dispatchers.Main) {
+                        zappingProgress = it
+                    }
+                },
+                accountViewModel = accountViewModel,
+                baseNote = baseNote
+            )
         }
 
         if (zappingProgress > 0.00001 && zappingProgress < 0.99999) {

app/src/main/java/com/vitorpamplona/amethyst/ui/note/UpdateZapAmountDialog.kt

@@ -197,7 +197,11 @@ class UpdateZapAmountViewModel(val account: Account) : ViewModel() {
 
 @OptIn(ExperimentalLayoutApi::class)
 @Composable
-fun UpdateZapAmountDialog(onClose: () -> Unit, nip47uri: String? = null, accountViewModel: AccountViewModel) {
+fun UpdateZapAmountDialog(
+    onClose: () -> Unit,
+    nip47uri: String? = null,
+    accountViewModel: AccountViewModel
+) {
     val context = LocalContext.current
     val scope = rememberCoroutineScope()
 

app/src/main/java/com/vitorpamplona/amethyst/ui/note/ZapCustomDialog.kt

@@ -1,6 +1,5 @@
 package com.vitorpamplona.amethyst.ui.note
 
-import android.widget.Toast
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.*
@@ -31,8 +30,6 @@ import com.vitorpamplona.amethyst.ui.theme.ButtonBorder
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
 import com.vitorpamplona.quartz.events.LnZapEvent
 import kotlinx.collections.immutable.toImmutableList
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 
 class ZapOptionstViewModel : ViewModel() {
     private var account: Account? = null
@@ -61,17 +58,20 @@ class ZapOptionstViewModel : ViewModel() {
 }
 
 @Composable
-fun ZapCustomDialog(onClose: () -> Unit, accountViewModel: AccountViewModel, baseNote: Note) {
+fun ZapCustomDialog(
+    onClose: () -> Unit,
+    onError: (text: String) -> Unit,
+    onProgress: (percent: Float) -> Unit,
+    accountViewModel: AccountViewModel,
+    baseNote: Note
+) {
     val context = LocalContext.current
-    val scope = rememberCoroutineScope()
     val postViewModel: ZapOptionstViewModel = viewModel()
 
     LaunchedEffect(accountViewModel) {
         postViewModel.load(accountViewModel.account)
     }
 
-    var zappingProgress by remember { mutableStateOf(0f) }
-
     val zapTypes = listOf(
         Triple(LnZapEvent.ZapType.PUBLIC, stringResource(id = R.string.zap_type_public), stringResource(id = R.string.zap_type_public_explainer)),
         Triple(LnZapEvent.ZapType.PRIVATE, stringResource(id = R.string.zap_type_private), stringResource(id = R.string.zap_type_private_explainer)),
@@ -111,17 +111,8 @@ fun ZapCustomDialog(onClose: () -> Unit, accountViewModel: AccountViewModel, bas
                             null,
                             postViewModel.customMessage.text,
                             context,
-                            onError = {
-                                zappingProgress = 0f
-                                scope.launch {
-                                    Toast.makeText(context, it, Toast.LENGTH_SHORT).show()
-                                }
-                            },
-                            onProgress = {
-                                scope.launch(Dispatchers.Main) {
-                                    zappingProgress = it
-                                }
-                            },
+                            onError = onError,
+                            onProgress = onProgress,
                             zapType = selectedZapType
                         )
                         onClose()