From bfa673ca2c694dc6e503ee2ae31e6ee014d21516 Mon Sep 17 00:00:00 2001
From: KotlinGeekDev <kotlingeek@protonmail.com>
Date: Mon, 31 Mar 2025 21:15:06 +0100
Subject: [PATCH] Make naming clearer. Some refactoring. Add a function to
 retrieve the not corresponding to a follow set.

---
 .../main/java/com/vitorpamplona/amethyst/model/Account.kt   | 4 ++--
 .../java/com/vitorpamplona/amethyst/model/LocalCache.kt     | 2 +-
 .../src/main/java/com/vitorpamplona/amethyst/model/User.kt  | 6 +++---
 .../com/vitorpamplona/amethyst/ui/screen/FeedViewModel.kt   | 1 +
 .../amethyst/ui/screen/loggedIn/AccountViewModel.kt         | 2 +-
 5 files changed, 8 insertions(+), 7 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 96e6975b9..a77c7f864 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Account.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Account.kt
@@ -3067,8 +3067,8 @@ class Account(
 
     suspend fun getFollowSetNotes() =
         withContext(Dispatchers.Default) {
-            val followSetNotes = LocalCache.getFollowSetsFor(userProfile())
-            userProfile().updateFollowSets(followSetNotes)
+            val followSetNotes = LocalCache.getFollowSetNotesFor(userProfile())
+            userProfile().updateFollowSetNotes(followSetNotes)
 //            userProfile().followSets = followSetNotes
             println("Number of follow sets: ${followSetNotes.size}")
         }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt
index d2c852d9d..a32c70589 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt
@@ -1961,7 +1961,7 @@ object LocalCache {
         }
     }
 
-    fun getFollowSetsFor(user: User): List<AddressableNote> {
+    fun getFollowSetNotesFor(user: User): List<AddressableNote> {
         checkNotInMainThread()
 
         return addressables
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 4dfb4ec30..eeef874ce 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/User.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/User.kt
@@ -67,7 +67,7 @@ class User(
     var latestMetadataRelay: String? = null
     var latestContactList: ContactListEvent? = null
     var latestBookmarkList: BookmarkListEvent? = null
-    var followSets: Set<AddressableNote> = setOf()
+    var followSetNotes: Set<AddressableNote> = setOf()
         private set
 
     var reports = mapOf<User, Set<Note>>()
@@ -168,8 +168,8 @@ class User(
         flowSet?.relays?.invalidateData()
     }
 
-    fun updateFollowSets(sets: List<AddressableNote>) {
-        followSets = followSets + sets
+    fun updateFollowSetNotes(setNotes: List<AddressableNote>) {
+        followSetNotes = followSetNotes + setNotes
     }
 
     fun addReport(note: Note) {
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedViewModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedViewModel.kt
index 07289fa55..869d4ba11 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedViewModel.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedViewModel.kt
@@ -162,6 +162,7 @@ class NostrBookmarkPrivateFeedViewModel(
     }
 }
 
+@Stable
 class NostrUserFollowSetFeedViewModel(
     val account: Account,
 ) : FollowSetFeedViewModel(FollowSetFeedFilter(account)) {
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 e2e5212a6..767192e35 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
@@ -175,7 +175,7 @@ class AccountViewModel(
             .map { followSetsState ->
                 checkNotInMainThread()
                 account.getFollowSetNotes()
-                followSetsState.user.followSets.map {
+                followSetsState.user.followSetNotes.map {
                     account.mapNoteToFollowSet(it)
                 }
             }.flowOn(Dispatchers.Default)