From 470281fa8782aee4fbe97bd5e397fa320d7f2a5c Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Tue, 9 May 2023 12:58:56 -0400
Subject: [PATCH] Filters lists out of the user's profile

---
 .../amethyst/service/NostrUserProfileDataSource.kt           | 2 +-
 .../amethyst/ui/dal/UserProfileNewThreadFeedFilter.kt        | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/NostrUserProfileDataSource.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/NostrUserProfileDataSource.kt
index 44222d800..a0e216f6e 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/service/NostrUserProfileDataSource.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/service/NostrUserProfileDataSource.kt
@@ -82,7 +82,7 @@ object NostrUserProfileDataSource : NostrDataSource("UserProfileFeed") {
         TypedFilter(
             types = COMMON_FEED_TYPES,
             filter = JsonFilter(
-                kinds = listOf(BookmarkListEvent.kind),
+                kinds = listOf(BookmarkListEvent.kind, PeopleListEvent.kind),
                 authors = listOf(it.pubkeyHex),
                 limit = 1
             )
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileNewThreadFeedFilter.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileNewThreadFeedFilter.kt
index 327b40917..13d197421 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileNewThreadFeedFilter.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileNewThreadFeedFilter.kt
@@ -4,6 +4,8 @@ import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.service.model.BookmarkListEvent
+import com.vitorpamplona.amethyst.service.model.PeopleListEvent
 
 object UserProfileNewThreadFeedFilter : FeedFilter<Note>() {
     var account: Account? = null
@@ -15,7 +17,8 @@ object UserProfileNewThreadFeedFilter : FeedFilter<Note>() {
     }
 
     override fun feed(): List<Note> {
-        val longFormNotes = LocalCache.addressables.values.filter { it.author == user }
+        val longFormNotes = LocalCache.addressables.values
+            .filter { it.author == user && (it.event !is PeopleListEvent && it.event !is BookmarkListEvent) }
 
         return user?.notes
             ?.plus(longFormNotes)