highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-10-08 21:52:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

solve recursive method call

Browse Source
This commit is contained in:
Vitor Pamplona
2023-04-19 15:57:27 -04:00
parent 57b35398be
commit abdad7fbea
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/vitorpamplona/amethyst/ui/dal/GlobalFeedFilter.kt
View File

@@ -9,17 +9,17 @@ object GlobalFeedFilter : AdditiveFeedFilter<Note>() {
lateinit var account: Account lateinit var account: Account
override fun feed(): List<Note> { override fun feed(): List<Note> {
val notes = applyFilter(LocalCache.notes.values) val notes = innerApplyFilter(LocalCache.notes.values)
val longFormNotes = applyFilter(LocalCache.addressables.values) val longFormNotes = innerApplyFilter(LocalCache.addressables.values)
return sort(notes + longFormNotes) return sort(notes + longFormNotes)
} }
override fun applyFilter(collection: Set<Note>): List<Note> { override fun applyFilter(collection: Set<Note>): List<Note> {
return applyFilter(collection) return innerApplyFilter(collection)
} }
private fun applyFilter(collection: Collection<Note>): List<Note> { private fun innerApplyFilter(collection: Collection<Note>): List<Note> {
val followChannels = account.followingChannels val followChannels = account.followingChannels
val followUsers = account.followingKeySet() val followUsers = account.followingKeySet()
val now = System.currentTimeMillis() / 1000 val now = System.currentTimeMillis() / 1000

4
app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HashtagFeedFilter.kt
View File

@@ -18,14 +18,14 @@ object HashtagFeedFilter : AdditiveFeedFilter<Note>() {
} }
override fun feed(): List<Note> { override fun feed(): List<Note> {
return sort(applyFilter(LocalCache.notes.values)) return sort(innerApplyFilter(LocalCache.notes.values))
} }
override fun applyFilter(collection: Set<Note>): List<Note> { override fun applyFilter(collection: Set<Note>): List<Note> {
return applyFilter(collection) return applyFilter(collection)
} }
private fun applyFilter(collection: Collection<Note>): List<Note> { private fun innerApplyFilter(collection: Collection<Note>): List<Note> {
val myTag = tag ?: return emptyList() val myTag = tag ?: return emptyList()
return collection return collection

6
app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeConversationsFeedFilter.kt
View File

@@ -10,14 +10,14 @@ object HomeConversationsFeedFilter : AdditiveFeedFilter<Note>() {
lateinit var account: Account lateinit var account: Account
override fun feed(): List<Note> { override fun feed(): List<Note> {
return sort(applyFilter(LocalCache.notes.values)) return sort(innerApplyFilter(LocalCache.notes.values))
} }
override fun applyFilter(collection: Set<Note>): List<Note> { override fun applyFilter(collection: Set<Note>): List<Note> {
return applyFilter(collection) return innerApplyFilter(collection)
} }
private fun applyFilter(collection: Collection<Note>): List<Note> { private fun innerApplyFilter(collection: Collection<Note>): List<Note> {
val user = account.userProfile() val user = account.userProfile()
val followingKeySet = user.cachedFollowingKeySet() val followingKeySet = user.cachedFollowingKeySet()
val followingTagSet = user.cachedFollowingTagSet() val followingTagSet = user.cachedFollowingTagSet()

8
app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeNewThreadFeedFilter.kt
View File

@@ -12,17 +12,17 @@ object HomeNewThreadFeedFilter : AdditiveFeedFilter<Note>() {
lateinit var account: Account lateinit var account: Account
override fun feed(): List<Note> { override fun feed(): List<Note> {
val notes = applyFilter(LocalCache.notes.values) val notes = innerApplyFilter(LocalCache.notes.values)
val longFormNotes = applyFilter(LocalCache.addressables.values) val longFormNotes = innerApplyFilter(LocalCache.addressables.values)
return sort(notes + longFormNotes) return sort(notes + longFormNotes)
} }
override fun applyFilter(collection: Set<Note>): List<Note> { override fun applyFilter(collection: Set<Note>): List<Note> {
return applyFilter(collection) return innerApplyFilter(collection)
} }
private fun applyFilter(collection: Collection<Note>): List<Note> { private fun innerApplyFilter(collection: Collection<Note>): List<Note> {
val user = account.userProfile() val user = account.userProfile()
val followingKeySet = user.cachedFollowingKeySet() val followingKeySet = user.cachedFollowingKeySet()
val followingTagSet = user.cachedFollowingTagSet() val followingTagSet = user.cachedFollowingTagSet()

6
app/src/main/java/com/vitorpamplona/amethyst/ui/dal/NotificationFeedFilter.kt
View File

@@ -10,14 +10,14 @@ object NotificationFeedFilter : AdditiveFeedFilter<Note>() {
lateinit var account: Account lateinit var account: Account
override fun feed(): List<Note> { override fun feed(): List<Note> {
return sort(applyFilter(LocalCache.notes.values)) return sort(innerApplyFilter(LocalCache.notes.values))
} }
override fun applyFilter(collection: Set<Note>): List<Note> { override fun applyFilter(collection: Set<Note>): List<Note> {
return applyFilter(collection) return innerApplyFilter(collection)
} }
private fun applyFilter(collection: Collection<Note>): List<Note> { private fun innerApplyFilter(collection: Collection<Note>): List<Note> {
val loggedInUser = account.userProfile() val loggedInUser = account.userProfile()
val loggedInUserHex = loggedInUser.pubkeyHex val loggedInUserHex = loggedInUser.pubkeyHex