From 00f2d46b53f3318dd15d6077afecba41f0ce7b0f Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Fri, 13 Mar 2026 13:45:22 -0400
Subject: [PATCH] Refines user status flow and isExpired running

---
 .../relayClient/reqCommand/user/UserObservers.kt  | 14 +++++++++++---
 .../model/nip38UserStatuses/UserStatusCache.kt    | 15 +++++++++------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/user/UserObservers.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/user/UserObservers.kt
index 779e0206e..cc46feab7 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/user/UserObservers.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/user/UserObservers.kt
@@ -38,7 +38,6 @@ import com.vitorpamplona.quartz.nip02FollowList.ContactListEvent
 import com.vitorpamplona.quartz.nip51Lists.bookmarkList.BookmarkListEvent
 import com.vitorpamplona.quartz.nip51Lists.hashtagList.HashtagListEvent
 import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.persistentListOf
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.FlowPreview
@@ -501,7 +500,15 @@ fun observeUserStatuses(
     // Subscribe in the relay for changes in the metadata of this user.
     UserFinderFilterAssemblerSubscription(user, accountViewModel)
 
-    return user.statusState().statuses.collectAsStateWithLifecycle(persistentListOf())
+    val flow =
+        remember(user) {
+            user.statusState().statuses.onStart {
+                user.statusState().removeExpired()
+            }
+        }
+
+    @SuppressLint("StateFlowValueCalledInComposition")
+    return flow.collectAsStateWithLifecycle(user.statusState().statuses.value)
 }
 
 @OptIn(ExperimentalCoroutinesApi::class, FlowPreview::class)
@@ -520,5 +527,6 @@ fun observeUserRelayIntoList(
                 .flowOn(Dispatchers.IO)
         }
 
-    return flow.collectAsStateWithLifecycle(false)
+    @SuppressLint("StateFlowValueCalledInComposition")
+    return flow.collectAsStateWithLifecycle(relayUrl in accountViewModel.account.trustedRelays.flow.value)
 }
diff --git a/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/model/nip38UserStatuses/UserStatusCache.kt b/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/model/nip38UserStatuses/UserStatusCache.kt
index 2298cc18e..6f8ebac80 100644
--- a/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/model/nip38UserStatuses/UserStatusCache.kt
+++ b/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/model/nip38UserStatuses/UserStatusCache.kt
@@ -62,12 +62,15 @@ class UserStatusCache : UserDependencies {
     }
 
     fun removeExpired() {
-        statuses.update { list ->
-            val filtered = list.filter { it.event?.isExpired() != true }
-            if (filtered.size != list.size) {
-                filtered.toImmutableList()
-            } else {
-                list
+        val hasExpired = statuses.value.any { it.event?.isExpired() == true }
+        if (hasExpired) {
+            statuses.update { list ->
+                val filtered = list.filter { it.event?.isExpired() != true }
+                if (filtered.size != list.size) {
+                    filtered.toImmutableList()
+                } else {
+                    list
+                }
             }
         }
     }