From 66cfa9201c50117e368f1f71c1ea917abd9f56e0 Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Fri, 13 Jan 2023 20:17:24 -0500
Subject: [PATCH] Simplifies the first call to Nostr relays

---
 .../amethyst/service/NostrAccountDataSource.kt         |  3 +++
 .../amethyst/service/NostrHomeDataSource.kt            | 10 ++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/NostrAccountDataSource.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/NostrAccountDataSource.kt
index 5d852ec83..82ce4ca2d 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/service/NostrAccountDataSource.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/service/NostrAccountDataSource.kt
@@ -6,6 +6,8 @@ import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.UserState
 import com.vitorpamplona.amethyst.service.model.RepostEvent
 import nostr.postr.JsonFilter
+import nostr.postr.events.ContactListEvent
+import nostr.postr.events.MetadataEvent
 import nostr.postr.events.TextNoteEvent
 import nostr.postr.toHex
 
@@ -30,6 +32,7 @@ object NostrAccountDataSource: NostrDataSource("AccountData") {
 
   fun createAccountFilter(): JsonFilter {
     return JsonFilter(
+      kinds = listOf(MetadataEvent.kind, ContactListEvent.kind),
       authors = listOf(account.userProfile().pubkeyHex),
       since = System.currentTimeMillis() / 1000 - (60 * 60 * 24 * 7), // 4 days
     )
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/NostrHomeDataSource.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/NostrHomeDataSource.kt
index 7e9e241ce..46796c685 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/service/NostrHomeDataSource.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/service/NostrHomeDataSource.kt
@@ -29,11 +29,13 @@ object NostrHomeDataSource: NostrDataSource("HomeFeed") {
   }
 
   fun createFollowAccountsFilter(): JsonFilter? {
-    val follows = account.userProfile().follows?.map {
-      it.pubkey.toHex().substring(0, 6)
-    }
+    val follows = listOf(account.userProfile().pubkeyHex.substring(0, 6)).plus(
+      account.userProfile().follows?.map {
+        it.pubkey.toHex().substring(0, 6)
+      } ?: emptyList()
+    )
 
-    if (follows == null || follows.isEmpty()) return null
+    if (follows.isEmpty()) return null
 
     return JsonFilter(
       kinds = listOf(TextNoteEvent.kind, RepostEvent.kind),