laantungir/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2026-08-12 01:07:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3288 from vitorpamplona/claude/determined-ritchie-g281jh

Browse Source 
Fix unstable sort in live activity feeds by snapshotting status order
This commit is contained in:
Vitor Pamplona
2026-06-19 17:27:08 -04:00
committed by GitHub
parent 5d32d49540 fa7bb365c4
commit 96b61cc54d
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip53LiveActivities/DiscoverLiveFeedFilter.kt
+8 -1
View File
@@ -106,10 +106,17 @@ open class DiscoverLiveFeedFilter(
val allParticipants =
items.associate { it to counter.countFollowsThatParticipateOn(it, null) }
// Snapshots the status order once per item. convertStatusToOrder reads the
// OnlineChecker cache and the moving five-minute window, both of which can change
// mid-sort (a background online check can update the cache). Reading it lazily inside
// the comparator makes the ordering unstable and TimSort throws
// "Comparison method violates its general contract!".
val statusOrders = items.associateWith { convertStatusToOrder(it.event) }
return items
.sortedWith(
compareBy(
{ convertStatusToOrder(it.event) },
{ statusOrders[it] },
{ participantCounts[it] },
{ allParticipants[it] },
{
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/livestreams/dal/LiveStreamsFeedFilter.kt
+8 -1
View File
@@ -106,10 +106,17 @@ class LiveStreamsFeedFilter(
val allParticipants =
items.associate { it to counter.countFollowsThatParticipateOn(it, null) }
// Snapshots the status order once per item. convertStatusToOrder reads the
// OnlineChecker cache and the moving five-minute window, both of which can change
// mid-sort (a background online check can update the cache). Reading it lazily inside
// the comparator makes the ordering unstable and TimSort throws
// "Comparison method violates its general contract!".
val statusOrders = items.associateWith { convertStatusToOrder(it.event) }
return items
.sortedWith(
compareBy(
{ convertStatusToOrder(it.event) },
{ statusOrders[it] },
{ participantCounts[it] },
{ allParticipants[it] },
{