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

Locally cache following Users in the Home & Conversations filter

Browse Source
This commit is contained in:
Vitor Pamplona
2023-03-15 13:40:26 -04:00
parent 83a8558f23
commit 1871fe6177
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeConversationsFeedFilter.kt
View File

@@ -11,13 +11,14 @@ object HomeConversationsFeedFilter : FeedFilter<Note>() {
override fun feed(): List<Note> { override fun feed(): List<Note> {
val user = account.userProfile() val user = account.userProfile()
val followingKeySet = user.cachedFollowingKeySet()
return LocalCache.notes.values return LocalCache.notes.values
.filter { .filter {
(it.event is TextNoteEvent || it.event is RepostEvent) && (it.event is TextNoteEvent || it.event is RepostEvent) &&
it.author?.pubkeyHex in user.cachedFollowingKeySet() && it.author?.pubkeyHex in followingKeySet &&
// && account.isAcceptable(it) // This filter follows only. No need to check if acceptable // && account.isAcceptable(it) // This filter follows only. No need to check if acceptable
it.author?.let { !HomeNewThreadFeedFilter.account.isHidden(it) } ?: true && it.author?.let { !account.isHidden(it) } ?: true &&
!it.isNewThread() !it.isNewThread()
} }
.sortedBy { it.createdAt() } .sortedBy { it.createdAt() }

5
app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeNewThreadFeedFilter.kt
View File

@@ -12,11 +12,12 @@ object HomeNewThreadFeedFilter : FeedFilter<Note>() {
override fun feed(): List<Note> { override fun feed(): List<Note> {
val user = account.userProfile() val user = account.userProfile()
val followingKeySet = user.cachedFollowingKeySet()
val notes = LocalCache.notes.values val notes = LocalCache.notes.values
.filter { it -> .filter { it ->
(it.event is TextNoteEvent || it.event is RepostEvent || it.event is LongTextNoteEvent) && (it.event is TextNoteEvent || it.event is RepostEvent || it.event is LongTextNoteEvent) &&
it.author?.pubkeyHex in user.cachedFollowingKeySet() && it.author?.pubkeyHex in followingKeySet &&
// && account.isAcceptable(it) // This filter follows only. No need to check if acceptable // && account.isAcceptable(it) // This filter follows only. No need to check if acceptable
it.author?.let { !account.isHidden(it) } ?: true && it.author?.let { !account.isHidden(it) } ?: true &&
it.isNewThread() it.isNewThread()
@@ -25,7 +26,7 @@ object HomeNewThreadFeedFilter : FeedFilter<Note>() {
val longFormNotes = LocalCache.addressables.values val longFormNotes = LocalCache.addressables.values
.filter { it -> .filter { it ->
(it.event is TextNoteEvent || it.event is RepostEvent || it.event is LongTextNoteEvent) && (it.event is TextNoteEvent || it.event is RepostEvent || it.event is LongTextNoteEvent) &&
it.author?.pubkeyHex in user.cachedFollowingKeySet() && it.author?.pubkeyHex in followingKeySet &&
// && account.isAcceptable(it) // This filter follows only. No need to check if acceptable // && account.isAcceptable(it) // This filter follows only. No need to check if acceptable
it.author?.let { !account.isHidden(it) } ?: true && it.author?.let { !account.isHidden(it) } ?: true &&
it.isNewThread() it.isNewThread()