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

events: Simplify membership_change match

Browse Source
This commit is contained in:
Jonas Platte 2023-01-26 11:26:37 +01:00
parent bf4520a2a9
commit 31671da257
No known key found for this signature in database
GPG Key ID: AAA7A61F696C3E0C
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/ruma-common/src/events/room/member/change.rs
View File

@ -116,10 +116,6 @@ pub(super) fn membership_change<'a>(
}; };
match (&prev_details.membership, &details.membership) { match (&prev_details.membership, &details.membership) {
(St::Invite, St::Invite)
| (St::Leave, St::Leave)
| (St::Ban, St::Ban)
| (St::Knock, St::Knock) => Ch::None,
(St::Leave, St::Join) => Ch::Joined, (St::Leave, St::Join) => Ch::Joined,
(St::Invite, St::Join) => Ch::InvitationAccepted, (St::Invite, St::Join) => Ch::InvitationAccepted,
(St::Invite, St::Leave) if sender == state_key => Ch::InvitationRejected, (St::Invite, St::Leave) if sender == state_key => Ch::InvitationRejected,
@ -141,7 +137,6 @@ pub(super) fn membership_change<'a>(
avatar_url_change: Change::new(prev_details.avatar_url, details.avatar_url), avatar_url_change: Change::new(prev_details.avatar_url, details.avatar_url),
} }
} }
(St::Join, St::Join) => Ch::None,
(St::Join, St::Leave) if sender == state_key => Ch::Left, (St::Join, St::Leave) if sender == state_key => Ch::Left,
(St::Join, St::Leave) => Ch::Kicked, (St::Join, St::Leave) => Ch::Kicked,
(St::Join, St::Ban) => Ch::KickedAndBanned, (St::Join, St::Ban) => Ch::KickedAndBanned,
@ -151,6 +146,7 @@ pub(super) fn membership_change<'a>(
(St::Knock, St::Invite) => Ch::KnockAccepted, (St::Knock, St::Invite) => Ch::KnockAccepted,
(St::Knock, St::Leave) if sender == state_key => Ch::KnockRetracted, (St::Knock, St::Leave) if sender == state_key => Ch::KnockRetracted,
(St::Knock, St::Leave) => Ch::KnockDenied, (St::Knock, St::Leave) => Ch::KnockDenied,
(a, b) if a == b => Ch::None,
_ => Ch::NotImplemented, _ => Ch::NotImplemented,
} }
} }