nostr/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2024-09-30 00:40:49 +00: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 privateTags = bookmarks?.cachedPrivateTags() ?: return emptyList()
val notes = return privateTags
bookmarks.filterEvents(privateTags).mapNotNull { LocalCache.checkGetOrCreateNote(it) } .mapNotNull {
if (it.size > 1 && it[0] == "e") {
val addresses = LocalCache.checkGetOrCreateNote(it[1])
bookmarks.filterAddresses(privateTags).map { LocalCache.getOrCreateAddressableNote(it) } } else if (it.size > 1 && it[0] == "a") {
LocalCache.checkGetOrCreateAddressableNote(it[1])
return notes } else {
.plus(addresses) null
.toSet() }
.sortedWith(DefaultFeedOrder) }.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> { override fun feed(): List<Note> {
val bookmarks = account.userProfile().latestBookmarkList val bookmarks = account.userProfile().latestBookmarkList
val notes = return bookmarks
bookmarks?.taggedEvents()?.mapNotNull { LocalCache.checkGetOrCreateNote(it) } ?: emptyList() ?.tags
val addresses = ?.mapNotNull {
bookmarks?.taggedAddresses()?.map { LocalCache.getOrCreateAddressableNote(it) } ?: emptyList() if (it.size > 1 && it[0] == "e") {
LocalCache.checkGetOrCreateNote(it[1])
return notes } else if (it.size > 1 && it[0] == "a") {
.plus(addresses) LocalCache.checkGetOrCreateAddressableNote(it[1])
.toSet() } else {
.sortedWith(DefaultFeedOrder) null
}
}?.reversed() ?: emptyList()
} }
} }