From df77bd66333cdd37d522213f2158abdb5678b001 Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Fri, 3 Oct 2025 18:18:16 -0400
Subject: [PATCH] Only loads drafts if the account is writeable.

---
 .../metadata/AccountMetadataEoseManager.kt    | 25 ++++++++++++-----
 .../metadata/FilterDraftsAndReportsFromKey.kt | 27 +++++++++++++++++++
 2 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/metadata/AccountMetadataEoseManager.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/metadata/AccountMetadataEoseManager.kt
index de51e0bea..7be05420c 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/metadata/AccountMetadataEoseManager.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/metadata/AccountMetadataEoseManager.kt
@@ -27,6 +27,7 @@ import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap
 import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter
 import com.vitorpamplona.quartz.nip01Core.relay.client.subscriptions.Subscription
+import com.vitorpamplona.quartz.utils.TimeUtils
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.Job
@@ -47,13 +48,23 @@ class AccountMetadataEoseManager(
     ): List<RelayBasedFilter> =
         relayFlow(key).value.flatMap {
             val since = since?.get(it)?.time
-            listOf(
-                filterAccountInfoAndListsFromKey(it, user(key).pubkeyHex, since),
-                filterFollowsAndMutesFromKey(it, user(key).pubkeyHex, since),
-                filterDraftsAndReportsFromKey(it, user(key).pubkeyHex, since),
-                filterLastPostsFromKey(it, user(key).pubkeyHex, since),
-                filterBasicAccountInfoFromKeys(it, key.otherAccounts.minus(key.account.userProfile().pubkeyHex).toList(), since),
-            ).flatten()
+            if (key.account.isWriteable()) {
+                listOf(
+                    filterAccountInfoAndListsFromKey(it, user(key).pubkeyHex, since),
+                    filterFollowsAndMutesFromKey(it, user(key).pubkeyHex, since),
+                    filterDraftsAndReportsFromKey(it, user(key).pubkeyHex, since),
+                    filterLastPostsFromKey(it, user(key).pubkeyHex, since ?: TimeUtils.oneMonthAgo()),
+                    filterBasicAccountInfoFromKeys(it, key.otherAccounts.minus(key.account.userProfile().pubkeyHex).toList(), since),
+                ).flatten()
+            } else {
+                listOf(
+                    filterAccountInfoAndListsFromKey(it, user(key).pubkeyHex, since),
+                    filterFollowsAndMutesFromKey(it, user(key).pubkeyHex, since),
+                    filterBookmarksAndReportsFromKey(it, user(key).pubkeyHex, since),
+                    filterLastPostsFromKey(it, user(key).pubkeyHex, since ?: TimeUtils.oneMonthAgo()),
+                    filterBasicAccountInfoFromKeys(it, key.otherAccounts.minus(key.account.userProfile().pubkeyHex).toList(), since),
+                ).flatten()
+            }
         }
 
     val userJobMap = mutableMapOf<User, List<Job>>()
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/metadata/FilterDraftsAndReportsFromKey.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/metadata/FilterDraftsAndReportsFromKey.kt
index ec0908e23..2423e27c8 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/metadata/FilterDraftsAndReportsFromKey.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/metadata/FilterDraftsAndReportsFromKey.kt
@@ -28,6 +28,13 @@ import com.vitorpamplona.quartz.nip37Drafts.DraftWrapEvent
 import com.vitorpamplona.quartz.nip51Lists.bookmarkList.BookmarkListEvent
 import com.vitorpamplona.quartz.nip56Reports.ReportEvent
 
+val DraftsReportsAndBookmarksFromKeyKinds =
+    listOf(
+        DraftWrapEvent.KIND,
+        ReportEvent.KIND,
+        BookmarkListEvent.KIND,
+    )
+
 val ReportsAndBookmarksFromKeyKinds =
     listOf(
         DraftWrapEvent.KIND,
@@ -42,6 +49,26 @@ fun filterDraftsAndReportsFromKey(
 ): List<RelayBasedFilter> {
     if (pubkey == null || pubkey.isEmpty()) return emptyList()
 
+    return listOf(
+        RelayBasedFilter(
+            relay = relay,
+            filter =
+                Filter(
+                    kinds = DraftsReportsAndBookmarksFromKeyKinds,
+                    authors = listOf(pubkey),
+                    since = since,
+                ),
+        ),
+    )
+}
+
+fun filterBookmarksAndReportsFromKey(
+    relay: NormalizedRelayUrl,
+    pubkey: HexKey?,
+    since: Long?,
+): List<RelayBasedFilter> {
+    if (pubkey == null || pubkey.isEmpty()) return emptyList()
+
     return listOf(
         RelayBasedFilter(
             relay = relay,