highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-11-10 21:06:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Avoids breaking the contract (changes during sorting)

Browse Source
This commit is contained in:
Vitor Pamplona
2025-09-08 19:38:18 -04:00
parent 4158d3bd45
commit bbec0d93d2
3 changed files with 37 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip28Chats/DiscoverChatFeedFilter.kt
View File

@@ -103,18 +103,26 @@ open class DiscoverChatFeedFilter(
}
override fun sort(items: Set<Note>): List<Note> {
// precache to avoid breaking the contract
val lastNote =
items.associateWith { note ->
LocalCache.getPublicChatChannelIfExists(note.idHex)?.lastNote?.createdAt() ?: 0
}
return items
.sortedWith(
compareBy(
{ lastNote[it] },
{ it.createdAt() },
{ it.idHex },
),
).reversed()
val createdNote =
items.associateWith { note ->
note.createdAt() ?: 0
}
val comparator: Comparator<Note> =
compareByDescending<Note> {
lastNote[it]
}.thenByDescending {
createdNote[it]
}.thenBy {
it.idHex
}
return items.sortedWith(comparator)
}
}

23
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip72Communities/DiscoverCommunityFeedFilter.kt
View File

@@ -125,13 +125,20 @@ open class DiscoverCommunityFeedFilter(
max
}
return items
.sortedWith(
compareBy(
{ lastNotesCreatedAt[it] },
{ it.createdAt() },
{ it.idHex },
),
).reversed()
val createdNote =
items.associateWith { note ->
note.createdAt() ?: 0
}
val comparator: Comparator<Note> =
compareByDescending<Note> {
lastNotesCreatedAt[it]
}.thenByDescending {
createdNote[it]
}.thenBy {
it.idHex
}
return items.sortedWith(comparator)
}
}

7
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip90DVMs/DiscoverNIP89FeedFilter.kt
View File

@@ -113,11 +113,16 @@ open class DiscoverNIP89FeedFilter(
val participantCounts =
items.associateWith { counter.countFollowsThatParticipateOn(it, followingKeySet) }
val createdNote =
items.associateWith { note ->
((note.event?.createdAt ?: 0) / 86400).toInt()
}
val feedOrder: Comparator<Note> =
compareByDescending<Note> {
participantCounts[it]
}.thenByDescending {
((it.event?.createdAt ?: 0) / 86400).toInt()
createdNote[it]
}.thenBy { it.idHex }
return items.sortedWith(feedOrder)