From 282935c5f31a790438b059895cb4e12525f6b3df Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Wed, 6 Aug 2025 08:55:35 -0400 Subject: [PATCH 1/6] Adds search relays as fallback for event finding activities --- .../AccountNotificationsEoseFromInboxRelaysManager.kt | 2 +- .../reqCommand/event/loaders/FilterMissingAddressables.kt | 4 ++++ .../reqCommand/event/loaders/FilterMissingEvents.kt | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/nip01Notifications/AccountNotificationsEoseFromInboxRelaysManager.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/nip01Notifications/AccountNotificationsEoseFromInboxRelaysManager.kt index f9d36d2d3..7b433b23d 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/nip01Notifications/AccountNotificationsEoseFromInboxRelaysManager.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/nip01Notifications/AccountNotificationsEoseFromInboxRelaysManager.kt @@ -39,7 +39,7 @@ class AccountNotificationsEoseFromInboxRelaysManager( client: NostrClient, allKeys: () -> Set, ) : PerUserEoseManager(client, allKeys) { - override fun user(query: AccountQueryState) = query.account.userProfile() + override fun user(key: AccountQueryState) = key.account.userProfile() /** * Downloads most notifications from the user's own inbox relays. diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/event/loaders/FilterMissingAddressables.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/event/loaders/FilterMissingAddressables.kt index 5beab5ac6..cb16b55d5 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/event/loaders/FilterMissingAddressables.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/event/loaders/FilterMissingAddressables.kt @@ -76,6 +76,10 @@ fun filterMissingAddressables(keys: List): List add(relayUrl, key.note.address) } + + key.account.searchRelayList.flow.value.forEach { relayUrl -> + add(relayUrl, key.note.address) + } } // loads threading that is event-based diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/event/loaders/FilterMissingEvents.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/event/loaders/FilterMissingEvents.kt index b8f6e1745..7b5e21544 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/event/loaders/FilterMissingEvents.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/event/loaders/FilterMissingEvents.kt @@ -77,6 +77,10 @@ fun filterMissingEvents(keys: List): List add(relayUrl, key.note.idHex) } + + key.account.searchRelayList.flow.value.forEach { relayUrl -> + add(relayUrl, key.note.idHex) + } } // loads threading that is event-based From 1971956443755f6abc359c72d6584c0ad72e78a0 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Wed, 6 Aug 2025 13:18:13 -0400 Subject: [PATCH 2/6] Setting up the boundary for one week ago for notifications --- .../AccountNotificationsEoseFromInboxRelaysManager.kt | 2 +- .../AccountNotificationsEoseFromRandomRelaysManager.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/nip01Notifications/AccountNotificationsEoseFromInboxRelaysManager.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/nip01Notifications/AccountNotificationsEoseFromInboxRelaysManager.kt index 7b433b23d..0f64a2668 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/nip01Notifications/AccountNotificationsEoseFromInboxRelaysManager.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/nip01Notifications/AccountNotificationsEoseFromInboxRelaysManager.kt @@ -59,7 +59,7 @@ class AccountNotificationsEoseFromInboxRelaysManager( filterNotificationsToPubkey( relay = it, pubkey = user(key).pubkeyHex, - since = since?.get(it)?.time ?: key.feedContentStates.notifications.lastNoteCreatedAtIfFilled(), + since = since?.get(it)?.time ?: key.feedContentStates.notifications.lastNoteCreatedAtIfFilled() ?: TimeUtils.oneWeekAgo(), ) } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/nip01Notifications/AccountNotificationsEoseFromRandomRelaysManager.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/nip01Notifications/AccountNotificationsEoseFromRandomRelaysManager.kt index 740d93c9c..9f59c18bc 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/nip01Notifications/AccountNotificationsEoseFromRandomRelaysManager.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/nip01Notifications/AccountNotificationsEoseFromRandomRelaysManager.kt @@ -39,7 +39,7 @@ class AccountNotificationsEoseFromRandomRelaysManager( client: NostrClient, allKeys: () -> Set, ) : PerUserEoseManager(client, allKeys) { - override fun user(query: AccountQueryState) = query.account.userProfile() + override fun user(key: AccountQueryState) = key.account.userProfile() /** * Downloads most notifications from the user's own inbox relays. @@ -51,7 +51,7 @@ class AccountNotificationsEoseFromRandomRelaysManager( since: SincePerRelayMap?, ): List? = (key.account.followsPerRelay.value.keys - key.account.notificationRelays.flow.value).flatMap { - val since = since?.get(it)?.time ?: TimeUtils.oneDayAgo() + val since = since?.get(it)?.time ?: TimeUtils.oneWeekAgo() filterJustTheLatestNotificationsToPubkeyFromRandomRelays(it, user(key).pubkeyHex, since) } From 71bbae2f9b30bbf897ec6762a60687fe9f02e508 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Wed, 6 Aug 2025 13:18:45 -0400 Subject: [PATCH 3/6] Simple refactoring --- .../notifications/NotificationSummaryState.kt | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/NotificationSummaryState.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/NotificationSummaryState.kt index b22941856..1e17c4c48 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/NotificationSummaryState.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/NotificationSummaryState.kt @@ -111,12 +111,10 @@ class NotificationSummaryState( takenIntoAccount.add(noteEvent.id) } } else if (noteEvent is LnZapEvent) { - if ( - noteEvent.isTaggedUser(currentUser) - ) { // the user might be sending his own receipts noteEvent.pubKey != currentUser + // the user might be sending his own receipts noteEvent.pubKey != currentUser + if (noteEvent.isTaggedUser(currentUser)) { val netDate = formatDate(noteEvent.createdAt) - zaps[netDate] = - (zaps[netDate] ?: BigDecimal.ZERO) + (noteEvent.amount ?: BigDecimal.ZERO) + zaps[netDate] = (zaps[netDate] ?: BigDecimal.ZERO) + (noteEvent.amount ?: BigDecimal.ZERO) takenIntoAccount.add(noteEvent.id) } } else if (noteEvent is BaseThreadedEvent) { @@ -178,12 +176,10 @@ class NotificationSummaryState( hasNewElements = true } } else if (noteEvent is LnZapEvent) { - if ( - noteEvent.isTaggedUser(currentUser) - ) { // && noteEvent.pubKey != currentUser User might be sending his own receipts + if (noteEvent.isTaggedUser(currentUser)) { + // && noteEvent.pubKey != currentUser User might be sending his own receipts val netDate = formatDate(noteEvent.createdAt) - zaps[netDate] = - (zaps[netDate] ?: BigDecimal.ZERO) + (noteEvent.amount ?: BigDecimal.ZERO) + zaps[netDate] = (zaps[netDate] ?: BigDecimal.ZERO) + (noteEvent.amount ?: BigDecimal.ZERO) takenIntoAccount.add(noteEvent.id) hasNewElements = true } From ca554720105bc261203cefe2ad2b124f9c3e4747 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Wed, 6 Aug 2025 13:20:00 -0400 Subject: [PATCH 4/6] Increases the limit for notification events to fill up a week's worth of inbox --- .../nip01Notifications/FilterNotificationsToPubkey.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/nip01Notifications/FilterNotificationsToPubkey.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/nip01Notifications/FilterNotificationsToPubkey.kt index 4f75d1521..9c528f479 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/nip01Notifications/FilterNotificationsToPubkey.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/nip01Notifications/FilterNotificationsToPubkey.kt @@ -116,7 +116,7 @@ fun filterNotificationsToPubkey( Filter( kinds = NotificationsPerKeyKinds, tags = mapOf("p" to listOf(pubkey)), - limit = 50, + limit = 500, since = since, ), ), @@ -126,7 +126,7 @@ fun filterNotificationsToPubkey( Filter( kinds = NotificationsPerKeyKinds2, tags = mapOf("p" to listOf(pubkey)), - limit = 100, + limit = 500, since = since, ), ), @@ -147,7 +147,7 @@ fun filterJustTheLatestNotificationsToPubkeyFromRandomRelays( Filter( kinds = SummaryKinds, tags = mapOf("p" to listOf(pubkey)), - limit = 10, + limit = 500, since = since, ), ), @@ -157,7 +157,7 @@ fun filterJustTheLatestNotificationsToPubkeyFromRandomRelays( Filter( kinds = NotificationsPerKeyKinds, tags = mapOf("p" to listOf(pubkey)), - limit = 5, + limit = 500, since = since, ), ), @@ -167,7 +167,7 @@ fun filterJustTheLatestNotificationsToPubkeyFromRandomRelays( Filter( kinds = NotificationsPerKeyKinds2, tags = mapOf("p" to listOf(pubkey)), - limit = 5, + limit = 500, since = since, ), ), From 726f9e2f4f7bd36c0c9b884560ac55c40c36dacc Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Wed, 6 Aug 2025 14:07:51 -0400 Subject: [PATCH 5/6] Moves target compatibility to java 21 --- amethyst/build.gradle | 6 +++--- ammolite/build.gradle | 6 +++--- benchmark/build.gradle | 6 +++--- commons/build.gradle | 6 +++--- quartz/build.gradle | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/amethyst/build.gradle b/amethyst/build.gradle index c1ae1376d..82e5ae67b 100644 --- a/amethyst/build.gradle +++ b/amethyst/build.gradle @@ -175,8 +175,8 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility JavaVersion.VERSION_21 + targetCompatibility JavaVersion.VERSION_21 } buildFeatures { @@ -212,7 +212,7 @@ configurations.all { kotlin { compilerOptions { - jvmTarget = JvmTarget.JVM_17 + jvmTarget = JvmTarget.JVM_21 } } diff --git a/ammolite/build.gradle b/ammolite/build.gradle index ec74b8808..9c8f5dc4e 100644 --- a/ammolite/build.gradle +++ b/ammolite/build.gradle @@ -32,8 +32,8 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility JavaVersion.VERSION_21 + targetCompatibility JavaVersion.VERSION_21 } packagingOptions { resources { @@ -44,7 +44,7 @@ android { kotlin { compilerOptions { - jvmTarget = JvmTarget.JVM_17 + jvmTarget = JvmTarget.JVM_21 freeCompilerArgs.add("-Xstring-concat=inline") } } diff --git a/benchmark/build.gradle b/benchmark/build.gradle index a45aa4aae..866d4e71b 100644 --- a/benchmark/build.gradle +++ b/benchmark/build.gradle @@ -20,8 +20,8 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility JavaVersion.VERSION_21 + targetCompatibility JavaVersion.VERSION_21 } sourceSets.androidTest.assets.srcDirs += ["../quartz/src/androidTest/assets"] @@ -48,7 +48,7 @@ android { kotlin { compilerOptions { - jvmTarget = JvmTarget.JVM_17 + jvmTarget = JvmTarget.JVM_21 freeCompilerArgs.add("-Xstring-concat=inline") } } diff --git a/commons/build.gradle b/commons/build.gradle index 82c054688..cba6f3a55 100644 --- a/commons/build.gradle +++ b/commons/build.gradle @@ -29,8 +29,8 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility JavaVersion.VERSION_21 + targetCompatibility JavaVersion.VERSION_21 } buildFeatures { @@ -40,7 +40,7 @@ android { kotlin { compilerOptions { - jvmTarget = JvmTarget.JVM_17 + jvmTarget = JvmTarget.JVM_21 freeCompilerArgs.add("-Xstring-concat=inline") } } diff --git a/quartz/build.gradle b/quartz/build.gradle index d6e191a40..59399786a 100644 --- a/quartz/build.gradle +++ b/quartz/build.gradle @@ -28,8 +28,8 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility JavaVersion.VERSION_21 + targetCompatibility JavaVersion.VERSION_21 } packagingOptions { resources { @@ -40,7 +40,7 @@ android { kotlin { compilerOptions { - jvmTarget = JvmTarget.JVM_17 + jvmTarget = JvmTarget.JVM_21 freeCompilerArgs.add("-Xstring-concat=inline") } } From b5662fd05a9eacb967e8229b47b529400ef80253 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Wed, 6 Aug 2025 14:09:06 -0400 Subject: [PATCH 6/6] normalizes the parameter name across all adaptive filters --- .../amethyst/ui/dal/AdditiveFeedFilter.kt | 4 ++-- .../loggedIn/chats/privateDM/dal/ChatroomFeedFilter.kt | 6 +++--- .../chats/publicChannels/dal/ChannelFeedFilter.kt | 6 +++--- .../chats/rooms/dal/ChatroomListKnownFeedFilter.kt | 2 +- .../chats/rooms/dal/ChatroomListNewFeedFilter.kt | 2 +- .../loggedIn/communities/dal/CommunityFeedFilter.kt | 4 ++-- .../nip23LongForm/DiscoverLongFormFeedFilter.kt | 4 ++-- .../discover/nip28Chats/DiscoverChatFeedFilter.kt | 8 ++++---- .../nip51FollowSets/DiscoverFollowSetsFeedFilter.kt | 4 ++-- .../nip53LiveActivities/DiscoverLiveFeedFilter.kt | 10 +++++----- .../nip72Communities/DiscoverCommunityFeedFilter.kt | 8 ++++---- .../discover/nip90DVMs/DiscoverNIP89FeedFilter.kt | 4 ++-- .../nip99Classifieds/DiscoverMarketplaceFeedFilter.kt | 4 ++-- .../loggedIn/drafts/dal/DraftEventsFeedFilter.kt | 6 +++--- .../dvms/dal/NIP90ContentDiscoveryResponseFilter.kt | 6 +++--- .../screen/loggedIn/geohash/dal/GeoHashFeedFilter.kt | 4 ++-- .../screen/loggedIn/hashtag/dal/HashtagFeedFilter.kt | 4 ++-- .../loggedIn/home/dal/HomeConversationsFeedFilter.kt | 4 ++-- .../loggedIn/home/dal/HomeNewThreadFeedFilter.kt | 6 +++--- .../notifications/dal/NotificationFeedFilter.kt | 4 ++-- .../dal/UserProfileConversationsFeedFilter.kt | 4 ++-- .../gallery/dal/UserProfileGalleryFeedFilter.kt | 4 ++-- .../apps/UserProfileAppRecommendationsFeedFilter.kt | 4 ++-- .../profile/mutual/dal/UserProfileMutualFeedFilter.kt | 4 ++-- .../newthreads/dal/UserProfileNewThreadFeedFilter.kt | 4 ++-- .../reports/dal/UserProfileReportsFeedFilter.kt | 4 ++-- .../ui/screen/loggedIn/video/dal/VideoFeedFilter.kt | 4 ++-- 27 files changed, 64 insertions(+), 64 deletions(-) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/AdditiveFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/AdditiveFeedFilter.kt index b11d4651c..9ade31bea 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/AdditiveFeedFilter.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/AdditiveFeedFilter.kt @@ -23,9 +23,9 @@ package com.vitorpamplona.amethyst.ui.dal import com.vitorpamplona.amethyst.logTime abstract class AdditiveFeedFilter : FeedFilter() { - abstract fun applyFilter(collection: Set): Set + abstract fun applyFilter(newItems: Set): Set - abstract fun sort(collection: Set): List + abstract fun sort(items: Set): List open fun updateListWith( oldList: List, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/privateDM/dal/ChatroomFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/privateDM/dal/ChatroomFeedFilter.kt index 3f24867d4..877c0de4e 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/privateDM/dal/ChatroomFeedFilter.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/privateDM/dal/ChatroomFeedFilter.kt @@ -42,11 +42,11 @@ class ChatroomFeedFilter( .reversed() } - override fun applyFilter(collection: Set): Set { + override fun applyFilter(newItems: Set): Set { val chatroom = account.chatroomList.getOrCreatePrivateChatroom(withUser) - return collection.filter { it in chatroom.messages && account.isAcceptable(it) }.toSet() + return newItems.filter { it in chatroom.messages && account.isAcceptable(it) }.toSet() } - override fun sort(collection: Set): List = collection.sortedWith(DefaultFeedOrder) + override fun sort(items: Set): List = items.sortedWith(DefaultFeedOrder) } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/dal/ChannelFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/dal/ChannelFeedFilter.kt index b2119942e..90d0b43cf 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/dal/ChannelFeedFilter.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/dal/ChannelFeedFilter.kt @@ -40,10 +40,10 @@ class ChannelFeedFilter( }, ) - override fun applyFilter(collection: Set): Set = - collection + override fun applyFilter(newItems: Set): Set = + newItems .filter { channel.notes.containsKey(it.idHex) && account.isAcceptable(it) } .toSet() - override fun sort(collection: Set): List = collection.sortedWith(DefaultFeedOrder) + override fun sort(items: Set): List = items.sortedWith(DefaultFeedOrder) } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/dal/ChatroomListKnownFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/dal/ChatroomListKnownFeedFilter.kt index a3773be35..debe99060 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/dal/ChatroomListKnownFeedFilter.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/dal/ChatroomListKnownFeedFilter.kt @@ -254,5 +254,5 @@ class ChatroomListKnownFeedFilter( return newRelevantPrivateMessages } - override fun sort(collection: Set): List = collection.sortedWith(DefaultFeedOrder) + override fun sort(items: Set): List = items.sortedWith(DefaultFeedOrder) } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/dal/ChatroomListNewFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/dal/ChatroomListNewFeedFilter.kt index 969695f43..920c4bb1c 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/dal/ChatroomListNewFeedFilter.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/dal/ChatroomListNewFeedFilter.kt @@ -133,5 +133,5 @@ class ChatroomListNewFeedFilter( return newRelevantPrivateMessages } - override fun sort(collection: Set): List = collection.sortedWith(DefaultFeedOrder) + override fun sort(items: Set): List = items.sortedWith(DefaultFeedOrder) } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/communities/dal/CommunityFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/communities/dal/CommunityFeedFilter.kt index c279994c7..14aa925b4 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/communities/dal/CommunityFeedFilter.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/communities/dal/CommunityFeedFilter.kt @@ -46,7 +46,7 @@ class CommunityFeedFilter( return sort(result) } - override fun applyFilter(collection: Set): Set = innerApplyFilter(collection) + override fun applyFilter(newItems: Set): Set = innerApplyFilter(newItems) private fun innerApplyFilter(collection: Collection): Set { val myPubKey = account.userProfile().pubkeyHex @@ -79,5 +79,5 @@ class CommunityFeedFilter( null } - override fun sort(collection: Set): List = collection.sortedWith(DefaultFeedOrder) + override fun sort(items: Set): List = items.sortedWith(DefaultFeedOrder) } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip23LongForm/DiscoverLongFormFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip23LongForm/DiscoverLongFormFeedFilter.kt index 0eea42a29..3438293de 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip23LongForm/DiscoverLongFormFeedFilter.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip23LongForm/DiscoverLongFormFeedFilter.kt @@ -55,7 +55,7 @@ open class DiscoverLongFormFeedFilter( return sort(notes) } - override fun applyFilter(collection: Set): Set = innerApplyFilter(collection) + override fun applyFilter(newItems: Set): Set = innerApplyFilter(newItems) fun buildFilterParams(account: Account): FilterByListParams = FilterByListParams.create( @@ -72,5 +72,5 @@ open class DiscoverLongFormFeedFilter( } } - override fun sort(collection: Set): List = collection.sortedWith(DefaultFeedOrder) + override fun sort(items: Set): List = items.sortedWith(DefaultFeedOrder) } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip28Chats/DiscoverChatFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip28Chats/DiscoverChatFeedFilter.kt index c7c4e9ca5..e881f0119 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip28Chats/DiscoverChatFeedFilter.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip28Chats/DiscoverChatFeedFilter.kt @@ -61,7 +61,7 @@ open class DiscoverChatFeedFilter( return sort(allChannelNotes) } - override fun applyFilter(collection: Set): Set = innerApplyFilter(collection) + override fun applyFilter(newItems: Set): Set = innerApplyFilter(newItems) fun buildFilterParams(account: Account): FilterByListParams = FilterByListParams.create( @@ -102,13 +102,13 @@ open class DiscoverChatFeedFilter( } } - override fun sort(collection: Set): List { + override fun sort(items: Set): List { val lastNote = - collection.associateWith { note -> + items.associateWith { note -> LocalCache.getPublicChatChannelIfExists(note.idHex)?.lastNote?.createdAt() ?: 0 } - return collection + return items .sortedWith( compareBy( { lastNote[it] }, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip51FollowSets/DiscoverFollowSetsFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip51FollowSets/DiscoverFollowSetsFeedFilter.kt index 07d278ff2..01fc98a7e 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip51FollowSets/DiscoverFollowSetsFeedFilter.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip51FollowSets/DiscoverFollowSetsFeedFilter.kt @@ -53,7 +53,7 @@ open class DiscoverFollowSetsFeedFilter( return sort(notes) } - override fun applyFilter(collection: Set): Set = innerApplyFilter(collection) + override fun applyFilter(newItems: Set): Set = innerApplyFilter(newItems) fun buildFilterParams(account: Account): FilterByListParams = FilterByListParams.create( @@ -70,5 +70,5 @@ open class DiscoverFollowSetsFeedFilter( } } - override fun sort(collection: Set): List = collection.sortedWith(DefaultFeedOrder) + override fun sort(items: Set): List = items.sortedWith(DefaultFeedOrder) } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip53LiveActivities/DiscoverLiveFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip53LiveActivities/DiscoverLiveFeedFilter.kt index bf2f1db73..118149e56 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip53LiveActivities/DiscoverLiveFeedFilter.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip53LiveActivities/DiscoverLiveFeedFilter.kt @@ -60,7 +60,7 @@ open class DiscoverLiveFeedFilter( return sort(notes) } - override fun applyFilter(collection: Set): Set = innerApplyFilter(collection) + override fun applyFilter(newItems: Set): Set = innerApplyFilter(newItems) protected open fun innerApplyFilter(collection: Collection): Set { val filterParams = @@ -75,7 +75,7 @@ open class DiscoverLiveFeedFilter( } } - override fun sort(collection: Set): List { + override fun sort(items: Set): List { val topFilter = account.liveDiscoveryFollowLists.value val discoveryTopFilterAuthors = when (topFilter) { @@ -94,12 +94,12 @@ open class DiscoverLiveFeedFilter( val counter = ParticipantListBuilder() val participantCounts = - collection.associate { it to counter.countFollowsThatParticipateOn(it, followingKeySet) } + items.associate { it to counter.countFollowsThatParticipateOn(it, followingKeySet) } val allParticipants = - collection.associate { it to counter.countFollowsThatParticipateOn(it, null) } + items.associate { it to counter.countFollowsThatParticipateOn(it, null) } - return collection + return items .sortedWith( compareBy( { convertStatusToOrder((it.event as? LiveActivitiesEvent)?.status()) }, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip72Communities/DiscoverCommunityFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip72Communities/DiscoverCommunityFeedFilter.kt index 6d28ea78d..95560bbf1 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip72Communities/DiscoverCommunityFeedFilter.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip72Communities/DiscoverCommunityFeedFilter.kt @@ -69,7 +69,7 @@ open class DiscoverCommunityFeedFilter( return sort(notes) } - override fun applyFilter(collection: Set): Set = innerApplyFilter(collection) + override fun applyFilter(newItems: Set): Set = innerApplyFilter(newItems) protected open fun innerApplyFilter(collection: Collection): Set { // here, we need to look for CommunityDefinition in new collection AND new CommunityDefinition from Post Approvals @@ -111,13 +111,13 @@ open class DiscoverCommunityFeedFilter( comingFrom: List = emptyList(), ) = aTag != null && aTag.kind == CommunityDefinitionEvent.KIND && params.match(aTag, comingFrom) - override fun sort(collection: Set): List { + override fun sort(items: Set): List { val lastNote = - collection.associateWith { note -> + items.associateWith { note -> note.boosts.maxOfOrNull { it.createdAt() ?: 0 } ?: 0 } - return collection + return items .sortedWith( compareBy( { lastNote[it] }, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip90DVMs/DiscoverNIP89FeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip90DVMs/DiscoverNIP89FeedFilter.kt index 2a697c56c..eacf82cb3 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip90DVMs/DiscoverNIP89FeedFilter.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip90DVMs/DiscoverNIP89FeedFilter.kt @@ -55,7 +55,7 @@ open class DiscoverNIP89FeedFilter( return sort(notes) } - override fun applyFilter(collection: Set): Set = innerApplyFilter(collection) + override fun applyFilter(newItems: Set): Set = innerApplyFilter(newItems) fun buildFilterParams(account: Account): FilterByListParams = FilterByListParams.create( @@ -85,5 +85,5 @@ open class DiscoverNIP89FeedFilter( acceptDVM(it) } - override fun sort(collection: Set): List = collection.sortedWith(compareBy({ it.createdAt() }, { it.idHex })).reversed() + override fun sort(items: Set): List = items.sortedWith(compareBy({ it.createdAt() }, { it.idHex })).reversed() } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip99Classifieds/DiscoverMarketplaceFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip99Classifieds/DiscoverMarketplaceFeedFilter.kt index 66793384a..7386a6904 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip99Classifieds/DiscoverMarketplaceFeedFilter.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip99Classifieds/DiscoverMarketplaceFeedFilter.kt @@ -54,7 +54,7 @@ open class DiscoverMarketplaceFeedFilter( return sort(notes) } - override fun applyFilter(collection: Set): Set = innerApplyFilter(collection) + override fun applyFilter(newItems: Set): Set = innerApplyFilter(newItems) fun buildFilterParams(account: Account): FilterByListParams = FilterByListParams.create( @@ -71,5 +71,5 @@ open class DiscoverMarketplaceFeedFilter( } } - override fun sort(collection: Set): List = collection.sortedWith(compareBy({ it.createdAt() }, { it.idHex })).reversed() + override fun sort(items: Set): List = items.sortedWith(compareBy({ it.createdAt() }, { it.idHex })).reversed() } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/drafts/dal/DraftEventsFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/drafts/dal/DraftEventsFeedFilter.kt index 8295b5ff9..82eea5b9a 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/drafts/dal/DraftEventsFeedFilter.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/drafts/dal/DraftEventsFeedFilter.kt @@ -32,8 +32,8 @@ class DraftEventsFeedFilter( ) : AdditiveFeedFilter() { override fun feedKey(): String = account.userProfile().pubkeyHex - override fun applyFilter(collection: Set): Set = - collection.filterTo(HashSet()) { + override fun applyFilter(newItems: Set): Set = + newItems.filterTo(HashSet()) { acceptableEvent(it) } @@ -51,5 +51,5 @@ class DraftEventsFeedFilter( return noteEvent is DraftEvent && noteEvent.pubKey == account.userProfile().pubkeyHex } - override fun sort(collection: Set): List = collection.sortedWith(DefaultFeedOrder) + override fun sort(items: Set): List = items.sortedWith(DefaultFeedOrder) } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/dvms/dal/NIP90ContentDiscoveryResponseFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/dvms/dal/NIP90ContentDiscoveryResponseFilter.kt index 34d52608e..efb752dc9 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/dvms/dal/NIP90ContentDiscoveryResponseFilter.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/dvms/dal/NIP90ContentDiscoveryResponseFilter.kt @@ -69,7 +69,7 @@ open class NIP90ContentDiscoveryResponseFilter( } } - override fun applyFilter(collection: Set): Set = innerApplyFilter(collection) + override fun applyFilter(newItems: Set): Set = innerApplyFilter(newItems) fun buildFilterParams(account: Account): FilterByListParams = FilterByListParams.create( @@ -95,7 +95,7 @@ open class NIP90ContentDiscoveryResponseFilter( }.toSet() } - override fun sort(collection: Set): List { - return collection.toList() // collection.sortedWith(compareBy({ it.createdAt() }, { it.idHex })).reversed() + override fun sort(items: Set): List { + return items.toList() // collection.sortedWith(compareBy({ it.createdAt() }, { it.idHex })).reversed() } } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/geohash/dal/GeoHashFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/geohash/dal/GeoHashFeedFilter.kt index a0f556e32..60418c3aa 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/geohash/dal/GeoHashFeedFilter.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/geohash/dal/GeoHashFeedFilter.kt @@ -55,7 +55,7 @@ class GeoHashFeedFilter( return sort(notes) } - override fun applyFilter(collection: Set): Set = innerApplyFilter(collection) + override fun applyFilter(newItems: Set): Set = innerApplyFilter(newItems) private fun innerApplyFilter(collection: Collection): Set = collection.filterTo(HashSet()) { acceptableEvent(it, tag) } @@ -87,5 +87,5 @@ class GeoHashFeedFilter( geohash: String, ): Boolean = event is CommentEvent && event.isTaggedScope(geohash, GeohashId::match) - override fun sort(collection: Set): List = collection.sortedWith(DefaultFeedOrder) + override fun sort(items: Set): List = items.sortedWith(DefaultFeedOrder) } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/hashtag/dal/HashtagFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/hashtag/dal/HashtagFeedFilter.kt index be5a8f483..f961365e3 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/hashtag/dal/HashtagFeedFilter.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/hashtag/dal/HashtagFeedFilter.kt @@ -57,7 +57,7 @@ class HashtagFeedFilter( return sort(notes) } - override fun applyFilter(collection: Set): Set = innerApplyFilter(collection) + override fun applyFilter(newItems: Set): Set = innerApplyFilter(newItems) private fun innerApplyFilter(collection: Collection): Set = collection.filterTo(HashSet()) { acceptableEvent(it, tag) } @@ -91,5 +91,5 @@ class HashtagFeedFilter( hashTag: String, ): Boolean = event is CommentEvent && event.isTaggedScope(hashTag, HashtagId::match) - override fun sort(collection: Set): List = collection.sortedWith(DefaultFeedOrder) + override fun sort(items: Set): List = items.sortedWith(DefaultFeedOrder) } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/dal/HomeConversationsFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/dal/HomeConversationsFeedFilter.kt index 0ff7d6fab..babb01e4d 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/dal/HomeConversationsFeedFilter.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/dal/HomeConversationsFeedFilter.kt @@ -55,7 +55,7 @@ class HomeConversationsFeedFilter( ) } - override fun applyFilter(collection: Set): Set = innerApplyFilter(collection) + override fun applyFilter(newItems: Set): Set = innerApplyFilter(newItems) fun buildFilterParams(account: Account): FilterByListParams = FilterByListParams.create( @@ -90,5 +90,5 @@ class HomeConversationsFeedFilter( filterParams: FilterByListParams, ): Boolean = acceptableEvent(note.event, filterParams) && !note.isNewThread() - override fun sort(collection: Set): List = collection.sortedWith(DefaultFeedOrder) + override fun sort(items: Set): List = items.sortedWith(DefaultFeedOrder) } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/dal/HomeNewThreadFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/dal/HomeNewThreadFeedFilter.kt index a92e45871..534697268 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/dal/HomeNewThreadFeedFilter.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/dal/HomeNewThreadFeedFilter.kt @@ -75,7 +75,7 @@ class HomeNewThreadFeedFilter( return sort(notes + longFormNotes) } - override fun applyFilter(collection: Set): Set = innerApplyFilter(collection) + override fun applyFilter(newItems: Set): Set = innerApplyFilter(newItems) private fun innerApplyFilter(collection: Collection): Set { val filterParams = buildFilterParams(account) @@ -110,8 +110,8 @@ class HomeNewThreadFeedFilter( it.isNewThread() } - override fun sort(collection: Set): List = - collection + override fun sort(items: Set): List = + items .distinctBy { if (it.event is RepostEvent || it.event is GenericRepostEvent) { it.replyTo?.lastOrNull()?.idHex ?: it.idHex // only the most recent repost per feed. diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/dal/NotificationFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/dal/NotificationFeedFilter.kt index bb85db454..460224419 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/dal/NotificationFeedFilter.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/dal/NotificationFeedFilter.kt @@ -84,7 +84,7 @@ class NotificationFeedFilter( return sort(notifications) } - override fun applyFilter(collection: Set): Set = innerApplyFilter(collection) + override fun applyFilter(newItems: Set): Set = innerApplyFilter(newItems) private fun innerApplyFilter(collection: Collection): Set { val filterParams = buildFilterParams(account) @@ -136,7 +136,7 @@ class NotificationFeedFilter( tagsAnEventByUser(it, loggedInUserHex) } - override fun sort(collection: Set): List = collection.sortedWith(DefaultFeedOrder) + override fun sort(items: Set): List = items.sortedWith(DefaultFeedOrder) fun tagsAnEventByUser( note: Note, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/conversations/dal/UserProfileConversationsFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/conversations/dal/UserProfileConversationsFeedFilter.kt index 8cfa16a10..61ea85b95 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/conversations/dal/UserProfileConversationsFeedFilter.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/conversations/dal/UserProfileConversationsFeedFilter.kt @@ -54,7 +54,7 @@ class UserProfileConversationsFeedFilter( return sort(notes + longFormNotes) } - override fun applyFilter(collection: Set): Set = innerApplyFilter(collection) + override fun applyFilter(newItems: Set): Set = innerApplyFilter(newItems) private fun innerApplyFilter(collection: Collection): Set = collection.filterTo(HashSet()) { acceptableEvent(it) } @@ -72,7 +72,7 @@ class UserProfileConversationsFeedFilter( !it.isNewThread() && account.isAcceptable(it) - override fun sort(collection: Set): List = collection.sortedWith(DefaultFeedOrder) + override fun sort(items: Set): List = items.sortedWith(DefaultFeedOrder) override fun limit() = 200 } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/gallery/dal/UserProfileGalleryFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/gallery/dal/UserProfileGalleryFeedFilter.kt index 2866e5766..95c41aae5 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/gallery/dal/UserProfileGalleryFeedFilter.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/gallery/dal/UserProfileGalleryFeedFilter.kt @@ -55,7 +55,7 @@ class UserProfileGalleryFeedFilter( return sorted.toList() } - override fun applyFilter(collection: Set): Set = innerApplyFilter(collection) + override fun applyFilter(newItems: Set): Set = innerApplyFilter(newItems) private fun innerApplyFilter(collection: Collection): Set { val params = buildFilterParams(account) @@ -82,5 +82,5 @@ class UserProfileGalleryFeedFilter( hiddenUsers = account.hiddenUsers.flow.value, ) - override fun sort(collection: Set): List = collection.sortedWith(DefaultFeedOrder) + override fun sort(items: Set): List = items.sortedWith(DefaultFeedOrder) } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/header/apps/UserProfileAppRecommendationsFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/header/apps/UserProfileAppRecommendationsFeedFilter.kt index 9ae74d251..805d6cbfe 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/header/apps/UserProfileAppRecommendationsFeedFilter.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/header/apps/UserProfileAppRecommendationsFeedFilter.kt @@ -41,7 +41,7 @@ class UserProfileAppRecommendationsFeedFilter( return sort(recommendations) } - override fun applyFilter(collection: Set): Set = innerApplyFilter(collection) + override fun applyFilter(newItems: Set): Set = innerApplyFilter(newItems) private fun innerApplyFilter(collection: Collection): Set = collection.mapNotNull { filterMap(it) }.flatten().toSet() @@ -56,5 +56,5 @@ class UserProfileAppRecommendationsFeedFilter( return null } - override fun sort(collection: Set): List = collection.sortedWith(DefaultFeedOrder) + override fun sort(items: Set): List = items.sortedWith(DefaultFeedOrder) } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/mutual/dal/UserProfileMutualFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/mutual/dal/UserProfileMutualFeedFilter.kt index 06954f841..3a5d403eb 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/mutual/dal/UserProfileMutualFeedFilter.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/mutual/dal/UserProfileMutualFeedFilter.kt @@ -62,7 +62,7 @@ class UserProfileMutualFeedFilter( return sort(notes + longFormNotes) } - override fun applyFilter(collection: Set): Set = innerApplyFilter(collection) + override fun applyFilter(newItems: Set): Set = innerApplyFilter(newItems) private fun innerApplyFilter(collection: Collection): Set = collection.filterTo(HashSet()) { acceptableEvent(it) } @@ -84,7 +84,7 @@ class UserProfileMutualFeedFilter( ) && it.event?.isTaggedUser(user.pubkeyHex) == true - override fun sort(collection: Set): List = collection.sortedWith(DefaultFeedOrder) + override fun sort(items: Set): List = items.sortedWith(DefaultFeedOrder) override fun limit() = 200 } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/newthreads/dal/UserProfileNewThreadFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/newthreads/dal/UserProfileNewThreadFeedFilter.kt index 0678a0564..7e054d315 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/newthreads/dal/UserProfileNewThreadFeedFilter.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/newthreads/dal/UserProfileNewThreadFeedFilter.kt @@ -62,7 +62,7 @@ class UserProfileNewThreadFeedFilter( return sort(notes + longFormNotes) } - override fun applyFilter(collection: Set): Set = innerApplyFilter(collection) + override fun applyFilter(newItems: Set): Set = innerApplyFilter(newItems) private fun innerApplyFilter(collection: Collection): Set = collection.filterTo(HashSet()) { acceptableEvent(it) } @@ -86,7 +86,7 @@ class UserProfileNewThreadFeedFilter( it.isNewThread() && account.isAcceptable(it) - override fun sort(collection: Set): List = collection.sortedWith(DefaultFeedOrder) + override fun sort(items: Set): List = items.sortedWith(DefaultFeedOrder) override fun limit() = 200 } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/reports/dal/UserProfileReportsFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/reports/dal/UserProfileReportsFeedFilter.kt index 9c64ffba9..35a32ff0e 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/reports/dal/UserProfileReportsFeedFilter.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/reports/dal/UserProfileReportsFeedFilter.kt @@ -34,14 +34,14 @@ class UserProfileReportsFeedFilter( override fun feed(): List = sort(innerApplyFilter(user.reports.values.flatten())) - override fun applyFilter(collection: Set): Set = innerApplyFilter(collection) + override fun applyFilter(newItems: Set): Set = innerApplyFilter(newItems) private fun innerApplyFilter(collection: Collection): Set = collection .filter { it.event is ReportEvent && it.event?.isTaggedUser(user.pubkeyHex) == true } .toSet() - override fun sort(collection: Set): List = collection.sortedWith(DefaultFeedOrder) + override fun sort(items: Set): List = items.sortedWith(DefaultFeedOrder) override fun limit() = 400 } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/video/dal/VideoFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/video/dal/VideoFeedFilter.kt index b0744b123..b663e4b4e 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/video/dal/VideoFeedFilter.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/video/dal/VideoFeedFilter.kt @@ -72,7 +72,7 @@ class VideoFeedFilter( return sort(notes) } - override fun applyFilter(collection: Set): Set = innerApplyFilter(collection) + override fun applyFilter(newItems: Set): Set = innerApplyFilter(newItems) private fun innerApplyFilter(collection: Collection): Set { val params = buildFilterParams(account) @@ -124,5 +124,5 @@ class VideoFeedFilter( hiddenUsers = account.hiddenUsers.flow.value, ) - override fun sort(collection: Set): List = collection.sortedWith(DefaultFeedOrder) + override fun sort(items: Set): List = items.sortedWith(DefaultFeedOrder) }