diff --git a/app/src/main/java/com/vitorpamplona/amethyst/model/AntiSpamFilter.kt b/app/src/main/java/com/vitorpamplona/amethyst/model/AntiSpamFilter.kt index 001069c08..34b26bba3 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/model/AntiSpamFilter.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/model/AntiSpamFilter.kt @@ -4,6 +4,7 @@ import android.util.Log import android.util.LruCache import androidx.lifecycle.LiveData import com.vitorpamplona.amethyst.service.model.Event +import com.vitorpamplona.amethyst.service.relays.Relay import com.vitorpamplona.amethyst.ui.components.BundledUpdate import kotlinx.coroutines.Dispatchers @@ -14,7 +15,7 @@ class AntiSpamFilter { val spamMessages = LruCache(1000) @Synchronized - fun isSpam(event: Event): Boolean { + fun isSpam(event: Event, relay: Relay?): Boolean { val idHex = event.id // if short message, ok @@ -27,7 +28,7 @@ class AntiSpamFilter { val hash = (event.content + event.tags.flatten().joinToString(",")).hashCode() if ((recentMessages[hash] != null && recentMessages[hash] != idHex) || spamMessages[hash] != null) { - Log.w("Potential SPAM Message", "${event.id} ${recentMessages[hash]} ${spamMessages[hash] != null} ${event.content.replace("\n", " | ")}") + Log.w("Potential SPAM Message", "${event.id} ${recentMessages[hash]} ${spamMessages[hash] != null} ${relay?.url} ${event.content.replace("\n", " | ")}") // Log down offenders if (spamMessages.get(hash) == null) { diff --git a/app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt b/app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt index da8686412..90e260cd2 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt @@ -187,7 +187,7 @@ object LocalCache { // Already processed this event. if (note.event != null) return - if (antiSpam.isSpam(event)) { + if (antiSpam.isSpam(event, relay)) { relay?.let { it.spamCounter++ } @@ -223,7 +223,7 @@ object LocalCache { // Already processed this event. if (note.event?.id() == event.id()) return - if (antiSpam.isSpam(event)) { + if (antiSpam.isSpam(event, relay)) { relay?.let { it.spamCounter++ } @@ -302,12 +302,10 @@ object LocalCache { fun consume(event: ContactListEvent) { val user = getOrCreateUser(event.pubKey) - val follows = event.unverifiedFollowKeySet() - if (event.createdAt > (user.latestContactList?.createdAt ?: 0) && !follows.isNullOrEmpty()) { - // Saves relay list only if it's a user that is currently been seen + // avoids processing empty contact lists. + if (event.createdAt > (user.latestContactList?.createdAt ?: 0) && !event.tags.isEmpty()) { user.updateContactList(event) - // Log.d("CL", "AAA ${user.toBestDisplayName()} ${follows.size}") } } @@ -543,7 +541,7 @@ object LocalCache { // Already processed this event. if (note.event != null) return - if (antiSpam.isSpam(event)) { + if (antiSpam.isSpam(event, relay)) { relay?.let { it.spamCounter++ } diff --git a/app/src/main/java/com/vitorpamplona/amethyst/model/Note.kt b/app/src/main/java/com/vitorpamplona/amethyst/model/Note.kt index 4b63c8547..d8f633116 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/model/Note.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/model/Note.kt @@ -155,6 +155,7 @@ open class Note(val idHex: String) { } } + @Synchronized fun addZap(zapRequest: Note, zap: Note?) { if (zapRequest !in zaps.keys) { zaps = zaps + Pair(zapRequest, zap) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/model/User.kt b/app/src/main/java/com/vitorpamplona/amethyst/model/User.kt index 4b9d5a5ac..909a4d705 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/model/User.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/model/User.kt @@ -273,7 +273,7 @@ class User(val pubkeyHex: String) { } fun transientFollowerCount(): Int { - return LocalCache.users.values.count { it.latestContactList?.let { pubkeyHex in it.unverifiedFollowKeySet() } ?: false } + return LocalCache.users.values.count { it.latestContactList?.isTaggedUser(pubkeyHex) ?: false } } fun cachedFollowingKeySet(): Set { @@ -289,7 +289,7 @@ class User(val pubkeyHex: String) { } fun cachedFollowerCount(): Int { - return LocalCache.users.values.count { it.latestContactList?.let { pubkeyHex in it.unverifiedFollowKeySet() } ?: false } + return LocalCache.users.values.count { it.latestContactList?.isTaggedUser(pubkeyHex) ?: false } } fun hasSentMessagesTo(user: User?): Boolean { diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/model/LnZapEvent.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/model/LnZapEvent.kt index ff42b7676..f1796fe9a 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/service/model/LnZapEvent.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/service/model/LnZapEvent.kt @@ -38,7 +38,7 @@ class LnZapEvent( } override fun containedPost(): Event? = try { - description()?.let { + description()?.ifBlank { null }?.let { fromJson(it, Client.lenient) } } catch (e: Exception) { diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/relays/EOSE.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/relays/EOSE.kt index b55904bb7..ba2193a97 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/service/relays/EOSE.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/service/relays/EOSE.kt @@ -2,7 +2,11 @@ package com.vitorpamplona.amethyst.service.relays import com.vitorpamplona.amethyst.model.User -class EOSETime(var time: Long) +class EOSETime(var time: Long) { + override fun toString(): String { + return time.toString() + } +} class EOSERelayList(var relayList: Map = emptyMap()) { fun addOrUpdate(relayUrl: String, time: Long) { diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostView.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostView.kt index 100b3fabe..8ef31d698 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostView.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostView.kt @@ -167,7 +167,7 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n if (isValidURL(myUrlPreview)) { val removedParamsFromUrl = myUrlPreview.split("?")[0].lowercase() - if (imageExtensions.any { removedParamsFromUrl.endsWith(it, true) }) { + if (imageExtensions.any { removedParamsFromUrl.endsWith(it) }) { AsyncImage( model = myUrlPreview, contentDescription = myUrlPreview, @@ -182,7 +182,7 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n RoundedCornerShape(15.dp) ) ) - } else if (videoExtensions.any { removedParamsFromUrl.endsWith(it, true) }) { + } else if (videoExtensions.any { removedParamsFromUrl.endsWith(it) }) { VideoView(myUrlPreview) } else { UrlPreview(myUrlPreview, myUrlPreview) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt index 02ff82e40..1dc0ce154 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt @@ -15,7 +15,6 @@ import androidx.compose.material.LocalTextStyle import androidx.compose.material.MaterialTheme import androidx.compose.material.Text import androidx.compose.runtime.Composable -import androidx.compose.runtime.livedata.observeAsState import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color @@ -138,10 +137,10 @@ fun RichTextViewer( // sequence of images will render in a slideview if (isValidURL(word)) { val removedParamsFromUrl = word.split("?")[0].lowercase() - if (imageExtensions.any { word.endsWith(it, true) }) { + if (imageExtensions.any { removedParamsFromUrl.endsWith(it) }) { imagesForPager.add(word) } - if (videoExtensions.any { word.endsWith(it, true) }) { + if (videoExtensions.any { removedParamsFromUrl.endsWith(it) }) { imagesForPager.add(word) } } @@ -155,28 +154,59 @@ fun RichTextViewer( s.forEach { word: String -> if (canPreview) { // Explicit URL - val lnInvoice = LnInvoiceUtil.findInvoice(word) - val lnWithdrawal = LnWithdrawalUtil.findWithdrawal(word) - if (isValidURL(word)) { val removedParamsFromUrl = word.split("?")[0].lowercase() - if (imageExtensions.any { word.endsWith(it, true) }) { + if (imageExtensions.any { removedParamsFromUrl.endsWith(it) }) { ZoomableImageView(word, imagesForPager) - } else if (videoExtensions.any { word.endsWith(it, true) }) { + } else if (videoExtensions.any { removedParamsFromUrl.endsWith(it) }) { ZoomableImageView(word, imagesForPager) } else { UrlPreview(word, "$word ") } - } else if (lnInvoice != null) { - InvoicePreview(lnInvoice) - } else if (lnWithdrawal != null) { - ClickableWithdrawal(withdrawalString = lnWithdrawal) + } else if (word.startsWith("lnbc", true)) { + val lnInvoice = LnInvoiceUtil.findInvoice(word) + if (lnInvoice != null) { + InvoicePreview(lnInvoice) + } else { + Text( + text = "$word ", + style = LocalTextStyle.current.copy(textDirection = TextDirection.Content) + ) + } + } else if (word.startsWith("lnurl", true)) { + val lnWithdrawal = LnWithdrawalUtil.findWithdrawal(word) + if (lnWithdrawal != null) { + ClickableWithdrawal(withdrawalString = lnWithdrawal) + } else { + Text( + text = "$word ", + style = LocalTextStyle.current.copy(textDirection = TextDirection.Content) + ) + } } else if (Patterns.EMAIL_ADDRESS.matcher(word).matches()) { ClickableEmail(word) - } else if (Patterns.PHONE.matcher(word).matches() && word.length > 6) { + } else if (word.length > 6 && Patterns.PHONE.matcher(word).matches()) { ClickablePhone(word) } else if (isBechLink(word)) { BechLink(word, navController) + } else if (word.startsWith("#")) { + if (tagIndex.matcher(word).matches() && tags != null) { + TagLink( + word, + tags, + canPreview, + backgroundColor, + accountViewModel, + navController + ) + } else if (hashTagsPattern.matcher(word).matches()) { + HashTag(word, accountViewModel, navController) + } else { + Text( + text = "$word ", + style = LocalTextStyle.current.copy(textDirection = TextDirection.Content) + ) + } } else if (noProtocolUrlValidator.matcher(word).matches()) { val matcher = noProtocolUrlValidator.matcher(word) matcher.find() @@ -185,10 +215,6 @@ fun RichTextViewer( ClickableUrl(url, "https://$url") Text("$additionalChars ") - } else if (tagIndex.matcher(word).matches() && tags != null) { - TagLink(word, tags, canPreview, backgroundColor, accountViewModel, navController) - } else if (hashTagsPattern.matcher(word).matches()) { - HashTag(word, accountViewModel, navController) } else { Text( text = "$word ", @@ -198,12 +224,40 @@ fun RichTextViewer( } else { if (isValidURL(word)) { ClickableUrl("$word ", word) + } else if (word.startsWith("lnurl", true)) { + val lnWithdrawal = LnWithdrawalUtil.findWithdrawal(word) + if (lnWithdrawal != null) { + ClickableWithdrawal(withdrawalString = lnWithdrawal) + } else { + Text( + text = "$word ", + style = LocalTextStyle.current.copy(textDirection = TextDirection.Content) + ) + } } else if (Patterns.EMAIL_ADDRESS.matcher(word).matches()) { ClickableEmail(word) } else if (Patterns.PHONE.matcher(word).matches() && word.length > 6) { ClickablePhone(word) } else if (isBechLink(word)) { BechLink(word, navController) + } else if (word.startsWith("#")) { + if (tagIndex.matcher(word).matches() && tags != null) { + TagLink( + word, + tags, + canPreview, + backgroundColor, + accountViewModel, + navController + ) + } else if (hashTagsPattern.matcher(word).matches()) { + HashTag(word, accountViewModel, navController) + } else { + Text( + text = "$word ", + style = LocalTextStyle.current.copy(textDirection = TextDirection.Content) + ) + } } else if (noProtocolUrlValidator.matcher(word).matches()) { val matcher = noProtocolUrlValidator.matcher(word) matcher.find() @@ -212,10 +266,6 @@ fun RichTextViewer( ClickableUrl(url, "https://$url") Text("$additionalChars ") - } else if (tagIndex.matcher(word).matches() && tags != null) { - TagLink(word, tags, canPreview, backgroundColor, accountViewModel, navController) - } else if (hashTagsPattern.matcher(word).matches()) { - HashTag(word, accountViewModel, navController) } else { Text( text = "$word ", @@ -235,9 +285,9 @@ private fun isArabic(text: String): Boolean { } fun isBechLink(word: String): Boolean { - val cleaned = word.removePrefix("@").removePrefix("nostr:").removePrefix("@") + val cleaned = word.removePrefix("@").removePrefix("nostr:").removePrefix("@").take(7).lowercase() - return listOf("npub1", "naddr1", "note1", "nprofile1", "nevent1").any { cleaned.startsWith(it, true) } + return listOf("npub1", "naddr1", "note1", "nprofile1", "nevent1").any { cleaned.startsWith(it) } } @Composable @@ -340,14 +390,8 @@ fun TagLink(word: String, tags: List>, canPreview: Boolean, backgro if (tags[index][0] == "p") { val baseUser = LocalCache.checkGetOrCreateUser(tags[index][1]) if (baseUser != null) { - val userState = baseUser.live().metadata.observeAsState() - val user = userState.value?.user - if (user != null) { - ClickableUserTag(user, navController) - Text(text = "$extraCharacters ") - } else { - Text(text = "$word ") - } + ClickableUserTag(baseUser, navController) + Text(text = "$extraCharacters ") } else { // if here the tag is not a valid Nostr Hex Text(text = "$word ") diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableImageView.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableImageView.kt index 02f5cafe8..19b3b2a24 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableImageView.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableImageView.kt @@ -62,7 +62,8 @@ fun ZoomableImageView(word: String, images: List = listOf(word)) { mutableStateOf(null) } - if (imageExtensions.any { word.endsWith(it, true) }) { + val removedParamsFromUrl = word.split("?")[0].lowercase() + if (imageExtensions.any { removedParamsFromUrl.endsWith(it) }) { AsyncImage( model = word, contentDescription = word, @@ -171,7 +172,8 @@ fun ZoomableImageDialog(imageUrl: String, allImages: List = listOf(image @Composable private fun RenderImageOrVideo(imageUrl: String) { - if (imageExtensions.any { imageUrl.endsWith(it, true) }) { + val removedParamsFromUrl = imageUrl.split("?")[0].lowercase() + if (imageExtensions.any { removedParamsFromUrl.endsWith(it) }) { AsyncImage( model = imageUrl, contentDescription = stringResource(id = R.string.profile_image), diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt index 50b561b2c..d7d18be4b 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt @@ -112,7 +112,7 @@ fun NoteCompose( ) } - Log.d("Time", "Note Compose in $elapsed for ${baseNote.event?.content()?.split("\n")?.get(0)?.take(100)}") + Log.d("Time", "Note Compose in $elapsed for ${baseNote.event?.kind()} ${baseNote.event?.content()?.split("\n")?.get(0)?.take(100)}") } @OptIn(ExperimentalFoundationApi::class)