Skip to content

refactor(members): drop dead delete code from the profile view model #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SiteRelEnby merged 1 commit into from
Jun 24, 2026
Merged

refactor(members): drop dead delete code from the profile view model #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions sheaf/app/src/main/java/systems/lupine/sheaf/ui/members/MembersScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -902,10 +902,6 @@ fun MemberProfileScreen(
onDispose { lifecycleOwner.lifecycle.removeObserver(observer) }
}

LaunchedEffect(state.deleted) {
if (state.deleted) onNavigateUp()
}

val member = state.member
val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior()

Expand Down
45 changes: 0 additions & 45 deletions sheaf/app/src/main/java/systems/lupine/sheaf/ui/members/MembersViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -653,11 +653,6 @@ data class MemberProfileUiState(
val currentFronts: List<FrontRead> = emptyList(),
val isLoading: Boolean = false,
val error: String? = null,
val deleted: Boolean = false,
val deleteSafety: MemberDeleteSafety = MemberDeleteSafety(),
val isDeleting: Boolean = false,
val deleteError: String? = null,
val deleteQueued: Boolean = false,
val revisions: List<ContentRevisionRead> = emptyList(),
val showRevisions: Boolean = false,
val isLoadingRevisions: Boolean = false,
Expand Down Expand Up @@ -784,46 +779,6 @@ class MemberProfileViewModel @Inject constructor(
}
}

fun loadDeleteSafety() {
viewModelScope.launch {
runCatching {
val safety = api.getSystemSafety()
val user = runCatching { api.getMe() }.getOrNull()
MemberDeleteSafety(
authTier = safety.settings.authTier,
totpEnabled = user?.totpEnabled == true,
appliesToMembers = safety.settings.appliesToMembers,
gracePeriodDays = safety.settings.gracePeriodDays,
)
}.onSuccess { s -> _state.update { it.copy(deleteSafety = s) } }
}
}

fun delete(password: String? = null, totpCode: String? = null) {
viewModelScope.launch {
_state.update { it.copy(isDeleting = true, deleteError = null, deleteQueued = false) }
runCatching { api.deleteMemberOrQueue(memberId, password, totpCode) }
.onSuccess { queued ->
_state.update {
it.copy(
isDeleting = false,
deleted = true,
deleteQueued = queued != null,
)
}
}
.onFailure { e ->
val msg = if (e is retrofit2.HttpException && e.code() in listOf(400, 401))
"Incorrect password or authenticator code"
else
e.toUserMessage("Failed to delete member")
_state.update { it.copy(isDeleting = false, deleteError = msg) }
}
}
}

fun clearDeleteError() { _state.update { it.copy(deleteError = null) } }

fun toggleRevisions() {
val showing = _state.value.showRevisions
if (showing) {
Expand Down
Loading