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

Fixes the order of bookmarks (keeps the order of the event, instead of the created at)

Browse Source
This commit is contained in:
Vitor Pamplona 2024-08-07 18:24:35 -04:00
parent f731c654b0
commit ed0676a5f5
2 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,15 +36,15 @@ class BookmarkPrivateFeedFilter(
val privateTags = bookmarks?.cachedPrivateTags() ?: return emptyList()
val notes =
bookmarks.filterEvents(privateTags).mapNotNull { LocalCache.checkGetOrCreateNote(it) }
val addresses =
bookmarks.filterAddresses(privateTags).map { LocalCache.getOrCreateAddressableNote(it) }
return notes
.plus(addresses)
.toSet()
.sortedWith(DefaultFeedOrder)
return privateTags
.mapNotNull {
if (it.size > 1 && it[0] == "e") {
LocalCache.checkGetOrCreateNote(it[1])
} else if (it.size > 1 && it[0] == "a") {
LocalCache.checkGetOrCreateAddressableNote(it[1])
} else {
null
}
}.reversed()
}
}

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

@ -32,14 +32,16 @@ class BookmarkPublicFeedFilter(
override fun feed(): List<Note> {
val bookmarks = account.userProfile().latestBookmarkList
val notes =
bookmarks?.taggedEvents()?.mapNotNull { LocalCache.checkGetOrCreateNote(it) } ?: emptyList()
val addresses =
bookmarks?.taggedAddresses()?.map { LocalCache.getOrCreateAddressableNote(it) } ?: emptyList()
return notes
.plus(addresses)
.toSet()
.sortedWith(DefaultFeedOrder)
return bookmarks
?.tags
?.mapNotNull {
if (it.size > 1 && it[0] == "e") {
LocalCache.checkGetOrCreateNote(it[1])
} else if (it.size > 1 && it[0] == "a") {
LocalCache.checkGetOrCreateAddressableNote(it[1])
} else {
null
}
}?.reversed() ?: emptyList()
}
}