Skip to content

Fix : iterate on unban permissions #5959

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
ganfra merged 4 commits into from
Dec 30, 2025
Merged

Fix : iterate on unban permissions #5959

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0cf6029
Revert "fix: display banned member list if permissions.canKick or per…
ganfra Dec 23, 2025
afaa369
fix: unban action requires both ban and kick permissions
ganfra Dec 23, 2025
ee241b1
Merge branch 'develop' into feature/fga/ban_moderation
ganfra Dec 30, 2025
2fa4994
quality : move canUnban logic to the permission class
ganfra Dec 30, 2025
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
2 changes: 1 addition & 1 deletion ...c/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ data class RoomMemberListState(
val moderationState: RoomMemberModerationState,
val eventSink: (RoomMemberListEvents) -> Unit,
) {
val showBannedSection: Boolean = moderationState.permissions.hasAny && roomMembers.dataOrNull()?.banned?.isNotEmpty() == true
val showBannedSection: Boolean = moderationState.permissions.canBan && roomMembers.dataOrNull()?.banned?.isNotEmpty() == true
}

enum class SelectedSection {
Expand Down
2 changes: 0 additions & 2 deletions ...n/io/element/android/features/roommembermoderation/api/RoomMemberModerationPermissions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ data class RoomMemberModerationPermissions(
val canKick: Boolean,
val canBan: Boolean,
) {
val hasAny = canKick || canBan

companion object {
val DEFAULT = RoomMemberModerationPermissions(
canKick = false,
Expand Down
30 changes: 21 additions & 9 deletions ...in/io/element/android/features/roommembermoderation/impl/RoomMemberModerationPresenter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,16 +161,28 @@ class RoomMemberModerationPresenter(
val canModerateThisUser = currentUserPowerLevel > targetMemberPowerLevel
// Assume the member is joined when it's unknown
val membership = member?.membership ?: RoomMembershipState.JOIN
if (permissions.canKick) {
// Unban requires kick permission instead of a dedicated unban permission
if (membership == RoomMembershipState.BAN) {
add(ModerationActionState(action = ModerationAction.UnbanUser, isEnabled = canModerateThisUser))
} else if (membership != RoomMembershipState.LEAVE) {
add(ModerationActionState(action = ModerationAction.KickUser, isEnabled = canModerateThisUser))
when (membership) {
RoomMembershipState.BAN -> {
// Unban requires both kick and ban permission instead of a dedicated unban permission
if (permissions.canBan && permissions.canKick) {
Copy link
Member

@bmarty bmarty Dec 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A detail, but maybe move the logic and comment to RoomMemberModerationPermissions like this:

// Unban requires both kick and ban permission instead of a dedicated unban permission
val canUnban = canKick && canBan

add(ModerationActionState(action = ModerationAction.UnbanUser, isEnabled = canModerateThisUser))
}
}
RoomMembershipState.INVITE,
RoomMembershipState.JOIN,
RoomMembershipState.KNOCK -> {
if (permissions.canKick) {
add(ModerationActionState(action = ModerationAction.KickUser, isEnabled = canModerateThisUser))
}
if (permissions.canBan) {
add(ModerationActionState(action = ModerationAction.BanUser, isEnabled = canModerateThisUser))
}
}
RoomMembershipState.LEAVE -> {
if (permissions.canBan) {
add(ModerationActionState(action = ModerationAction.BanUser, isEnabled = canModerateThisUser))
}
}
}
if (permissions.canBan && membership != RoomMembershipState.BAN) {
add(ModerationActionState(action = ModerationAction.BanUser, isEnabled = canModerateThisUser))
}
}.toImmutableList()
}
Expand Down
Loading