From a60a9551e1bbbf99888a80ae1a4fc32b0afdabd0 Mon Sep 17 00:00:00 2001
From: Charles Hall <charles@computer.surgery>
Date: Mon, 20 May 2024 21:37:39 -0700
Subject: [PATCH] Revert "Merge branch 'check-if-membership-is-case-endpoints'
 into 'next'"

This reverts commit 7ace9b0dff12caa1a69722b77aa39ab3e57f7903, reversing
changes made to 624654a88b593d231029d7a209dfabd9ccc39bcb.
---
 src/api/client_server/membership.rs | 30 -----------------------------
 1 file changed, 30 deletions(-)

diff --git a/src/api/client_server/membership.rs b/src/api/client_server/membership.rs
index 1586a4dd..d50b99a7 100644
--- a/src/api/client_server/membership.rs
+++ b/src/api/client_server/membership.rs
@@ -202,12 +202,6 @@ pub(crate) async fn kick_user_route(
 ) -> Result<Ra<kick_user::v3::Response>> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
-    if let Ok(true) =
-        services().rooms.state_cache.is_left(sender_user, &body.room_id)
-    {
-        return Ok(Ra(kick_user::v3::Response {}));
-    }
-
     let mut event: RoomMemberEventContent = serde_json::from_str(
         services()
             .rooms
@@ -271,14 +265,6 @@ pub(crate) async fn ban_user_route(
 ) -> Result<Ra<ban_user::v3::Response>> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
-    if let Ok(Some(membership_event)) =
-        services().rooms.state_accessor.get_member(&body.room_id, sender_user)
-    {
-        if membership_event.membership == MembershipState::Ban {
-            return Ok(Ra(ban_user::v3::Response {}));
-        }
-    }
-
     let event = services()
         .rooms
         .state_accessor
@@ -355,14 +341,6 @@ pub(crate) async fn unban_user_route(
 ) -> Result<Ra<unban_user::v3::Response>> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
-    if let Ok(Some(membership_event)) =
-        services().rooms.state_accessor.get_member(&body.room_id, sender_user)
-    {
-        if membership_event.membership != MembershipState::Ban {
-            return Ok(Ra(unban_user::v3::Response {}));
-        }
-    }
-
     let mut event: RoomMemberEventContent = serde_json::from_str(
         services()
             .rooms
@@ -546,14 +524,6 @@ async fn join_room_by_id_helper(
 ) -> Result<join_room_by_id::v3::Response> {
     let sender_user = sender_user.expect("user is authenticated");
 
-    if let Ok(true) =
-        services().rooms.state_cache.is_joined(sender_user, room_id)
-    {
-        return Ok(join_room_by_id::v3::Response {
-            room_id: room_id.into(),
-        });
-    }
-
     let mutex_state = Arc::clone(
         services()
             .globals