From 716ebd01df5995eec55d2a36ef74c63e1541d677 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Wed, 1 Mar 2023 16:07:10 -0500 Subject: [PATCH] Decreasing the speed of the updates of the feed. --- .../main/java/com/vitorpamplona/amethyst/model/LocalCache.kt | 2 +- app/src/main/java/com/vitorpamplona/amethyst/model/User.kt | 2 +- .../com/vitorpamplona/amethyst/service/NostrGlobalDataSource.kt | 1 - .../java/com/vitorpamplona/amethyst/ui/dal/GlobalFeedFilter.kt | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) 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 3372b2942..db37df801 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt @@ -742,7 +742,7 @@ class LocalCacheLiveData(val cache: LocalCache): LiveData(Local val scope = CoroutineScope(Job() + Dispatchers.Main) scope.launch { try { - delay(100) + delay(500) refresh() } finally { withContext(NonCancellable) { 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 0bdfc3356..67e656942 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/model/User.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/model/User.kt @@ -370,7 +370,7 @@ class UserMetadata { fun anyNameStartsWith(prefix: String): Boolean { return listOfNotNull(name, username, display_name, displayName, nip05, lud06, lud16) - .filter { it.startsWith(prefix, true) }.isNotEmpty() + .any { it.startsWith(prefix, true) } } } diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/NostrGlobalDataSource.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/NostrGlobalDataSource.kt index 6dbd4cba7..b4b3ddf55 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/service/NostrGlobalDataSource.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/service/NostrGlobalDataSource.kt @@ -1,6 +1,5 @@ package com.vitorpamplona.amethyst.service -import com.vitorpamplona.amethyst.model.Account import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent import com.vitorpamplona.amethyst.service.relays.FeedType import com.vitorpamplona.amethyst.service.relays.TypedFilter diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/GlobalFeedFilter.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/GlobalFeedFilter.kt index 0aa1a8c79..e02ee666b 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/GlobalFeedFilter.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/GlobalFeedFilter.kt @@ -10,11 +10,11 @@ object GlobalFeedFilter: FeedFilter() { lateinit var account: Account override fun feed() = LocalCache.notes.values - .filter { account.isAcceptable(it) } .filter { (it.event is TextNoteEvent && (it.event as TextNoteEvent).replyTos.isEmpty()) || (it.event is ChannelMessageEvent && (it.event as ChannelMessageEvent).replyTos.isEmpty()) } + .filter { account.isAcceptable(it) } .sortedBy { it.event?.createdAt } .reversed()