ember/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: Incorrect interpretation of 5.5.4

Browse source
This commit is contained in:
nexy7574 2025-10-09 00:44:20 +01:00 • committed by Tom Foster
parent 8b3acfd770
commit 28f258fc8c
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/core/matrix/state_res/event_auth.rs
View file

@ -1011,7 +1011,7 @@ where
},
| MembershipState::Leave => {
let can_unban = if target_user_current_membership == MembershipState::Ban {
sender_creator || sender_power.filter(|&p| p < &power_levels.ban).is_some()
sender_creator || sender_power.filter(|&p| p >= &power_levels.ban).is_some()
} else {
true
};
@ -1019,7 +1019,11 @@ where
target_user_current_membership,
MembershipState::Ban | MembershipState::Leave
) {
sender_creator || sender_power.filter(|&p| p < &power_levels.kick).is_some()
sender_creator
|| (sender_power.filter(|&p| p < &power_levels.kick).is_some()
&& sender_power
.filter(|&p| p > target_power.unwrap_or(&int!(0)))
.is_some())
} else {
true
};
@ -1049,7 +1053,7 @@ where
"sender cannot kick another user as they are not joined to the room",
);
false
} else if !can_unban {
} else if !(can_unban && can_kick) {
// If the target is banned, only a room creator or someone with ban power
// level can unban them
warn!(