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

Moving follows to the known list.

Browse Source
This commit is contained in:
Vitor Pamplona
2023-05-08 14:58:39 -04:00
parent 4dcf38c492
commit 81290f2b26
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/vitorpamplona/amethyst/ui/dal/ChatroomListKnownFeedFilter.kt
+2 -1
View File
@@ -9,10 +9,11 @@ object ChatroomListKnownFeedFilter : FeedFilter<Note>() {
// returns the last Note of each user. // returns the last Note of each user.
override fun feed(): List<Note> { override fun feed(): List<Note> {
val me = account.userProfile() val me = account.userProfile()
val followingKeySet = account.followingKeySet()
val privateChatrooms = me.privateChatrooms val privateChatrooms = me.privateChatrooms
val messagingWith = privateChatrooms.keys.filter { val messagingWith = privateChatrooms.keys.filter {
me.hasSentMessagesTo(it) && account.isAcceptable(it) (it.pubkeyHex in followingKeySet || me.hasSentMessagesTo(it)) && !account.isHidden(it)
} }
val privateMessages = messagingWith.mapNotNull { it -> val privateMessages = messagingWith.mapNotNull { it ->
app/src/main/java/com/vitorpamplona/amethyst/ui/dal/ChatroomListNewFeedFilter.kt
+3 -2
View File
@@ -8,11 +8,12 @@ object ChatroomListNewFeedFilter : FeedFilter<Note>() {
// returns the last Note of each user. // returns the last Note of each user.
override fun feed(): List<Note> { override fun feed(): List<Note> {
val me = ChatroomListKnownFeedFilter.account.userProfile() val me = account.userProfile()
val followingKeySet = ChatroomListKnownFeedFilter.account.followingKeySet()
val privateChatrooms = account.userProfile().privateChatrooms val privateChatrooms = account.userProfile().privateChatrooms
val messagingWith = privateChatrooms.keys.filter { val messagingWith = privateChatrooms.keys.filter {
!me.hasSentMessagesTo(it) && account.isAcceptable(it) it.pubkeyHex !in followingKeySet && !me.hasSentMessagesTo(it) && account.isAcceptable(it)
} }
val privateMessages = messagingWith.mapNotNull { it -> val privateMessages = messagingWith.mapNotNull { it ->