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

fix: Call user_may_join_room later in the join process

Browse source
This commit is contained in:
timedout 2026-01-05 03:56:34 +00:00 • committed by Jade Ellis
parent 5ac82f36f3
commit 99f16c2dfc
No known key found for this signature in database
GPG key ID: 8705A2A3EBF77BD2
1 changed files with 17 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/api/client/membership/join.rs
View file

@ -79,26 +79,6 @@ pub(crate) async fn join_room_by_id_route(
)
.await?;
if let Err(e) = services
.antispam
.user_may_join_room(
sender_user.to_owned(),
body.room_id.clone(),
services
.rooms
.state_cache
.is_invited(sender_user, &body.room_id)
.await,
)
.await
{
warn!(
"Antispam prevented user {} from joining room {}: {}",
sender_user, body.room_id, e
);
return Err!(Request(Forbidden("You are not allowed to join this room.")));
}
// There is no body.server_name for /roomId/join
let mut servers: Vec<_> = services
.rooms
@ -308,6 +288,23 @@ pub async fn join_room_by_id_helper(
return Ok(join_room_by_id::v3::Response { room_id: room_id.into() });
}
if let Err(e) = services
.antispam
.user_may_join_room(
sender_user.to_owned(),
room_id.to_owned(),
services
.rooms
.state_cache
.is_invited(sender_user, room_id)
.await,
)
.await
{
warn!("Antispam prevented user {} from joining room {}: {}", sender_user, room_id, e);
return Err!(Request(Forbidden("You are not allowed to join this room.")));
}
let server_in_room = services
.rooms
.state_cache