chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

state-res: Use match instead of repeatedly comparing the same variable

Browse Source
This commit is contained in:
Jonas Platte 2021-09-04 01:41:24 +02:00
parent b4c22d5783
commit 43c8df18ad
No known key found for this signature in database
GPG Key ID: CC154DE0E30B7C67
1 changed files with 103 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
crates/ruma-state-res/src/event_auth.rs
View File

@ -441,7 +441,8 @@ fn valid_membership_change<E: Event>(
let target_user_membership_event_id = let target_user_membership_event_id =
target_user_membership_event.as_ref().map(|e| e.event_id()); target_user_membership_event.as_ref().map(|e| e.event_id());
Ok(if target_membership == MembershipState::Join { Ok(match target_membership {
MembershipState::Join => {
if sender != target_user { if sender != target_user {
warn!("Can't make other user join"); warn!("Can't make other user join");
false false
@ -465,7 +466,8 @@ fn valid_membership_change<E: Event>(
} }
allow allow
} }
} else if target_membership == MembershipState::Invite { }
MembershipState::Invite => {
// If content has third_party_invite key // If content has third_party_invite key
if let Some(Ok(tp_id)) = third_party_invite { if let Some(Ok(tp_id)) = third_party_invite {
if target_user_current_membership == MembershipState::Ban { if target_user_current_membership == MembershipState::Ban {
@ -499,14 +501,16 @@ fn valid_membership_change<E: Event>(
} else { } else {
let allow = sender_power.filter(|&p| p >= &power_levels.invite).is_some(); let allow = sender_power.filter(|&p| p >= &power_levels.invite).is_some();
if !allow { if !allow {
warn!("User does not have enough power to invite\nCurrent user state: {:?}\nPower levels: {:?}", warn!(
"User does not have enough power to invite\nCurrent user state: {:?}\nPower levels: {:?}",
target_user_membership_event_id, target_user_membership_event_id,
power_levels_event_id, power_levels_event_id,
); );
} }
allow allow
} }
} else if target_membership == MembershipState::Leave { }
MembershipState::Leave => {
if sender == target_user { if sender == target_user {
let allow = target_user_current_membership == MembershipState::Join let allow = target_user_current_membership == MembershipState::Join
|| target_user_current_membership == MembershipState::Invite; || target_user_current_membership == MembershipState::Invite;
@ -537,7 +541,8 @@ fn valid_membership_change<E: Event>(
} }
allow allow
} }
} else if target_membership == MembershipState::Ban { }
MembershipState::Ban => {
if !sender_is_joined { if !sender_is_joined {
warn!( warn!(
"Can't ban user if sender is not joined\nSender user state: {:?}", "Can't ban user if sender is not joined\nSender user state: {:?}",
@ -555,9 +560,11 @@ fn valid_membership_change<E: Event>(
} }
allow allow
} }
} else { }
_ => {
warn!("Unknown membership transition"); warn!("Unknown membership transition");
false false
}
}) })
} }