magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix /kick endpoint unbanning banned users

Browse source 
Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
strawberry 2025-01-11 00:24:51 -05:00
parent 8c18481d1d
commit 9bda5a43e5
1 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/api/client/membership.rs
View file

@ -439,6 +439,16 @@ pub(crate) async fn kick_user_route(
return Ok(kick_user::v3::Response::new()); return Ok(kick_user::v3::Response::new());
}; };
if !matches!(
event.membership,
MembershipState::Invite | MembershipState::Knock | MembershipState::Join,
) {
return Err!(Request(Forbidden(
"Cannot kick a user who is not apart of the room (current membership: {})",
event.membership
)));
}
services services
.rooms .rooms
.timeline .timeline
@ -527,7 +537,7 @@ pub(crate) async fn unban_user_route(
if current_member_content.membership != MembershipState::Ban { if current_member_content.membership != MembershipState::Ban {
return Err!(Request(Forbidden( return Err!(Request(Forbidden(
"Cannot ban a user who is not banned (current membership: {})", "Cannot unban a user who is not banned (current membership: {})",
current_member_content.membership current_member_content.membership
))); )));
} }