highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-10-10 18:13:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/main' into gallery_alternative_version

Browse Source
This commit is contained in:
Believethehype
2024-07-11 08:19:29 +02:00
parent a0a7f28304 1a70a02b44
commit 43d140175c
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
amethyst/src/main/java/com/vitorpamplona/amethyst/model/Account.kt
View File

@@ -119,7 +119,7 @@ import kotlinx.coroutines.flow.SharingStarted
import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.combineTransform import kotlinx.coroutines.flow.combineTransform
import kotlinx.coroutines.flow.flatMapLatest import kotlinx.coroutines.flow.flatMapLatest
import kotlinx.coroutines.flow.flattenMerge import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.mapLatest import kotlinx.coroutines.flow.mapLatest
import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.flow.stateIn
import kotlinx.coroutines.flow.transformLatest import kotlinx.coroutines.flow.transformLatest
@@ -481,10 +481,9 @@ class Account(
@OptIn(ExperimentalCoroutinesApi::class) @OptIn(ExperimentalCoroutinesApi::class)
private val liveNotificationList: Flow<ListNameNotePair> by lazy { private val liveNotificationList: Flow<ListNameNotePair> by lazy {
defaultNotificationFollowList defaultNotificationFollowList.flatMapLatest { listName ->
.transformLatest { listName -> loadPeopleListFlowFromListName(listName)
emit(loadPeopleListFlowFromListName(listName)) }
}.flattenMerge()
} }
val liveNotificationFollowLists: StateFlow<LiveFollowLists?> by lazy { val liveNotificationFollowLists: StateFlow<LiveFollowLists?> by lazy {
@@ -494,10 +493,9 @@ class Account(
@OptIn(ExperimentalCoroutinesApi::class) @OptIn(ExperimentalCoroutinesApi::class)
private val liveStoriesList: Flow<ListNameNotePair> by lazy { private val liveStoriesList: Flow<ListNameNotePair> by lazy {
defaultStoriesFollowList defaultStoriesFollowList.flatMapLatest { listName ->
.transformLatest { listName -> loadPeopleListFlowFromListName(listName)
emit(loadPeopleListFlowFromListName(listName)) }
}.flattenMerge()
} }
val liveStoriesFollowLists: StateFlow<LiveFollowLists?> by lazy { val liveStoriesFollowLists: StateFlow<LiveFollowLists?> by lazy {
@@ -507,10 +505,9 @@ class Account(
@OptIn(ExperimentalCoroutinesApi::class) @OptIn(ExperimentalCoroutinesApi::class)
private val liveDiscoveryList: Flow<ListNameNotePair> by lazy { private val liveDiscoveryList: Flow<ListNameNotePair> by lazy {
defaultDiscoveryFollowList defaultDiscoveryFollowList.flatMapLatest { listName ->
.transformLatest { listName -> loadPeopleListFlowFromListName(listName)
emit(loadPeopleListFlowFromListName(listName)) }
}.flattenMerge()
} }
val liveDiscoveryFollowLists: StateFlow<LiveFollowLists?> by lazy { val liveDiscoveryFollowLists: StateFlow<LiveFollowLists?> by lazy {