From abdad7fbea85b88c8ca6a543f988d86bf1f3b7d3 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Wed, 19 Apr 2023 15:57:27 -0400 Subject: [PATCH] solve recursive method call --- .../com/vitorpamplona/amethyst/ui/dal/GlobalFeedFilter.kt | 8 ++++---- .../vitorpamplona/amethyst/ui/dal/HashtagFeedFilter.kt | 4 ++-- .../amethyst/ui/dal/HomeConversationsFeedFilter.kt | 6 +++--- .../amethyst/ui/dal/HomeNewThreadFeedFilter.kt | 8 ++++---- .../amethyst/ui/dal/NotificationFeedFilter.kt | 6 +++--- 5 files changed, 16 insertions(+), 16 deletions(-) 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 b55a9adf2..ebd4d2cdf 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 @@ -9,17 +9,17 @@ object GlobalFeedFilter : AdditiveFeedFilter() { lateinit var account: Account override fun feed(): List { - val notes = applyFilter(LocalCache.notes.values) - val longFormNotes = applyFilter(LocalCache.addressables.values) + val notes = innerApplyFilter(LocalCache.notes.values) + val longFormNotes = innerApplyFilter(LocalCache.addressables.values) return sort(notes + longFormNotes) } override fun applyFilter(collection: Set): List { - return applyFilter(collection) + return innerApplyFilter(collection) } - private fun applyFilter(collection: Collection): List { + private fun innerApplyFilter(collection: Collection): List { val followChannels = account.followingChannels val followUsers = account.followingKeySet() val now = System.currentTimeMillis() / 1000 diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HashtagFeedFilter.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HashtagFeedFilter.kt index c33593ff4..32354c408 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HashtagFeedFilter.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HashtagFeedFilter.kt @@ -18,14 +18,14 @@ object HashtagFeedFilter : AdditiveFeedFilter() { } override fun feed(): List { - return sort(applyFilter(LocalCache.notes.values)) + return sort(innerApplyFilter(LocalCache.notes.values)) } override fun applyFilter(collection: Set): List { return applyFilter(collection) } - private fun applyFilter(collection: Collection): List { + private fun innerApplyFilter(collection: Collection): List { val myTag = tag ?: return emptyList() return collection diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeConversationsFeedFilter.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeConversationsFeedFilter.kt index 5f2f3e6e5..f18885612 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeConversationsFeedFilter.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeConversationsFeedFilter.kt @@ -10,14 +10,14 @@ object HomeConversationsFeedFilter : AdditiveFeedFilter() { lateinit var account: Account override fun feed(): List { - return sort(applyFilter(LocalCache.notes.values)) + return sort(innerApplyFilter(LocalCache.notes.values)) } override fun applyFilter(collection: Set): List { - return applyFilter(collection) + return innerApplyFilter(collection) } - private fun applyFilter(collection: Collection): List { + private fun innerApplyFilter(collection: Collection): List { val user = account.userProfile() val followingKeySet = user.cachedFollowingKeySet() val followingTagSet = user.cachedFollowingTagSet() diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeNewThreadFeedFilter.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeNewThreadFeedFilter.kt index 443c11526..3ddf1471a 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeNewThreadFeedFilter.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeNewThreadFeedFilter.kt @@ -12,17 +12,17 @@ object HomeNewThreadFeedFilter : AdditiveFeedFilter() { lateinit var account: Account override fun feed(): List { - val notes = applyFilter(LocalCache.notes.values) - val longFormNotes = applyFilter(LocalCache.addressables.values) + val notes = innerApplyFilter(LocalCache.notes.values) + val longFormNotes = innerApplyFilter(LocalCache.addressables.values) return sort(notes + longFormNotes) } override fun applyFilter(collection: Set): List { - return applyFilter(collection) + return innerApplyFilter(collection) } - private fun applyFilter(collection: Collection): List { + private fun innerApplyFilter(collection: Collection): List { val user = account.userProfile() val followingKeySet = user.cachedFollowingKeySet() val followingTagSet = user.cachedFollowingTagSet() diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/NotificationFeedFilter.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/NotificationFeedFilter.kt index 39334ca15..8cb1f6280 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/NotificationFeedFilter.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/NotificationFeedFilter.kt @@ -10,14 +10,14 @@ object NotificationFeedFilter : AdditiveFeedFilter() { lateinit var account: Account override fun feed(): List { - return sort(applyFilter(LocalCache.notes.values)) + return sort(innerApplyFilter(LocalCache.notes.values)) } override fun applyFilter(collection: Set): List { - return applyFilter(collection) + return innerApplyFilter(collection) } - private fun applyFilter(collection: Collection): List { + private fun innerApplyFilter(collection: Collection): List { val loggedInUser = account.userProfile() val loggedInUserHex = loggedInUser.pubkeyHex