Skip to content

Commit

Permalink
feat: エラーのハンドリングにUserActionAppGlobalErrorStoreを使用するようにした
Browse files Browse the repository at this point in the history
  • Loading branch information
@pantasystem
pantasystem committed Jan 11, 2024
1 parent 14c403d commit 59c2557
Show file tree
Hide file tree
Showing 2 changed files with 120 additions and 19 deletions.
6 changes: 3 additions & 3 deletions ...es/features/user/src/main/java/net/pantasystem/milktea/user/profile/UserDetailActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -352,9 +352,9 @@ class UserDetailActivity : AppCompatActivity() {
}
}

mViewModel.errors.onEach {
UserDetailErrorHandler(this@UserDetailActivity)(it)
}.flowWithLifecycle(lifecycle, Lifecycle.State.RESUMED).launchIn(lifecycleScope)
// mViewModel.errors.onEach {
// UserDetailErrorHandler(this@UserDetailActivity)(it)
// }.flowWithLifecycle(lifecycle, Lifecycle.State.RESUMED).launchIn(lifecycleScope)

}

Expand Down
133 changes: 117 additions & 16 deletions .../user/src/main/java/net/pantasystem/milktea/user/profile/viewmodel/UserDetailViewModel.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ import kotlinx.datetime.TimeZone
import kotlinx.datetime.toLocalDateTime
import kotlinx.datetime.todayIn
import net.pantasystem.milktea.app_store.account.AccountStore
import net.pantasystem.milktea.app_store.handler.AppGlobalError
import net.pantasystem.milktea.app_store.handler.UserActionAppGlobalErrorStore
import net.pantasystem.milktea.common.Logger
import net.pantasystem.milktea.common.mapCancellableCatching
import net.pantasystem.milktea.common.runCancellableCatching
Expand Down Expand Up @@ -59,6 +61,7 @@ class UserDetailViewModel @Inject constructor(
private val toggleUserTimelineAddTabUseCase: ToggleUserTimelineAddTabUseCase,
private val toggleNotifyUserPostsUseCase: ToggleNotifyUserPostsUseCase,
private val userIdResolver: UserIdResolver,
private val userActionAppGlobalErrorStore: UserActionAppGlobalErrorStore,
configRepository: LocalConfigRepository,
) : ViewModel() {

Expand All @@ -84,8 +87,8 @@ class UserDetailViewModel @Inject constructor(
private val fqdnUserName =
savedStateHandle.getStateFlow<String?>(UserDetailActivity.EXTRA_USER_NAME, null)

private val _errors = MutableSharedFlow<Throwable>(extraBufferCapacity = 100)
val errors = _errors.asSharedFlow()
// private val _errors = MutableSharedFlow<Throwable>(extraBufferCapacity = 100)
// val errors = _errors.asSharedFlow()

private val userProfileArgType = UserProfileArgTypeCombiner(viewModelScope).create(
userId,
Expand All @@ -110,7 +113,14 @@ class UserDetailViewModel @Inject constructor(
it?.castAndPartiallyFill()
}.catch {
logger.error("observe user error", it)
_errors.tryEmit(it)
userActionAppGlobalErrorStore.dispatch(
AppGlobalError(
"UserDetailViewModel.userState",
AppGlobalError.ErrorLevel.Warning,
StringSource("Load user failed"),
it
)
)
}.stateIn(viewModelScope, SharingStarted.Lazily, null)

val isTodayBirthday = userState.map {
Expand Down Expand Up @@ -202,7 +212,14 @@ class UserDetailViewModel @Inject constructor(
userRepository.sync(userId).getOrThrow()
}.onFailure {
logger.error("user sync error", it)
_errors.tryEmit(it)
userActionAppGlobalErrorStore.dispatch(
AppGlobalError(
"UserDetailViewModel.sync",
AppGlobalError.ErrorLevel.Warning,
StringSource("User data sync failed"),
it
)
)
}
}
}
Expand All @@ -213,7 +230,14 @@ class UserDetailViewModel @Inject constructor(
userState.value?.let { user ->
toggleFollowUseCase(user.id).onFailure {
logger.error("unmute failed", e = it)
_errors.tryEmit(it)
userActionAppGlobalErrorStore.dispatch(
AppGlobalError(
"UserDetailViewModel.changeFollow",
AppGlobalError.ErrorLevel.Warning,
StringSource("follow/unfollow failed"),
it
)
)
}
}

Expand All @@ -225,7 +249,14 @@ class UserDetailViewModel @Inject constructor(
userState.value?.let { user ->
muteUserUseCase(CreateMute(user.id, expiredAt)).onFailure {
logger.error("unmute", e = it)
_errors.tryEmit(it)
userActionAppGlobalErrorStore.dispatch(
AppGlobalError(
"UserDetailViewModel.mute",
AppGlobalError.ErrorLevel.Warning,
StringSource("mute failed"),
it
)
)
}
}
}
Expand All @@ -236,7 +267,14 @@ class UserDetailViewModel @Inject constructor(
userState.value?.let { user ->
unMuteUserUseCase(user.id).onFailure {
logger.error("unmute", e = it)
_errors.tryEmit(it)
userActionAppGlobalErrorStore.dispatch(
AppGlobalError(
"UserDetailViewModel.unmute",
AppGlobalError.ErrorLevel.Warning,
StringSource("unmute failed"),
it
)
)
}
}
}
Expand All @@ -247,7 +285,14 @@ class UserDetailViewModel @Inject constructor(
userState.value?.let { user ->
blockUserUseCase(user.id).onFailure {
logger.error("block failed", it)
_errors.tryEmit(it)
userActionAppGlobalErrorStore.dispatch(
AppGlobalError(
"UserDetailViewModel.block",
AppGlobalError.ErrorLevel.Warning,
StringSource("block failed"),
it
)
)
}
}
}
Expand All @@ -258,7 +303,14 @@ class UserDetailViewModel @Inject constructor(
userState.value?.let { user ->
unBlockUserUseCase(user.id).onFailure {
logger.info("unblock failed", e = it)
_errors.tryEmit(it)
userActionAppGlobalErrorStore.dispatch(
AppGlobalError(
"UserDetailViewModel.unblock",
AppGlobalError.ErrorLevel.Warning,
StringSource("unblock failed"),
it
)
)
}
}
}
Expand All @@ -272,7 +324,14 @@ class UserDetailViewModel @Inject constructor(
logger.debug("ニックネーム更新処理成功")
}.onFailure {
logger.error("ニックネーム更新処理失敗", e = it)
_errors.tryEmit(it)
userActionAppGlobalErrorStore.dispatch(
AppGlobalError(
"UserDetailViewModel.changeNickname",
AppGlobalError.ErrorLevel.Warning,
StringSource("change nickname failed"),
it
)
)
}
}
}
Expand All @@ -285,7 +344,14 @@ class UserDetailViewModel @Inject constructor(
logger.debug("ニックネーム削除処理成功")
}.onFailure {
logger.error("ニックネーム削除失敗", e = it)
_errors.tryEmit(it)
userActionAppGlobalErrorStore.dispatch(
AppGlobalError(
"UserDetailViewModel.deleteNickname",
AppGlobalError.ErrorLevel.Warning,
StringSource("delete nickname failed"),
it
)
)
}
}
}
Expand All @@ -296,7 +362,14 @@ class UserDetailViewModel @Inject constructor(
toggleUserTimelineAddTabUseCase(it).getOrThrow()
}.onFailure {
logger.error("toggle user timeline tab failed", it)
_errors.tryEmit(it)
userActionAppGlobalErrorStore.dispatch(
AppGlobalError(
"UserDetailViewModel.toggleUserTimelineTab",
AppGlobalError.ErrorLevel.Warning,
StringSource("add/remove user timeline tab failed"),
it
)
)
}
}
}
Expand All @@ -307,7 +380,14 @@ class UserDetailViewModel @Inject constructor(
toggleNotifyUserPostsUseCase(it).getOrThrow()
}.onFailure {
logger.error("toggle user notify posts failed", it)
_errors.tryEmit(it)
userActionAppGlobalErrorStore.dispatch(
AppGlobalError(
"UserDetailViewModel.toggleNotifyUserPosts",
AppGlobalError.ErrorLevel.Warning,
StringSource("on/off notify user posts failed"),
it
)
)
}
}
}
Expand All @@ -317,7 +397,14 @@ class UserDetailViewModel @Inject constructor(
getUserId().mapCancellableCatching {
renoteMuteRepository.create(it).getOrThrow()
}.onFailure {
_errors.tryEmit(it)
userActionAppGlobalErrorStore.dispatch(
AppGlobalError(
"UserDetailViewModel.muteRenotes",
AppGlobalError.ErrorLevel.Warning,
StringSource("mute renote failed"),
it
)
)
}
}
}
Expand All @@ -327,7 +414,14 @@ class UserDetailViewModel @Inject constructor(
getUserId().mapCancellableCatching {
renoteMuteRepository.delete(it).getOrThrow()
}.onFailure {
_errors.tryEmit(it)
userActionAppGlobalErrorStore.dispatch(
AppGlobalError(
"UserDetailViewModel.unMuteRenotes",
AppGlobalError.ErrorLevel.Warning,
StringSource("unmute renote failed"),
it
)
)
}
}
}
Expand All @@ -342,7 +436,14 @@ class UserDetailViewModel @Inject constructor(
accountStore.setCurrent(account)
}.onFailure {
logger.error("setCurrentAccount failed", it)
_errors.tryEmit(it)
userActionAppGlobalErrorStore.dispatch(
AppGlobalError(
"UserDetailViewModel.setCurrentAccount",
AppGlobalError.ErrorLevel.Warning,
StringSource("switch account failed"),
it
)
)
}
}
}
Expand Down

0 comments on commit 59c2557

Please sign in to comment.