From 31671da25711ab76f89b3a5c680c2961f22b37b6 Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Thu, 26 Jan 2023 11:26:37 +0100 Subject: [PATCH] events: Simplify membership_change match --- crates/ruma-common/src/events/room/member/change.rs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/crates/ruma-common/src/events/room/member/change.rs b/crates/ruma-common/src/events/room/member/change.rs index 6e1e09cb..b2e2cc49 100644 --- a/crates/ruma-common/src/events/room/member/change.rs +++ b/crates/ruma-common/src/events/room/member/change.rs @@ -116,10 +116,6 @@ pub(super) fn membership_change<'a>( }; 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::Invite, St::Join) => Ch::InvitationAccepted, (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), } } - (St::Join, St::Join) => Ch::None, (St::Join, St::Leave) if sender == state_key => Ch::Left, (St::Join, St::Leave) => Ch::Kicked, (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::Leave) if sender == state_key => Ch::KnockRetracted, (St::Knock, St::Leave) => Ch::KnockDenied, + (a, b) if a == b => Ch::None, _ => Ch::NotImplemented, } }