Merge branch 'main' of https://github.com/vitorpamplona/amethyst

* 'main' of https://github.com/vitorpamplona/amethyst:
  optimise imports
  synchronize all cache mutations and supply sinceRelaySet so callers get snapshot copies rework groupByRelayPresence to build relay snapshots via sinceRelaySet,     filtering with immutable lists to prevent ConcurrentModificationException when relays update mid-iteration
  Hardened EOSEAccountFast against concurrent access so callers no longer iterate over live mutable maps
  Adjusted subscription cleanup to avoid mutating the watcher map while iterating it, preventing the ConcurrentModificationException when accounts switch

# Conflicts:
#	amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/UserCompose.kt

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/peopleList/FollowListsState.kt

@@ -46,7 +46,6 @@ import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.transformLatest
 import kotlinx.coroutines.flow.update
-import kotlin.collections.map
 
 /**
  * Maintains several stateflows for each step in processing PeopleLists

amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/follows/AccountFollowsLoaderSubAssembler.kt

@@ -186,11 +186,11 @@ class AccountFollowsLoaderSubAssembler(
         }
 
         // removes accounts that are not being subscribed anymore.
-        accountUpdatesJobMap.forEach {
+        // Cancel watchers for accounts no longer observed using a snapshot to avoid CME
-            if (it.key !in uniqueSubscribedAccounts.keys) {
+        accountUpdatesJobMap.keys
-                endWatcher(it.key)
+            .toList()
-            }
+            .filter { it !in uniqueSubscribedAccounts.keys }
-        }
+            .forEach { endWatcher(it) }
     }
 
     private val accountUpdatesJobMap = mutableMapOf<User, Job>()

amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/user/watchers/UserReportsSubAssembler.kt

@@ -90,19 +90,30 @@ class UserReportsSubAssembler(
         users: Iterable<User>,
         eoseCache: EOSEAccountFast<User>,
         inRelays: Set<NormalizedRelayUrl>,
-    ): Collection<List<User>> =
+    ): Collection<List<User>> {
-        users
+        if (users.none()) return emptyList()
-            .groupBy {
+
-                eoseCache
+        val relaySnapshot = inRelays.toSet()
-                    .since(it)
+
-                    ?.keys
+        return users
-                    ?.intersect(inRelays)
+            .groupBy { user ->
-                    ?.hashCode()
+                val relaysForUser = eoseCache.sinceRelaySet(user)
+                if (relaysForUser.isNullOrEmpty() || relaySnapshot.isEmpty()) {
+                    null
+                } else {
+                    val intersection = relaysForUser.filter { it in relaySnapshot }.sorted()
+                    if (intersection.isEmpty()) {
+                        null
+                    } else {
+                        intersection.hashCode()
+                    }
+                }
             }.values
             .map {
                 // important to keep in order otherwise the Relay thinks the filter has changed and we REQ again
                 it.sortedBy { it.pubkeyHex }
             }
+    }
 
     fun findMinimumEOSEsForUsers(
         users: List<User>,

amethyst/src/main/java/com/vitorpamplona/amethyst/service/relays/EOSE.kt

@@ -125,36 +125,51 @@ class EOSEAccountFast<T : Any>(
     cacheSize: Int = 20,
 ) {
     private val users: LruCache<T, EOSERelayList> = LruCache<T, EOSERelayList>(cacheSize)
+    private val lock = Any()
 
     fun addOrUpdate(
         user: T,
         relayUrl: NormalizedRelayUrl,
         time: Long,
     ) {
-        val relayList = users[user]
+        synchronized(lock) {
-        if (relayList == null) {
+            val relayList = users[user]
-            val newList = EOSERelayList()
+            if (relayList == null) {
-            users.put(user, newList)
+                val newList = EOSERelayList()
+                users.put(user, newList)
 
-            newList.addOrUpdate(relayUrl, time)
+                newList.addOrUpdate(relayUrl, time)
-        } else {
+            } else {
-            relayList.addOrUpdate(relayUrl, time)
+                relayList.addOrUpdate(relayUrl, time)
+            }
         }
     }
 
     fun removeEveryoneBut(list: Set<T>) {
-        users.snapshot().forEach {
+        synchronized(lock) {
-            if (it.key !in list) {
+            users.snapshot().forEach {
-                users.remove(it.key)
+                if (it.key !in list) {
+                    users.remove(it.key)
+                }
             }
         }
     }
 
     fun removeDataFor(user: T) {
-        users.remove(user)
+        synchronized(lock) {
+            users.remove(user)
+        }
     }
 
-    fun since(key: T) = users[key]?.relayList
+    fun since(key: T): SincePerRelayMap? =
+        synchronized(lock) {
+            users[key]?.relayList?.toMutableMap()
+        }
+
+    fun sinceRelaySet(key: T): Set<NormalizedRelayUrl>? =
+        synchronized(lock) {
+            users[key]?.relayList?.keys?.toSet()
+        }
 
     fun newEose(
         user: T,

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/UserCompose.kt

@@ -35,7 +35,6 @@ import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.relayClient.reqCommand.account.observeAccountIsHiddenUser
 import com.vitorpamplona.amethyst.service.relayClient.reqCommand.user.observeUserIsFollowing
 import com.vitorpamplona.amethyst.ui.layouts.listItem.SlimListItem
-import com.vitorpamplona.amethyst.ui.navigation.navs.EmptyNav.nav
 import com.vitorpamplona.amethyst.ui.navigation.navs.INav
 import com.vitorpamplona.amethyst.ui.navigation.routes.Route
 import com.vitorpamplona.amethyst.ui.navigation.routes.routeFor

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/lists/display/PeopleListView.kt

@@ -43,7 +43,6 @@ import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.ui.navigation.navs.INav
 import com.vitorpamplona.amethyst.ui.note.UserComposeNoAction
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
-import com.vitorpamplona.amethyst.ui.screen.loggedIn.lists.list.PeopleListItem
 import com.vitorpamplona.amethyst.ui.theme.DividerThickness
 import com.vitorpamplona.amethyst.ui.theme.FeedPadding
 import com.vitorpamplona.amethyst.ui.theme.HalfHalfHorzModifier

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/lists/list/PeopleListItem.kt

@@ -28,7 +28,6 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.offset
-import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Groups
 import androidx.compose.material.icons.outlined.Lock