highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-09-26 20:46:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use the default comparator instead of creating a new object every time

Browse Source
This commit is contained in:
Vitor Pamplona
2024-05-13 15:40:24 -04:00
parent 0c1187e4f5
commit 22c96d2489
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,12 +46,12 @@ class ChatroomListNewFeedFilter(val account: Account) : AdditiveFeedFilter<Note>
val privateMessages =
newChatrooms.mapNotNull { it ->
it.value.roomMessages.sortedWith(compareBy({ it.createdAt() }, { it.idHex })).lastOrNull {
it.value.roomMessages.sortedWith(DefaultFeedOrder).firstOrNull {
it.event != null
}
}
return privateMessages.sortedWith(compareBy({ it.createdAt() }, { it.idHex })).reversed()
return privateMessages.sortedWith(DefaultFeedOrder)
}
override fun updateListWith(

20
app/src/main/java/com/vitorpamplona/amethyst/ui/dal/DefaultFeedOrder.kt
View File

@@ -21,5 +21,23 @@
package com.vitorpamplona.amethyst.ui.dal
import com.vitorpamplona.amethyst.model.Note
import com.vitorpamplona.quartz.events.Event
val DefaultFeedOrder = compareBy<Note>({ it.createdAt() }, { it.idHex }).reversed()
val DefaultFeedOrder: Comparator<Note> =
compareBy<Note>(
{
val noteEvent = it.event
if (noteEvent == null) {
null
} else {
if (noteEvent is Event) {
noteEvent.createdAt
} else {
null
}
}
},
{
it.idHex
},
).reversed()