Lemmy/Raccoon
1
0
Fork 0
mirror of https://github.com/LiveFastEatTrashRaccoon/RaccoonForLemmy.git synced 2025-02-09 11:58:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

enhancement: improve profile loading (#575)

Browse Source
This commit is contained in:
Diego Beraldin 2024-03-06 22:08:58 +01:00 committed by GitHub
parent c1d02449cf
commit fcc8d179f4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
domain/identity/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/domain/identity/repository/DefaultIdentityRepository.kt
View File

@ -2,6 +2,7 @@ package com.github.diegoberaldin.raccoonforlemmy.domain.identity.repository
import com.github.diegoberaldin.raccoonforlemmy.core.persistence.repository.AccountRepository import com.github.diegoberaldin.raccoonforlemmy.core.persistence.repository.AccountRepository
import com.github.diegoberaldin.raccoonforlemmy.core.utils.network.NetworkManager import com.github.diegoberaldin.raccoonforlemmy.core.utils.network.NetworkManager
import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.UserModel
import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.repository.SiteRepository import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.repository.SiteRepository
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.IO import kotlinx.coroutines.IO
@ -16,6 +17,8 @@ internal class DefaultIdentityRepository(
override val authToken = MutableStateFlow<String?>(null) override val authToken = MutableStateFlow<String?>(null)
override val isLogged = MutableStateFlow<Boolean?>(null) override val isLogged = MutableStateFlow<Boolean?>(null)
override var cachedUser: UserModel? = null
private set
override suspend fun startup() = withContext(Dispatchers.IO) { override suspend fun startup() = withContext(Dispatchers.IO) {
val account = accountRepository.getActive() val account = accountRepository.getActive()
@ -33,6 +36,7 @@ internal class DefaultIdentityRepository(
override fun clearToken() { override fun clearToken() {
authToken.value = "" authToken.value = ""
cachedUser = null
isLogged.value = false isLogged.value = false
} }
@ -42,8 +46,8 @@ internal class DefaultIdentityRepository(
isLogged.value = false isLogged.value = false
} else { } else {
val newIsLogged = if (networkManager.isNetworkAvailable()) { val newIsLogged = if (networkManager.isNetworkAvailable()) {
val currentUser = siteRepository.getCurrentUser(auth) cachedUser = siteRepository.getCurrentUser(auth)
currentUser != null cachedUser != null
} else { } else {
null null
} }

6
domain/identity/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/domain/identity/repository/IdentityRepository.kt
View File

@ -1,17 +1,17 @@
package com.github.diegoberaldin.raccoonforlemmy.domain.identity.repository package com.github.diegoberaldin.raccoonforlemmy.domain.identity.repository
import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.UserModel
import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.StateFlow
interface IdentityRepository { interface IdentityRepository {
val authToken: StateFlow<String?> val authToken: StateFlow<String?>
val isLogged: StateFlow<Boolean?> val isLogged: StateFlow<Boolean?>
val cachedUser: UserModel?
suspend fun startup() suspend fun startup()
fun storeToken( fun storeToken(jwt: String)
jwt: String,
)
fun clearToken() fun clearToken()

1
domain/identity/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/domain/identity/usecase/DefaultLoginUseCase.kt
View File

@ -41,6 +41,7 @@ internal class DefaultLoginUseCase(
} else { } else {
val accountSettings = siteRepository.getAccountSettings(auth) val accountSettings = siteRepository.getAccountSettings(auth)
identityRepository.storeToken(auth) identityRepository.storeToken(auth)
identityRepository.refreshLoggedState()
val account = AccountModel( val account = AccountModel(
username = username, username = username,

1
domain/identity/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/domain/identity/usecase/DefaultSwitchAccountUseCase.kt
View File

@ -28,6 +28,7 @@ internal class DefaultSwitchAccountUseCase(
notificationCenter.send(NotificationCenterEvent.Logout) notificationCenter.send(NotificationCenterEvent.Logout)
serviceProvider.changeInstance(instance) serviceProvider.changeInstance(instance)
identityRepository.storeToken(jwt) identityRepository.storeToken(jwt)
identityRepository.refreshLoggedState()
val newSettings = settingsRepository.getSettings(accountId) val newSettings = settingsRepository.getSettings(accountId)
settingsRepository.changeCurrentSettings(newSettings) settingsRepository.changeCurrentSettings(newSettings)

16
unit/myaccount/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/myaccount/ProfileLoggedViewModel.kt
View File

@ -98,9 +98,19 @@ class ProfileLoggedViewModel(
}.launchIn(this) }.launchIn(this)
if (uiState.value.posts.isEmpty()) { if (uiState.value.posts.isEmpty()) {
withContext(Dispatchers.IO) { val userFromCache = identityRepository.cachedUser
refreshUser() if (userFromCache != null) {
refresh(initial = true) updateState {
it.copy(
user = userFromCache,
initial = false,
)
}
} else {
withContext(Dispatchers.IO) {
refreshUser()
refresh(initial = true)
}
} }
} }
} }