highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-09-25 12:01:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes lack of feed updates for those that didn't follow any communities

Browse Source
This commit is contained in:
Vitor Pamplona
2025-08-21 20:11:44 -04:00
parent 499316687f
commit 1f2a153f47
5 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip65RelayList/OutboxRelaySetState.kt
View File

@@ -70,7 +70,12 @@ class OutboxRelaySetState(
usersToLoad
.transformLatest { followList ->
val flows: List<StateFlow<NoteState>> = allRelayListFlows(followList)
val relayListFlows = combineAllFlows(flows)
val relayListFlows =
if (flows.isEmpty()) {
MutableStateFlow(emptySet())
} else {
combineAllFlows(flows)
}
emitAll(relayListFlows)
}.onStart {
emit(

9
amethyst/src/main/java/com/vitorpamplona/amethyst/model/topNavFeeds/CommunityRelayLoader.kt
View File

@@ -27,6 +27,7 @@ import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
import com.vitorpamplona.quartz.nip72ModCommunities.definition.CommunityDefinitionEvent
import com.vitorpamplona.quartz.utils.mapOfSet
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.combine
class CommunityRelayLoader {
@@ -81,8 +82,12 @@ class CommunityRelayLoader {
?.stateFlow
}
return combine(noteMetadataFlows) { communityNotes ->
transformation(communitiesPerRelay(communityNotes, cache))
return if (noteMetadataFlows.isEmpty()) {
MutableStateFlow(transformation(emptyMap()))
} else {
combine(noteMetadataFlows) { communityNotes ->
transformation(communitiesPerRelay(communityNotes, cache))
}
}
}
}

9
amethyst/src/main/java/com/vitorpamplona/amethyst/model/topNavFeeds/OutboxRelayLoader.kt
View File

@@ -28,6 +28,7 @@ import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
import com.vitorpamplona.quartz.nip65RelayList.AdvertisedRelayListEvent
import com.vitorpamplona.quartz.utils.mapOfSet
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.combine
class OutboxRelayLoader {
@@ -86,8 +87,12 @@ class OutboxRelayLoader {
note.flow().metadata.stateFlow
}
return combine(noteMetadataFlows) { outboxRelays ->
transformation(authorsPerRelay(outboxRelays, cache))
return if (noteMetadataFlows.isEmpty()) {
MutableStateFlow(transformation(emptyMap()))
} else {
combine(noteMetadataFlows) { outboxRelays ->
transformation(authorsPerRelay(outboxRelays, cache))
}
}
}
}

2
amethyst/src/main/java/com/vitorpamplona/amethyst/model/topNavFeeds/allFollows/AllFollowsByOutboxTopNavFilter.kt
View File

@@ -86,6 +86,7 @@ class AllFollowsByOutboxTopNavFilter(
} else {
MutableStateFlow(emptyMap())
}
val communitiesPerRelay =
if (communities != null) {
CommunityRelayLoader.toCommunitiesPerRelayFlow(communities, cache) { it }
@@ -116,6 +117,7 @@ class AllFollowsByOutboxTopNavFilter(
} else {
emptyMap()
}
val communitiesPerRelay =
if (communities != null) {
CommunityRelayLoader.communitiesPerRelaySnapshot(communities, cache) { it }

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

@@ -222,7 +222,7 @@ class AccountViewModel(
}
}
if (flows != null) {
if (!flows.isNullOrEmpty()) {
combine(flows) {
it.any { it }
}