nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Refactoring

Browse Source
This commit is contained in:
Vitor Pamplona
2023-12-14 18:56:53 -05:00
parent dd8904de15
commit 7cf7c9f082
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/vitorpamplona/amethyst/ui/dal/ChatroomListKnownFeedFilter.kt
+3 -5
View File
@@ -20,13 +20,11 @@ class ChatroomListKnownFeedFilter(val account: Account) : AdditiveFeedFilter<Not
val me = account.userProfile() val me = account.userProfile()
val followingKeySet = account.followingKeySet() val followingKeySet = account.followingKeySet()
val messagingWith = me.privateChatrooms.filter { val knownChatrooms = me.privateChatrooms.filter {
( (it.value.senderIntersects(followingKeySet) || me.hasSentMessagesTo(it.key)) && !account.isAllHidden(it.key.users)
it.value.senderIntersects(followingKeySet) || me.hasSentMessagesTo(it.key)
) && !account.isAllHidden(it.key.users)
} }
val privateMessages = messagingWith.mapNotNull { it -> val privateMessages = knownChatrooms.mapNotNull { it ->
it.value it.value
.roomMessages .roomMessages
.sortedWith(compareBy({ it.createdAt() }, { it.idHex })) .sortedWith(compareBy({ it.createdAt() }, { it.idHex }))
app/src/main/java/com/vitorpamplona/amethyst/ui/dal/ChatroomListNewFeedFilter.kt
+2 -3
View File
@@ -19,12 +19,11 @@ class ChatroomListNewFeedFilter(val account: Account) : AdditiveFeedFilter<Note>
val me = account.userProfile() val me = account.userProfile()
val followingKeySet = account.followingKeySet() val followingKeySet = account.followingKeySet()
val privateChatrooms = account.userProfile().privateChatrooms val newChatrooms = me.privateChatrooms.filter {
val messagingWith = privateChatrooms.filter {
!it.value.senderIntersects(followingKeySet) && !me.hasSentMessagesTo(it.key) && !account.isAllHidden(it.key.users) !it.value.senderIntersects(followingKeySet) && !me.hasSentMessagesTo(it.key) && !account.isAllHidden(it.key.users)
} }
val privateMessages = messagingWith.mapNotNull { it -> val privateMessages = newChatrooms.mapNotNull { it ->
it.value it.value
.roomMessages .roomMessages
.sortedWith(compareBy({ it.createdAt() }, { it.idHex })) .sortedWith(compareBy({ it.createdAt() }, { it.idHex }))