backups/grapevine
1
0
Fork 0
mirror of https://gitlab.computer.surgery/matrix/grapevine.git synced 2025-12-17 07:41:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Merge branch 'check-if-membership-is-case-endpoints' into 'next'"

Browse source 
This reverts commit 7ace9b0dff, reversing
changes made to 624654a88b.
This commit is contained in:
Charles Hall 2024-05-20 21:37:39 -07:00
parent 49660b9e39
commit a60a9551e1
No known key found for this signature in database
GPG key ID: 7B8E0645816E07CF
1 changed files with 0 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/api/client_server/membership.rs
View file

@ -202,12 +202,6 @@ pub(crate) async fn kick_user_route(
) -> Result<Ra<kick_user::v3::Response>> { ) -> Result<Ra<kick_user::v3::Response>> {
let sender_user = body.sender_user.as_ref().expect("user is authenticated"); 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( let mut event: RoomMemberEventContent = serde_json::from_str(
services() services()
.rooms .rooms
@ -271,14 +265,6 @@ pub(crate) async fn ban_user_route(
) -> Result<Ra<ban_user::v3::Response>> { ) -> Result<Ra<ban_user::v3::Response>> {
let sender_user = body.sender_user.as_ref().expect("user is authenticated"); 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() let event = services()
.rooms .rooms
.state_accessor .state_accessor
@ -355,14 +341,6 @@ pub(crate) async fn unban_user_route(
) -> Result<Ra<unban_user::v3::Response>> { ) -> Result<Ra<unban_user::v3::Response>> {
let sender_user = body.sender_user.as_ref().expect("user is authenticated"); 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( let mut event: RoomMemberEventContent = serde_json::from_str(
services() services()
.rooms .rooms
@ -546,14 +524,6 @@ async fn join_room_by_id_helper(
) -> Result<join_room_by_id::v3::Response> { ) -> Result<join_room_by_id::v3::Response> {
let sender_user = sender_user.expect("user is authenticated"); 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( let mutex_state = Arc::clone(
services() services()
.globals .globals