Moves away from calling relay feeds "favorites"

amethyst/src/main/java/com/vitorpamplona/amethyst/LocalPreferences.kt

@@ -53,8 +53,8 @@ import com.vitorpamplona.quartz.nip51Lists.geohashList.GeohashListEvent
 import com.vitorpamplona.quartz.nip51Lists.hashtagList.HashtagListEvent
 import com.vitorpamplona.quartz.nip51Lists.muteList.MuteListEvent
 import com.vitorpamplona.quartz.nip51Lists.relayLists.BlockedRelayListEvent
-import com.vitorpamplona.quartz.nip51Lists.relayLists.FavoriteRelayListEvent
 import com.vitorpamplona.quartz.nip51Lists.relayLists.IndexerRelayListEvent
+import com.vitorpamplona.quartz.nip51Lists.relayLists.RelayFeedsListEvent
 import com.vitorpamplona.quartz.nip51Lists.relayLists.TrustedRelayListEvent
 import com.vitorpamplona.quartz.nip65RelayList.AdvertisedRelayListEvent
 import com.vitorpamplona.quartz.nip72ModCommunities.follow.CommunityListEvent
@@ -102,7 +102,7 @@ private object PrefKeys {
     const val LATEST_NIP65_RELAY_LIST = "latestNIP65RelayList"
     const val LATEST_SEARCH_RELAY_LIST = "latestSearchRelayList"
     const val LATEST_INDEX_RELAY_LIST = "latestIndexRelayList"
-    const val LATEST_FAVORITE_RELAY_LIST = "latestFavoriteRelayList"
+    const val LATEST_RELAY_FEEDS_LIST = "latestRelayFeedsList"
     const val LATEST_BLOCKED_RELAY_LIST = "latestBlockedRelayList"
     const val LATEST_TRUSTED_RELAY_LIST = "latestTrustedRelayList"
     const val LATEST_MUTE_LIST = "latestMuteList"
@@ -336,7 +336,7 @@ object LocalPreferences {
                     putOrRemove(PrefKeys.LATEST_NIP65_RELAY_LIST, settings.backupNIP65RelayList)
                     putOrRemove(PrefKeys.LATEST_SEARCH_RELAY_LIST, settings.backupSearchRelayList)
                     putOrRemove(PrefKeys.LATEST_INDEX_RELAY_LIST, settings.backupIndexRelayList)
-                    putOrRemove(PrefKeys.LATEST_FAVORITE_RELAY_LIST, settings.backupIndexRelayList)
+                    putOrRemove(PrefKeys.LATEST_RELAY_FEEDS_LIST, settings.backupIndexRelayList)
                     putOrRemove(PrefKeys.LATEST_BLOCKED_RELAY_LIST, settings.backupBlockedRelayList)
                     putOrRemove(PrefKeys.LATEST_TRUSTED_RELAY_LIST, settings.backupTrustedRelayList)
 
@@ -471,7 +471,7 @@ object LocalPreferences {
                     val latestNip65RelayList = parseEventOrNull<AdvertisedRelayListEvent>(PrefKeys.LATEST_NIP65_RELAY_LIST)
                     val latestSearchRelayList = parseEventOrNull<SearchRelayListEvent>(PrefKeys.LATEST_SEARCH_RELAY_LIST)
                     val latestIndexRelayList = parseEventOrNull<IndexerRelayListEvent>(PrefKeys.LATEST_INDEX_RELAY_LIST)
-                    val latestFavoriteRelayList = parseEventOrNull<FavoriteRelayListEvent>(PrefKeys.LATEST_FAVORITE_RELAY_LIST)
+                    val latestRelayFeedsList = parseEventOrNull<RelayFeedsListEvent>(PrefKeys.LATEST_RELAY_FEEDS_LIST)
                     val latestBlockedRelayList = parseEventOrNull<BlockedRelayListEvent>(PrefKeys.LATEST_BLOCKED_RELAY_LIST)
                     val latestTrustedRelayList = parseEventOrNull<TrustedRelayListEvent>(PrefKeys.LATEST_TRUSTED_RELAY_LIST)
                     val latestMuteList = parseEventOrNull<MuteListEvent>(PrefKeys.LATEST_MUTE_LIST)
@@ -517,7 +517,7 @@ object LocalPreferences {
                         backupDMRelayList = latestDmRelayList,
                         backupSearchRelayList = latestSearchRelayList,
                         backupIndexRelayList = latestIndexRelayList,
-                        backupFavoriteRelayList = latestFavoriteRelayList,
+                        backupRelayFeedsList = latestRelayFeedsList,
                         backupBlockedRelayList = latestBlockedRelayList,
                         backupTrustedRelayList = latestTrustedRelayList,
                         backupPrivateHomeRelayList = latestPrivateHomeRelayList,

amethyst/src/main/java/com/vitorpamplona/amethyst/model/Account.kt

@@ -61,8 +61,6 @@ import com.vitorpamplona.amethyst.model.nip51Lists.blockedRelays.BlockedRelayLis
 import com.vitorpamplona.amethyst.model.nip51Lists.blockedRelays.BlockedRelayListState
 import com.vitorpamplona.amethyst.model.nip51Lists.broadcastRelays.BroadcastRelayListDecryptionCache
 import com.vitorpamplona.amethyst.model.nip51Lists.broadcastRelays.BroadcastRelayListState
-import com.vitorpamplona.amethyst.model.nip51Lists.favoriteRelays.FavoriteRelayListDecryptionCache
-import com.vitorpamplona.amethyst.model.nip51Lists.favoriteRelays.FavoriteRelayListState
 import com.vitorpamplona.amethyst.model.nip51Lists.geohashLists.GeohashListDecryptionCache
 import com.vitorpamplona.amethyst.model.nip51Lists.geohashLists.GeohashListState
 import com.vitorpamplona.amethyst.model.nip51Lists.hashtagLists.HashtagListDecryptionCache
@@ -77,6 +75,8 @@ import com.vitorpamplona.amethyst.model.nip51Lists.peopleList.PeopleListDecrypti
 import com.vitorpamplona.amethyst.model.nip51Lists.peopleList.PeopleListsState
 import com.vitorpamplona.amethyst.model.nip51Lists.proxyRelays.ProxyRelayListDecryptionCache
 import com.vitorpamplona.amethyst.model.nip51Lists.proxyRelays.ProxyRelayListState
+import com.vitorpamplona.amethyst.model.nip51Lists.relayFeeds.RelayFeedListState
+import com.vitorpamplona.amethyst.model.nip51Lists.relayFeeds.RelayFeedsListDecryptionCache
 import com.vitorpamplona.amethyst.model.nip51Lists.searchRelays.SearchRelayListDecryptionCache
 import com.vitorpamplona.amethyst.model.nip51Lists.searchRelays.SearchRelayListState
 import com.vitorpamplona.amethyst.model.nip51Lists.trustedRelays.TrustedRelayListDecryptionCache
@@ -278,8 +278,8 @@ class Account(
     val indexerRelayListDecryptionCache = IndexerRelayListDecryptionCache(signer)
     val indexerRelayList = IndexerRelayListState(signer, cache, indexerRelayListDecryptionCache, scope, settings)
 
-    val favoriteRelayListDecryptionCache = FavoriteRelayListDecryptionCache(signer)
-    val favoriteRelayList = FavoriteRelayListState(signer, cache, favoriteRelayListDecryptionCache, scope, settings)
+    val relayFeedsListDecryptionCache = RelayFeedsListDecryptionCache(signer)
+    val relayFeedsList = RelayFeedListState(signer, cache, relayFeedsListDecryptionCache, scope, settings)
 
     val blockedRelayListDecryptionCache = BlockedRelayListDecryptionCache(signer)
     val blockedRelayList = BlockedRelayListState(signer, cache, blockedRelayListDecryptionCache, scope, settings)
@@ -1926,11 +1926,11 @@ class Account(
 
     suspend fun saveTrustedRelayList(trustedRelays: List<NormalizedRelayUrl>) = sendMyPublicAndPrivateOutbox(trustedRelayList.saveRelayList(trustedRelays))
 
-    suspend fun saveFavoriteRelayList(trustedRelays: List<NormalizedRelayUrl>) = sendMyPublicAndPrivateOutbox(favoriteRelayList.saveRelayList(trustedRelays))
+    suspend fun saveRelayFeedsList(trustedRelays: List<NormalizedRelayUrl>) = sendMyPublicAndPrivateOutbox(relayFeedsList.saveRelayList(trustedRelays))
 
-    suspend fun followFavoriteRelay(url: NormalizedRelayUrl) = sendMyPublicAndPrivateOutbox(favoriteRelayList.addRelay(url))
+    suspend fun followRelayFeed(url: NormalizedRelayUrl) = sendMyPublicAndPrivateOutbox(relayFeedsList.addRelay(url))
 
-    suspend fun unfollowFavoriteRelay(url: NormalizedRelayUrl) = sendMyPublicAndPrivateOutbox(favoriteRelayList.removeRelay(url))
+    suspend fun unfollowRelayFeed(url: NormalizedRelayUrl) = sendMyPublicAndPrivateOutbox(relayFeedsList.removeRelay(url))
 
     suspend fun saveBlockedRelayList(blockedRelays: List<NormalizedRelayUrl>) = sendMyPublicAndPrivateOutbox(blockedRelayList.saveRelayList(blockedRelays))
 

amethyst/src/main/java/com/vitorpamplona/amethyst/model/AccountSettings.kt

@@ -46,8 +46,8 @@ import com.vitorpamplona.quartz.nip51Lists.geohashList.GeohashListEvent
 import com.vitorpamplona.quartz.nip51Lists.hashtagList.HashtagListEvent
 import com.vitorpamplona.quartz.nip51Lists.muteList.MuteListEvent
 import com.vitorpamplona.quartz.nip51Lists.relayLists.BlockedRelayListEvent
-import com.vitorpamplona.quartz.nip51Lists.relayLists.FavoriteRelayListEvent
 import com.vitorpamplona.quartz.nip51Lists.relayLists.IndexerRelayListEvent
+import com.vitorpamplona.quartz.nip51Lists.relayLists.RelayFeedsListEvent
 import com.vitorpamplona.quartz.nip51Lists.relayLists.TrustedRelayListEvent
 import com.vitorpamplona.quartz.nip55AndroidSigner.api.CommandType
 import com.vitorpamplona.quartz.nip55AndroidSigner.api.permission.Permission
@@ -175,7 +175,7 @@ class AccountSettings(
     var backupNIP65RelayList: AdvertisedRelayListEvent? = null,
     var backupSearchRelayList: SearchRelayListEvent? = null,
     var backupIndexRelayList: IndexerRelayListEvent? = null,
-    var backupFavoriteRelayList: FavoriteRelayListEvent? = null,
+    var backupRelayFeedsList: RelayFeedsListEvent? = null,
     var backupBlockedRelayList: BlockedRelayListEvent? = null,
     var backupTrustedRelayList: TrustedRelayListEvent? = null,
     var backupMuteList: MuteListEvent? = null,
@@ -427,12 +427,12 @@ class AccountSettings(
         }
     }
 
-    fun updateFavoriteRelayList(newFavoriteRelayList: FavoriteRelayListEvent?) {
-        if (newFavoriteRelayList == null || newFavoriteRelayList.tags.isEmpty()) return
+    fun updateRelayFeedList(newRelayFeedList: RelayFeedsListEvent?) {
+        if (newRelayFeedList == null || newRelayFeedList.tags.isEmpty()) return
 
         // Events might be different objects, we have to compare their ids.
-        if (backupFavoriteRelayList?.id != newFavoriteRelayList.id) {
-            backupFavoriteRelayList = newFavoriteRelayList
+        if (backupRelayFeedsList?.id != newRelayFeedList.id) {
+            backupRelayFeedsList = newRelayFeedList
             saveAccountSettings()
         }
     }

amethyst/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt

@@ -148,9 +148,9 @@ import com.vitorpamplona.quartz.nip51Lists.muteList.MuteListEvent
 import com.vitorpamplona.quartz.nip51Lists.peopleList.PeopleListEvent
 import com.vitorpamplona.quartz.nip51Lists.relayLists.BlockedRelayListEvent
 import com.vitorpamplona.quartz.nip51Lists.relayLists.BroadcastRelayListEvent
-import com.vitorpamplona.quartz.nip51Lists.relayLists.FavoriteRelayListEvent
 import com.vitorpamplona.quartz.nip51Lists.relayLists.IndexerRelayListEvent
 import com.vitorpamplona.quartz.nip51Lists.relayLists.ProxyRelayListEvent
+import com.vitorpamplona.quartz.nip51Lists.relayLists.RelayFeedsListEvent
 import com.vitorpamplona.quartz.nip51Lists.relayLists.TrustedRelayListEvent
 import com.vitorpamplona.quartz.nip51Lists.relaySets.RelaySetEvent
 import com.vitorpamplona.quartz.nip52Calendar.appt.day.CalendarDateSlotEvent
@@ -1214,7 +1214,7 @@ object LocalCache : ILocalCache, ICacheProvider {
     ) = consumeBaseReplaceable(event, relay, wasVerified)
 
     private fun consume(
-        event: FavoriteRelayListEvent,
+        event: RelayFeedsListEvent,
         relay: NormalizedRelayUrl?,
         wasVerified: Boolean,
     ) = consumeBaseReplaceable(event, relay, wasVerified)
@@ -3096,7 +3096,7 @@ object LocalCache : ILocalCache, ICacheProvider {
                 is GitPatchEvent -> consume(event, relay, wasVerified)
                 is GitRepositoryEvent -> consume(event, relay, wasVerified)
                 is ChessGameEvent -> consume(event, relay, wasVerified)
-                is FavoriteRelayListEvent -> consume(event, relay, wasVerified)
+                is RelayFeedsListEvent -> consume(event, relay, wasVerified)
                 is JesterEvent -> consume(event, relay, wasVerified)
                 is LiveChessGameChallengeEvent -> consume(event, relay, wasVerified)
                 is LiveChessGameAcceptEvent -> consume(event, relay, wasVerified)

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/relayFeeds/RelayFeedListState.kt

@@ -18,7 +18,7 @@
  * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package com.vitorpamplona.amethyst.model.nip51Lists.favoriteRelays
+package com.vitorpamplona.amethyst.model.nip51Lists.relayFeeds
 
 import com.vitorpamplona.amethyst.model.AccountSettings
 import com.vitorpamplona.amethyst.model.LocalCache
@@ -26,7 +26,7 @@ import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.NoteState
 import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
 import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
-import com.vitorpamplona.quartz.nip51Lists.relayLists.FavoriteRelayListEvent
+import com.vitorpamplona.quartz.nip51Lists.relayLists.RelayFeedsListEvent
 import com.vitorpamplona.quartz.utils.Log
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.DelicateCoroutinesApi
@@ -40,32 +40,32 @@ import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 
-class FavoriteRelayListState(
+class RelayFeedListState(
     val signer: NostrSigner,
     val cache: LocalCache,
-    val decryptionCache: FavoriteRelayListDecryptionCache,
+    val decryptionCache: RelayFeedsListDecryptionCache,
     val scope: CoroutineScope,
     val settings: AccountSettings,
 ) {
     // Creates a long-term reference for this note so that the GC doesn't collect the note it self
-    val favoriteListNote = cache.getOrCreateAddressableNote(getFavoriteRelayListAddress())
+    val relayFeedListNote = cache.getOrCreateAddressableNote(getRelayFeedsListAddress())
 
-    fun getFavoriteRelayListAddress() = FavoriteRelayListEvent.createAddress(signer.pubKey)
+    fun getRelayFeedsListAddress() = RelayFeedsListEvent.createAddress(signer.pubKey)
 
-    fun getFavoriteRelayListFlow(): StateFlow<NoteState> = favoriteListNote.flow().metadata.stateFlow
+    fun getRelayFeedsListFlow(): StateFlow<NoteState> = relayFeedListNote.flow().metadata.stateFlow
 
-    fun getFavoriteRelayList(): FavoriteRelayListEvent? = favoriteListNote.event as? FavoriteRelayListEvent
+    fun getRelayFeedsList(): RelayFeedsListEvent? = relayFeedListNote.event as? RelayFeedsListEvent
 
-    fun favoriteListEvent(note: Note) = note.event as? FavoriteRelayListEvent ?: settings.backupFavoriteRelayList
+    fun relayFeedsListEvent(note: Note) = note.event as? RelayFeedsListEvent ?: settings.backupRelayFeedsList
 
-    suspend fun normalizeFavoriteRelayListWithBackup(note: Note): Set<NormalizedRelayUrl> = favoriteListEvent(note)?.let { decryptionCache.relays(it) }?.ifEmpty { null } ?: emptySet()
+    suspend fun normalizeRelayFeedsListWithBackup(note: Note): Set<NormalizedRelayUrl> = relayFeedsListEvent(note)?.let { decryptionCache.relays(it) }?.ifEmpty { null } ?: emptySet()
 
-    suspend fun normalizeFavoriteRelayListWithBackupNoDefaults(note: Note): Set<NormalizedRelayUrl> = favoriteListEvent(note)?.let { decryptionCache.relays(it) } ?: emptySet()
+    suspend fun normalizeRelayFeedsListWithBackupNoDefaults(note: Note): Set<NormalizedRelayUrl> = relayFeedsListEvent(note)?.let { decryptionCache.relays(it) } ?: emptySet()
 
     val flow =
-        getFavoriteRelayListFlow()
-            .map { normalizeFavoriteRelayListWithBackup(it.note) }
-            .onStart { emit(normalizeFavoriteRelayListWithBackup(favoriteListNote)) }
+        getRelayFeedsListFlow()
+            .map { normalizeRelayFeedsListWithBackup(it.note) }
+            .onStart { emit(normalizeRelayFeedsListWithBackup(relayFeedListNote)) }
             .flowOn(Dispatchers.IO)
             .stateIn(
                 scope,
@@ -74,9 +74,9 @@ class FavoriteRelayListState(
             )
 
     val flowNoDefaults =
-        getFavoriteRelayListFlow()
-            .map { normalizeFavoriteRelayListWithBackupNoDefaults(it.note) }
-            .onStart { emit(normalizeFavoriteRelayListWithBackupNoDefaults(favoriteListNote)) }
+        getRelayFeedsListFlow()
+            .map { normalizeRelayFeedsListWithBackupNoDefaults(it.note) }
+            .onStart { emit(normalizeRelayFeedsListWithBackupNoDefaults(relayFeedListNote)) }
             .flowOn(Dispatchers.IO)
             .stateIn(
                 scope,
@@ -84,49 +84,49 @@ class FavoriteRelayListState(
                 emptySet(),
             )
 
-    suspend fun addRelay(relay: NormalizedRelayUrl): FavoriteRelayListEvent {
-        val current = normalizeFavoriteRelayListWithBackupNoDefaults(favoriteListNote).toMutableList()
+    suspend fun addRelay(relay: NormalizedRelayUrl): RelayFeedsListEvent {
+        val current = normalizeRelayFeedsListWithBackupNoDefaults(relayFeedListNote).toMutableList()
         if (relay !in current) current.add(relay)
         return saveRelayList(current)
     }
 
-    suspend fun removeRelay(relay: NormalizedRelayUrl): FavoriteRelayListEvent? {
-        val current = normalizeFavoriteRelayListWithBackupNoDefaults(favoriteListNote).toMutableList()
+    suspend fun removeRelay(relay: NormalizedRelayUrl): RelayFeedsListEvent? {
+        val current = normalizeRelayFeedsListWithBackupNoDefaults(relayFeedListNote).toMutableList()
         if (relay !in current) return null
         current.remove(relay)
         return saveRelayList(current)
     }
 
-    suspend fun saveRelayList(favoriteRelays: List<NormalizedRelayUrl>): FavoriteRelayListEvent {
-        val relayListForFavorite = getFavoriteRelayList()
+    suspend fun saveRelayList(relayFeeds: List<NormalizedRelayUrl>): RelayFeedsListEvent {
+        val relayFeedsList = getRelayFeedsList()
 
-        return if (relayListForFavorite != null && relayListForFavorite.tags.isNotEmpty()) {
-            FavoriteRelayListEvent.updateRelayList(
-                earlierVersion = relayListForFavorite,
-                relays = favoriteRelays,
+        return if (relayFeedsList != null && relayFeedsList.tags.isNotEmpty()) {
+            RelayFeedsListEvent.updateRelayList(
+                earlierVersion = relayFeedsList,
+                relays = relayFeeds,
                 signer = signer,
             )
         } else {
-            FavoriteRelayListEvent.create(
-                relays = favoriteRelays,
+            RelayFeedsListEvent.create(
+                relays = relayFeeds,
                 signer = signer,
             )
         }
     }
 
     init {
-        settings.backupFavoriteRelayList?.let {
-            Log.d("AccountRegisterObservers", "Loading saved favorite relay list ${it.toJson()}")
+        settings.backupRelayFeedsList?.let {
+            Log.d("AccountRegisterObservers", "Loading saved relay feeds list ${it.toJson()}")
             @OptIn(DelicateCoroutinesApi::class)
             GlobalScope.launch(Dispatchers.IO) { LocalCache.justConsumeMyOwnEvent(it) }
         }
 
         scope.launch(Dispatchers.IO) {
-            Log.d("AccountRegisterObservers", "Favorite Relay List Collector Start")
-            getFavoriteRelayListFlow().collect {
-                Log.d("AccountRegisterObservers", "Updating Favorite Relay List for ${signer.pubKey}")
-                (it.note.event as? FavoriteRelayListEvent)?.let {
-                    settings.updateFavoriteRelayList(it)
+            Log.d("AccountRegisterObservers", "Relay feeds list Collector Start")
+            getRelayFeedsListFlow().collect {
+                Log.d("AccountRegisterObservers", "Updating Relay feeds list for ${signer.pubKey}")
+                (it.note.event as? RelayFeedsListEvent)?.let {
+                    settings.updateRelayFeedList(it)
                 }
             }
         }

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/relayFeeds/RelayFeedsListDecryptionCache.kt

@@ -18,12 +18,12 @@
  * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package com.vitorpamplona.amethyst.model.nip51Lists.favoriteRelays
+package com.vitorpamplona.amethyst.model.nip51Lists.relayFeeds
 
 import com.vitorpamplona.amethyst.model.nip51Lists.relayLists.GenericRelayListCache
 import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
-import com.vitorpamplona.quartz.nip51Lists.relayLists.FavoriteRelayListEvent
+import com.vitorpamplona.quartz.nip51Lists.relayLists.RelayFeedsListEvent
 
-class FavoriteRelayListDecryptionCache(
+class RelayFeedsListDecryptionCache(
     signer: NostrSigner,
-) : GenericRelayListCache<FavoriteRelayListEvent>(signer)
+) : GenericRelayListCache<RelayFeedsListEvent>(signer)

amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/metadata/FilterAccountInfoAndListsFromKey.kt

@@ -37,9 +37,9 @@ import com.vitorpamplona.quartz.nip51Lists.geohashList.GeohashListEvent
 import com.vitorpamplona.quartz.nip51Lists.hashtagList.HashtagListEvent
 import com.vitorpamplona.quartz.nip51Lists.relayLists.BlockedRelayListEvent
 import com.vitorpamplona.quartz.nip51Lists.relayLists.BroadcastRelayListEvent
-import com.vitorpamplona.quartz.nip51Lists.relayLists.FavoriteRelayListEvent
 import com.vitorpamplona.quartz.nip51Lists.relayLists.IndexerRelayListEvent
 import com.vitorpamplona.quartz.nip51Lists.relayLists.ProxyRelayListEvent
+import com.vitorpamplona.quartz.nip51Lists.relayLists.RelayFeedsListEvent
 import com.vitorpamplona.quartz.nip51Lists.relayLists.TrustedRelayListEvent
 import com.vitorpamplona.quartz.nip65RelayList.AdvertisedRelayListEvent
 import com.vitorpamplona.quartz.nip78AppData.AppSpecificDataEvent
@@ -70,7 +70,7 @@ val AccountInfoAndListsFromKeyKinds2 =
         GeohashListEvent.KIND,
         TrustProviderListEvent.KIND,
         PaymentTargetsEvent.KIND,
-        FavoriteRelayListEvent.KIND,
+        RelayFeedsListEvent.KIND,
     )
 
 val AmethystMetadataKinds = listOf(AppSpecificDataEvent.KIND)

amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/metadata/FilterBasicAccountInfoFromKeys.kt

@@ -33,9 +33,9 @@ import com.vitorpamplona.quartz.nip51Lists.geohashList.GeohashListEvent
 import com.vitorpamplona.quartz.nip51Lists.hashtagList.HashtagListEvent
 import com.vitorpamplona.quartz.nip51Lists.relayLists.BlockedRelayListEvent
 import com.vitorpamplona.quartz.nip51Lists.relayLists.BroadcastRelayListEvent
-import com.vitorpamplona.quartz.nip51Lists.relayLists.FavoriteRelayListEvent
 import com.vitorpamplona.quartz.nip51Lists.relayLists.IndexerRelayListEvent
 import com.vitorpamplona.quartz.nip51Lists.relayLists.ProxyRelayListEvent
+import com.vitorpamplona.quartz.nip51Lists.relayLists.RelayFeedsListEvent
 import com.vitorpamplona.quartz.nip51Lists.relayLists.TrustedRelayListEvent
 import com.vitorpamplona.quartz.nip65RelayList.AdvertisedRelayListEvent
 import com.vitorpamplona.quartz.nip96FileStorage.config.FileServersEvent
@@ -62,7 +62,7 @@ val BasicAccountInfoKinds2 =
         HashtagListEvent.KIND,
         GeohashListEvent.KIND,
         TrustProviderListEvent.KIND,
-        FavoriteRelayListEvent.KIND,
+        RelayFeedsListEvent.KIND,
     )
 
 fun filterBasicAccountInfoFromKeys(

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

@@ -363,16 +363,16 @@ fun observeUserIsFollowingRelay(
 ): State<Boolean> {
     val flow =
         remember(accountViewModel) {
-            accountViewModel.account.favoriteRelayList.flowNoDefaults
+            accountViewModel.account.relayFeedsList.flowNoDefaults
                 .mapLatest { relays ->
                     relayUrl in relays
                 }.onStart {
-                    emit(relayUrl in accountViewModel.account.favoriteRelayList.flowNoDefaults.value)
+                    emit(relayUrl in accountViewModel.account.relayFeedsList.flowNoDefaults.value)
                 }.distinctUntilChanged()
                 .flowOn(Dispatchers.IO)
         }
 
-    return flow.collectAsStateWithLifecycle(relayUrl in accountViewModel.account.favoriteRelayList.flowNoDefaults.value)
+    return flow.collectAsStateWithLifecycle(relayUrl in accountViewModel.account.relayFeedsList.flowNoDefaults.value)
 }
 
 @OptIn(ExperimentalCoroutinesApi::class, FlowPreview::class)

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

@@ -81,12 +81,12 @@ import com.vitorpamplona.amethyst.ui.note.types.BadgeDisplay
 import com.vitorpamplona.amethyst.ui.note.types.DisplayBlockedRelayList
 import com.vitorpamplona.amethyst.ui.note.types.DisplayBroadcastRelayList
 import com.vitorpamplona.amethyst.ui.note.types.DisplayDMRelayList
-import com.vitorpamplona.amethyst.ui.note.types.DisplayFavoriteRelayList
 import com.vitorpamplona.amethyst.ui.note.types.DisplayFollowList
 import com.vitorpamplona.amethyst.ui.note.types.DisplayIndexerRelayList
 import com.vitorpamplona.amethyst.ui.note.types.DisplayNIP65RelayList
 import com.vitorpamplona.amethyst.ui.note.types.DisplayPeopleList
 import com.vitorpamplona.amethyst.ui.note.types.DisplayProxyRelayList
+import com.vitorpamplona.amethyst.ui.note.types.DisplayRelayFeedsList
 import com.vitorpamplona.amethyst.ui.note.types.DisplayRelaySet
 import com.vitorpamplona.amethyst.ui.note.types.DisplaySearchRelayList
 import com.vitorpamplona.amethyst.ui.note.types.DisplayTrustedRelayList
@@ -206,9 +206,9 @@ import com.vitorpamplona.quartz.nip51Lists.followList.FollowListEvent
 import com.vitorpamplona.quartz.nip51Lists.peopleList.PeopleListEvent
 import com.vitorpamplona.quartz.nip51Lists.relayLists.BlockedRelayListEvent
 import com.vitorpamplona.quartz.nip51Lists.relayLists.BroadcastRelayListEvent
-import com.vitorpamplona.quartz.nip51Lists.relayLists.FavoriteRelayListEvent
 import com.vitorpamplona.quartz.nip51Lists.relayLists.IndexerRelayListEvent
 import com.vitorpamplona.quartz.nip51Lists.relayLists.ProxyRelayListEvent
+import com.vitorpamplona.quartz.nip51Lists.relayLists.RelayFeedsListEvent
 import com.vitorpamplona.quartz.nip51Lists.relayLists.TrustedRelayListEvent
 import com.vitorpamplona.quartz.nip51Lists.relaySets.RelaySetEvent
 import com.vitorpamplona.quartz.nip52Calendar.appt.day.CalendarDateSlotEvent
@@ -842,8 +842,8 @@ private fun RenderNoteRow(
             DisplayTrustedRelayList(baseNote, backgroundColor, accountViewModel, nav)
         }
 
-        is FavoriteRelayListEvent -> {
-            DisplayFavoriteRelayList(baseNote, backgroundColor, accountViewModel, nav)
+        is RelayFeedsListEvent -> {
+            DisplayRelayFeedsList(baseNote, backgroundColor, accountViewModel, nav)
         }
 
         is IndexerRelayListEvent -> {

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/RelayList.kt

@@ -235,14 +235,14 @@ fun DisplayTrustedRelayList(
 }
 
 @Composable
-fun DisplayFavoriteRelayList(
+fun DisplayRelayFeedsList(
     baseNote: Note,
     backgroundColor: MutableState<Color>,
     accountViewModel: AccountViewModel,
     nav: INav,
 ) {
-    val relays by accountViewModel.account.favoriteRelayListDecryptionCache.observeDecryptedRelayList(baseNote).collectAsStateWithLifecycle(
-        accountViewModel.account.favoriteRelayListDecryptionCache.fastStartValueForRelayList(baseNote),
+    val relays by accountViewModel.account.relayFeedsListDecryptionCache.observeDecryptedRelayList(baseNote).collectAsStateWithLifecycle(
+        accountViewModel.account.relayFeedsListDecryptionCache.fastStartValueForRelayList(baseNote),
     )
 
     DisplayRelaySet(

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/AccountSessionManager.kt

@@ -60,8 +60,8 @@ import com.vitorpamplona.quartz.nip19Bech32.toNpub
 import com.vitorpamplona.quartz.nip28PublicChat.list.ChannelListEvent
 import com.vitorpamplona.quartz.nip49PrivKeyEnc.Nip49
 import com.vitorpamplona.quartz.nip50Search.SearchRelayListEvent
-import com.vitorpamplona.quartz.nip51Lists.relayLists.FavoriteRelayListEvent
 import com.vitorpamplona.quartz.nip51Lists.relayLists.IndexerRelayListEvent
+import com.vitorpamplona.quartz.nip51Lists.relayLists.RelayFeedsListEvent
 import com.vitorpamplona.quartz.nip65RelayList.AdvertisedRelayListEvent
 import com.vitorpamplona.quartz.utils.Hex
 import com.vitorpamplona.quartz.utils.Log
@@ -302,6 +302,7 @@ class AccountSessionManager(
                 accountSettings.backupDMRelayList?.let { client.send(it, toPost) }
                 accountSettings.backupSearchRelayList?.let { client.send(it, toPost) }
                 accountSettings.backupIndexRelayList?.let { client.send(it, toPost) }
+                accountSettings.backupRelayFeedsList?.let { client.send(it, toPost) }
             }
         }
     }
@@ -325,7 +326,7 @@ class AccountSessionManager(
             backupSearchRelayList = SearchRelayListEvent.create(DefaultSearchRelayList.toList(), tempSigner),
             backupIndexRelayList = IndexerRelayListEvent.create(DefaultIndexerRelayList.toList(), tempSigner),
             backupChannelList = ChannelListEvent.create(emptyList(), DefaultChannels, tempSigner),
-            backupFavoriteRelayList = FavoriteRelayListEvent.create(DefaultGlobalRelays, tempSigner),
+            backupRelayFeedsList = RelayFeedsListEvent.create(DefaultGlobalRelays, tempSigner),
         )
     }
 

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/TopNavFilterState.kt

@@ -186,7 +186,7 @@ class TopNavFilterState(
             account.hashtagList.flow,
             account.geohashList.flow,
             account.communityList.flowNotes,
-            account.favoriteRelayList.flow,
+            account.relayFeedsList.flow,
             ::mergeInterests,
         ).onStart {
             emit(
@@ -194,7 +194,7 @@ class TopNavFilterState(
                     account.hashtagList.flow.value,
                     account.geohashList.flow.value,
                     account.communityList.flowNotes.value,
-                    account.favoriteRelayList.flow.value,
+                    account.relayFeedsList.flow.value,
                 ),
             )
         }

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt

@@ -926,9 +926,9 @@ class AccountViewModel(
 
     fun unfollowHashtag(tag: String) = launchSigner { account.unfollowHashtag(tag) }
 
-    fun followFavoriteRelay(url: NormalizedRelayUrl) = launchSigner { account.followFavoriteRelay(url) }
+    fun followRelayFeed(url: NormalizedRelayUrl) = launchSigner { account.followRelayFeed(url) }
 
-    fun unfollowFavoriteRelay(url: NormalizedRelayUrl) = launchSigner { account.unfollowFavoriteRelay(url) }
+    fun unfollowRelayFeed(url: NormalizedRelayUrl) = launchSigner { account.unfollowRelayFeed(url) }
 
     fun showWord(word: String) = launchSigner { account.showWord(word) }
 

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/relay/RelayFeedScreen.kt

@@ -131,7 +131,7 @@ fun RelayFeedActionOptions(
                     R.string.login_with_a_private_key_to_be_able_to_unfollow,
                 )
             } else {
-                accountViewModel.unfollowFavoriteRelay(relayUrl)
+                accountViewModel.unfollowRelayFeed(relayUrl)
             }
         }
     } else {
@@ -142,7 +142,7 @@ fun RelayFeedActionOptions(
                     R.string.login_with_a_private_key_to_be_able_to_follow,
                 )
             } else {
-                accountViewModel.followFavoriteRelay(relayUrl)
+                accountViewModel.followRelayFeed(relayUrl)
             }
         }
     }

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/relays/AllRelayListScreen.kt

@@ -55,8 +55,8 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.relays.connected.ConnectedR
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.relays.connected.renderConnectedItems
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.relays.dm.DMRelayListViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.relays.dm.renderDMItems
-import com.vitorpamplona.amethyst.ui.screen.loggedIn.relays.favorites.FavoriteRelayListViewModel
-import com.vitorpamplona.amethyst.ui.screen.loggedIn.relays.favorites.renderFavoriteItems
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.relays.feeds.RelayFeedsListViewModel
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.relays.feeds.renderRelayFeedsItems
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.relays.indexer.IndexerRelayListViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.relays.indexer.renderIndexerItems
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.relays.local.LocalRelayListViewModel
@@ -95,7 +95,7 @@ fun AllRelayListScreen(
     val broadcastViewModel: BroadcastRelayListViewModel = viewModel()
     val indexerViewModel: IndexerRelayListViewModel = viewModel()
     val proxyViewModel: ProxyRelayListViewModel = viewModel()
-    val favoriteViewModel: FavoriteRelayListViewModel = viewModel()
+    val relayFeedsViewModel: RelayFeedsListViewModel = viewModel()
 
     dmViewModel.init(accountViewModel)
     nip65ViewModel.init(accountViewModel)
@@ -108,7 +108,7 @@ fun AllRelayListScreen(
     broadcastViewModel.init(accountViewModel)
     indexerViewModel.init(accountViewModel)
     proxyViewModel.init(accountViewModel)
-    favoriteViewModel.init(accountViewModel)
+    relayFeedsViewModel.init(accountViewModel)
 
     LaunchedEffect(accountViewModel) {
         dmViewModel.load()
@@ -122,7 +122,7 @@ fun AllRelayListScreen(
         broadcastViewModel.load()
         indexerViewModel.load()
         proxyViewModel.load()
-        favoriteViewModel.load()
+        relayFeedsViewModel.load()
     }
 
     MappedAllRelayListView(
@@ -137,7 +137,7 @@ fun AllRelayListScreen(
         broadcastViewModel,
         indexerViewModel,
         proxyViewModel,
-        favoriteViewModel,
+        relayFeedsViewModel,
         accountViewModel,
         nav,
     )
@@ -157,7 +157,7 @@ fun MappedAllRelayListView(
     broadcastViewModel: BroadcastRelayListViewModel,
     indexerViewModel: IndexerRelayListViewModel,
     proxyViewModel: ProxyRelayListViewModel,
-    favoriteViewModel: FavoriteRelayListViewModel,
+    relayFeedsViewModel: RelayFeedsListViewModel,
     accountViewModel: AccountViewModel,
     newNav: INav,
 ) {
@@ -173,7 +173,7 @@ fun MappedAllRelayListView(
     val broadcastRelays by broadcastViewModel.relays.collectAsStateWithLifecycle()
     val indexerRelays by indexerViewModel.relays.collectAsStateWithLifecycle()
     val proxyRelays by proxyViewModel.relays.collectAsStateWithLifecycle()
-    val favoriteFeedState by favoriteViewModel.relays.collectAsStateWithLifecycle()
+    val relayFeedsFeedState by relayFeedsViewModel.relays.collectAsStateWithLifecycle()
 
     Scaffold(
         topBar = {
@@ -190,7 +190,7 @@ fun MappedAllRelayListView(
                     broadcastViewModel.clear()
                     indexerViewModel.clear()
                     proxyViewModel.clear()
-                    favoriteViewModel.clear()
+                    relayFeedsViewModel.clear()
                     newNav.popBack()
                 },
                 onPost = {
@@ -204,7 +204,7 @@ fun MappedAllRelayListView(
                     broadcastViewModel.create()
                     indexerViewModel.create()
                     proxyViewModel.create()
-                    favoriteViewModel.create()
+                    relayFeedsViewModel.create()
                     newNav.popBack()
                 },
             )
@@ -327,7 +327,7 @@ fun MappedAllRelayListView(
                     SettingsCategorySpacingModifier,
                 )
             }
-            renderFavoriteItems(favoriteFeedState, favoriteViewModel, accountViewModel, newNav)
+            renderRelayFeedsItems(relayFeedsFeedState, relayFeedsViewModel, accountViewModel, newNav)
 
             item {
                 SettingsCategory(

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/relays/RelayInformationScreen.kt

@@ -204,9 +204,9 @@ import com.vitorpamplona.quartz.nip51Lists.muteList.MuteListEvent
 import com.vitorpamplona.quartz.nip51Lists.peopleList.PeopleListEvent
 import com.vitorpamplona.quartz.nip51Lists.relayLists.BlockedRelayListEvent
 import com.vitorpamplona.quartz.nip51Lists.relayLists.BroadcastRelayListEvent
-import com.vitorpamplona.quartz.nip51Lists.relayLists.FavoriteRelayListEvent
 import com.vitorpamplona.quartz.nip51Lists.relayLists.IndexerRelayListEvent
 import com.vitorpamplona.quartz.nip51Lists.relayLists.ProxyRelayListEvent
+import com.vitorpamplona.quartz.nip51Lists.relayLists.RelayFeedsListEvent
 import com.vitorpamplona.quartz.nip51Lists.relayLists.TrustedRelayListEvent
 import com.vitorpamplona.quartz.nip51Lists.relaySets.RelaySetEvent
 import com.vitorpamplona.quartz.nip52Calendar.appt.day.CalendarDateSlotEvent
@@ -543,7 +543,7 @@ private fun kindDisplayName(kind: Int): Int =
         CalendarRSVPEvent.KIND -> R.string.kind_appt_rsvp
         ChessGameEvent.KIND -> R.string.kind_chess_games
         JesterEvent.KIND -> R.string.kind_chess_auth
-        FavoriteRelayListEvent.KIND -> R.string.kind_favorite_relays
+        RelayFeedsListEvent.KIND -> R.string.kind_favorite_relays
         LiveChessGameChallengeEvent.KIND -> R.string.kind_chess_challenges
         LiveChessGameAcceptEvent.KIND -> R.string.kind_chess_game_accept
         LiveChessMoveEvent.KIND -> R.string.kind_chess_move

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/relays/feeds/RelayFeedsListView.kt

@@ -18,7 +18,7 @@
  * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package com.vitorpamplona.amethyst.ui.screen.loggedIn.relays.favorites
+package com.vitorpamplona.amethyst.ui.screen.loggedIn.relays.feeds
 
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
@@ -41,8 +41,8 @@ import com.vitorpamplona.amethyst.ui.theme.FeedPadding
 import com.vitorpamplona.amethyst.ui.theme.StdVertSpacer
 
 @Composable
-fun FavoriteRelayList(
-    postViewModel: FavoriteRelayListViewModel,
+fun RelayFeedsList(
+    postViewModel: RelayFeedsListViewModel,
     accountViewModel: AccountViewModel,
     onClose: () -> Unit,
     nav: INav,
@@ -55,18 +55,18 @@ fun FavoriteRelayList(
         LazyColumn(
             contentPadding = FeedPadding,
         ) {
-            renderFavoriteItems(feedState, postViewModel, accountViewModel, newNav)
+            renderRelayFeedsItems(feedState, postViewModel, accountViewModel, newNav)
         }
     }
 }
 
-fun LazyListScope.renderFavoriteItems(
+fun LazyListScope.renderRelayFeedsItems(
     feedState: List<BasicRelaySetupInfo>,
-    postViewModel: FavoriteRelayListViewModel,
+    postViewModel: RelayFeedsListViewModel,
     accountViewModel: AccountViewModel,
     nav: INav,
 ) {
-    itemsIndexed(feedState, key = { _, item -> "Favorite" + item.relay.url }) { index, item ->
+    itemsIndexed(feedState, key = { _, item -> "RelayFeeds" + item.relay.url }) { index, item ->
         BasicRelaySetupInfoDialog(
             item,
             onDelete = { postViewModel.deleteRelay(item) },

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/relays/feeds/RelayFeedsListViewModel.kt

@@ -18,19 +18,19 @@
  * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package com.vitorpamplona.amethyst.ui.screen.loggedIn.relays.favorites
+package com.vitorpamplona.amethyst.ui.screen.loggedIn.relays.feeds
 
 import androidx.compose.runtime.Stable
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.relays.common.BasicRelaySetupInfoModel
 import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
 
 @Stable
-class FavoriteRelayListViewModel : BasicRelaySetupInfoModel() {
+class RelayFeedsListViewModel : BasicRelaySetupInfoModel() {
     override fun getRelayList(): List<NormalizedRelayUrl> =
-        account.favoriteRelayList.flow.value
+        account.relayFeedsList.flow.value
             .toList()
 
     override suspend fun saveRelayList(urlList: List<NormalizedRelayUrl>) {
-        account.saveFavoriteRelayList(urlList)
+        account.saveRelayFeedsList(urlList)
     }
 }

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/threadview/ThreadFeedView.kt

@@ -124,12 +124,12 @@ import com.vitorpamplona.amethyst.ui.note.types.BadgeDisplay
 import com.vitorpamplona.amethyst.ui.note.types.DisplayBlockedRelayList
 import com.vitorpamplona.amethyst.ui.note.types.DisplayBroadcastRelayList
 import com.vitorpamplona.amethyst.ui.note.types.DisplayDMRelayList
-import com.vitorpamplona.amethyst.ui.note.types.DisplayFavoriteRelayList
 import com.vitorpamplona.amethyst.ui.note.types.DisplayFollowList
 import com.vitorpamplona.amethyst.ui.note.types.DisplayIndexerRelayList
 import com.vitorpamplona.amethyst.ui.note.types.DisplayNIP65RelayList
 import com.vitorpamplona.amethyst.ui.note.types.DisplayPeopleList
 import com.vitorpamplona.amethyst.ui.note.types.DisplayProxyRelayList
+import com.vitorpamplona.amethyst.ui.note.types.DisplayRelayFeedsList
 import com.vitorpamplona.amethyst.ui.note.types.DisplayRelaySet
 import com.vitorpamplona.amethyst.ui.note.types.DisplaySearchRelayList
 import com.vitorpamplona.amethyst.ui.note.types.DisplayTrustedRelayList
@@ -222,9 +222,9 @@ import com.vitorpamplona.quartz.nip51Lists.followList.FollowListEvent
 import com.vitorpamplona.quartz.nip51Lists.peopleList.PeopleListEvent
 import com.vitorpamplona.quartz.nip51Lists.relayLists.BlockedRelayListEvent
 import com.vitorpamplona.quartz.nip51Lists.relayLists.BroadcastRelayListEvent
-import com.vitorpamplona.quartz.nip51Lists.relayLists.FavoriteRelayListEvent
 import com.vitorpamplona.quartz.nip51Lists.relayLists.IndexerRelayListEvent
 import com.vitorpamplona.quartz.nip51Lists.relayLists.ProxyRelayListEvent
+import com.vitorpamplona.quartz.nip51Lists.relayLists.RelayFeedsListEvent
 import com.vitorpamplona.quartz.nip51Lists.relayLists.TrustedRelayListEvent
 import com.vitorpamplona.quartz.nip51Lists.relaySets.RelaySetEvent
 import com.vitorpamplona.quartz.nip53LiveActivities.chat.LiveActivitiesChatMessageEvent
@@ -622,8 +622,8 @@ private fun FullBleedNoteCompose(
                     DisplayProxyRelayList(baseNote, backgroundColor, accountViewModel, nav)
                 } else if (noteEvent is TrustedRelayListEvent) {
                     DisplayTrustedRelayList(baseNote, backgroundColor, accountViewModel, nav)
-                } else if (noteEvent is FavoriteRelayListEvent) {
-                    DisplayFavoriteRelayList(baseNote, backgroundColor, accountViewModel, nav)
+                } else if (noteEvent is RelayFeedsListEvent) {
+                    DisplayRelayFeedsList(baseNote, backgroundColor, accountViewModel, nav)
                 } else if (noteEvent is IndexerRelayListEvent) {
                     DisplayIndexerRelayList(baseNote, backgroundColor, accountViewModel, nav)
                 } else if (noteEvent is BroadcastRelayListEvent) {

quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/relayLists/RelayFeedsListEvent.kt

@@ -36,13 +36,13 @@ import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEvent
 import com.vitorpamplona.quartz.nip51Lists.encryption.PrivateTagsInContent
 import com.vitorpamplona.quartz.nip51Lists.encryption.signNip51List
 import com.vitorpamplona.quartz.nip51Lists.relayLists.tags.RelayTag
-import com.vitorpamplona.quartz.nip51Lists.relayLists.tags.favoriteRelays
+import com.vitorpamplona.quartz.nip51Lists.relayLists.tags.relayFeeds
 import com.vitorpamplona.quartz.nip51Lists.relayLists.tags.relays
 import com.vitorpamplona.quartz.nip51Lists.remove
 import com.vitorpamplona.quartz.utils.TimeUtils
 
 @Immutable
-class FavoriteRelayListEvent(
+class RelayFeedsListEvent(
     id: HexKey,
     pubKey: HexKey,
     createdAt: Long,
@@ -58,7 +58,7 @@ class FavoriteRelayListEvent(
 
     companion object {
         const val KIND = 10012
-        const val ALT = "Favorite Relays"
+        const val ALT = "Relay Feeds"
         val TAGS = arrayOf(AltTag.assemble(ALT))
 
         fun createAddress(pubKey: HexKey): Address = Address(KIND, pubKey, "")
@@ -68,11 +68,11 @@ class FavoriteRelayListEvent(
         fun createAddressTag(pubKey: HexKey): String = Address.Companion.assemble(KIND, pubKey, "")
 
         suspend fun updateRelayList(
-            earlierVersion: FavoriteRelayListEvent,
+            earlierVersion: RelayFeedsListEvent,
             relays: List<NormalizedRelayUrl>,
             signer: NostrSigner,
             createdAt: Long = TimeUtils.now(),
-        ): FavoriteRelayListEvent {
+        ): RelayFeedsListEvent {
             val newRelayList = relays.map { RelayTag.assemble(it) }
             val privateTags = earlierVersion.privateTags(signer) ?: throw SignerExceptions.UnauthorizedDecryptionException()
 
@@ -86,7 +86,7 @@ class FavoriteRelayListEvent(
             relays: List<NormalizedRelayUrl>,
             signer: NostrSigner,
             createdAt: Long = TimeUtils.now(),
-        ): FavoriteRelayListEvent {
+        ): RelayFeedsListEvent {
             val privateTagArray = relays.map { RelayTag.assemble(it) }.toTypedArray()
             return signer.signNip51List(createdAt, KIND, TAGS, privateTagArray)
         }
@@ -95,7 +95,7 @@ class FavoriteRelayListEvent(
             relays: List<NormalizedRelayUrl>,
             signer: NostrSignerSync,
             createdAt: Long = TimeUtils.now(),
-        ): FavoriteRelayListEvent {
+        ): RelayFeedsListEvent {
             val privateTagArray = relays.map { RelayTag.assemble(it) }.toTypedArray()
             return signer.signNip51List(createdAt, KIND, TAGS, privateTagArray)
         }
@@ -105,14 +105,14 @@ class FavoriteRelayListEvent(
             privateRelays: List<NormalizedRelayUrl> = emptyList(),
             signer: NostrSigner,
             createdAt: Long = TimeUtils.now(),
-            initializer: TagArrayBuilder<FavoriteRelayListEvent>.() -> Unit = {},
-        ) = eventTemplate<FavoriteRelayListEvent>(
+            initializer: TagArrayBuilder<RelayFeedsListEvent>.() -> Unit = {},
+        ) = eventTemplate<RelayFeedsListEvent>(
             kind = KIND,
             description = PrivateTagsInContent.encryptNip44(privateRelays.map { RelayTag.assemble(it) }.toTypedArray(), signer),
             createdAt = createdAt,
         ) {
             alt(ALT)
-            favoriteRelays(publicRelays)
+            relayFeeds(publicRelays)
 
             initializer()
         }

quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/relayLists/tags/TagArrayBuilderExt.kt

@@ -27,9 +27,9 @@ import com.vitorpamplona.quartz.nip50Search.SearchRelayListEvent
 import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEvent
 import com.vitorpamplona.quartz.nip51Lists.relayLists.BlockedRelayListEvent
 import com.vitorpamplona.quartz.nip51Lists.relayLists.BroadcastRelayListEvent
-import com.vitorpamplona.quartz.nip51Lists.relayLists.FavoriteRelayListEvent
 import com.vitorpamplona.quartz.nip51Lists.relayLists.IndexerRelayListEvent
 import com.vitorpamplona.quartz.nip51Lists.relayLists.ProxyRelayListEvent
+import com.vitorpamplona.quartz.nip51Lists.relayLists.RelayFeedsListEvent
 import com.vitorpamplona.quartz.nip51Lists.relayLists.TrustedRelayListEvent
 import com.vitorpamplona.quartz.nip51Lists.relaySets.RelaySetEvent
 import com.vitorpamplona.quartz.nip51Lists.tags.NameTag
@@ -52,4 +52,4 @@ fun TagArrayBuilder<PrivateOutboxRelayListEvent>.privateRelays(relays: List<Norm
 
 fun TagArrayBuilder<RelaySetEvent>.relaySet(relays: List<NormalizedRelayUrl>) = addAll(relays.map { RelayTag.assemble(it) })
 
-fun TagArrayBuilder<FavoriteRelayListEvent>.favoriteRelays(relays: List<NormalizedRelayUrl>) = addAll(relays.map { RelayTag.assemble(it) })
+fun TagArrayBuilder<RelayFeedsListEvent>.relayFeeds(relays: List<NormalizedRelayUrl>) = addAll(relays.map { RelayTag.assemble(it) })

quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/utils/EventFactory.kt

@@ -89,9 +89,9 @@ import com.vitorpamplona.quartz.nip51Lists.muteList.MuteListEvent
 import com.vitorpamplona.quartz.nip51Lists.peopleList.PeopleListEvent
 import com.vitorpamplona.quartz.nip51Lists.relayLists.BlockedRelayListEvent
 import com.vitorpamplona.quartz.nip51Lists.relayLists.BroadcastRelayListEvent
-import com.vitorpamplona.quartz.nip51Lists.relayLists.FavoriteRelayListEvent
 import com.vitorpamplona.quartz.nip51Lists.relayLists.IndexerRelayListEvent
 import com.vitorpamplona.quartz.nip51Lists.relayLists.ProxyRelayListEvent
+import com.vitorpamplona.quartz.nip51Lists.relayLists.RelayFeedsListEvent
 import com.vitorpamplona.quartz.nip51Lists.relayLists.TrustedRelayListEvent
 import com.vitorpamplona.quartz.nip51Lists.relaySets.RelaySetEvent
 import com.vitorpamplona.quartz.nip52Calendar.appt.day.CalendarDateSlotEvent
@@ -199,7 +199,7 @@ class EventFactory {
                 CalendarRSVPEvent.KIND -> CalendarRSVPEvent(id, pubKey, createdAt, tags, content, sig)
                 ChessGameEvent.KIND -> ChessGameEvent(id, pubKey, createdAt, tags, content, sig)
                 CodeSnippetEvent.KIND -> CodeSnippetEvent(id, pubKey, createdAt, tags, content, sig)
-                FavoriteRelayListEvent.KIND -> FavoriteRelayListEvent(id, pubKey, createdAt, tags, content, sig)
+                RelayFeedsListEvent.KIND -> RelayFeedsListEvent(id, pubKey, createdAt, tags, content, sig)
                 JesterEvent.KIND -> JesterEvent(id, pubKey, createdAt, tags, content, sig)
                 LiveChessGameChallengeEvent.KIND -> LiveChessGameChallengeEvent(id, pubKey, createdAt, tags, content, sig)
                 LiveChessGameAcceptEvent.KIND -> LiveChessGameAcceptEvent(id, pubKey, createdAt, tags, content, sig)