From 653494e922f2c6fa45f708be5d9a623aa9ef6a4d Mon Sep 17 00:00:00 2001
From: KotlinGeekDev <kotlingeek@protonmail.com>
Date: Sun, 10 Aug 2025 02:18:03 +0100
Subject: [PATCH] Cleanup/Refactor:Remove followSetNotes property from User,
 and refactor accordingly. Make getFollowSetNotes() return the notes.

---
 .../main/java/com/vitorpamplona/amethyst/model/Account.kt  | 7 +++----
 .../src/main/java/com/vitorpamplona/amethyst/model/User.kt | 6 ------
 .../amethyst/ui/screen/loggedIn/AccountViewModel.kt        | 5 ++---
 .../ui/screen/loggedIn/lists/followsets/FollowSetScreen.kt | 2 +-
 4 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Account.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Account.kt
index c10501084..995377cd2 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Account.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Account.kt
@@ -844,12 +844,11 @@ class Account(
     suspend fun getFollowSetNotes() =
         withContext(Dispatchers.Default) {
             val followSetNotes = LocalCache.getFollowSetNotesFor(userProfile())
-            userProfile().updateFollowSetNotes(followSetNotes)
-//            userProfile().followSets = followSetNotes
-            println("Number of follow sets: ${followSetNotes.size}")
+            Log.d(this@Account.javaClass.simpleName, "Number of follow sets: ${followSetNotes.size}")
+            return@withContext followSetNotes
         }
 
-    suspend fun mapNoteToFollowSet(note: Note): FollowSet =
+    fun mapNoteToFollowSet(note: Note): FollowSet =
         FollowSet
             .mapEventToSet(
                 event = note.event as PeopleListEvent,
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/User.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/User.kt
index 748af949b..237a1ff7a 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/User.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/User.kt
@@ -56,8 +56,6 @@ class User(
     var latestMetadata: MetadataEvent? = null
     var latestMetadataRelay: NormalizedRelayUrl? = null
     var latestContactList: ContactListEvent? = null
-    var followSetNotes: Set<AddressableNote> = setOf()
-        private set
 
     var reports = mapOf<User, Set<Note>>()
         private set
@@ -145,10 +143,6 @@ class User(
         flowSet?.relays?.invalidateData()
     }
 
-    fun updateFollowSetNotes(setNotes: List<AddressableNote>) {
-        followSetNotes = followSetNotes + setNotes
-    }
-
     fun addReport(note: Note) {
         val author = note.author ?: return
 
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt
index 539483d1e..86a47093e 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt
@@ -188,14 +188,13 @@ class AccountViewModel(
             .followSets.stateFlow
             .map { followSetsState ->
                 checkNotInMainThread()
-                account.getFollowSetNotes()
-                followSetsState.user.followSetNotes.map {
+                account.getFollowSetNotes().map {
                     account.mapNoteToFollowSet(it)
                 }
             }.flowOn(Dispatchers.Default)
             .stateIn(
                 viewModelScope,
-                SharingStarted.WhileSubscribed(10000, 10000),
+                SharingStarted.WhileSubscribed(5000, 5000),
                 emptyList(),
             )
 
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/lists/followsets/FollowSetScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/lists/followsets/FollowSetScreen.kt
index 6cc29cbb7..ec360549b 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/lists/followsets/FollowSetScreen.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/lists/followsets/FollowSetScreen.kt
@@ -161,7 +161,7 @@ private fun FollowSetListView(
             Row {
                 IconButton(
                     onClick = {
-                        onDeleteUser(item.info?.name.toString())
+                        onDeleteUser(item.pubkeyHex)
                     },
                 ) {
                     Icon(