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

fix: send right errors on make/send join in restricted rooms

Browse source
This commit is contained in:
Timo Kösters 2022-10-11 11:53:13 +02:00
parent 2b7c19835b
commit c30cc6120b
No known key found for this signature in database
GPG key ID: 24DA7517711A2BA4
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/api/server_server.rs
View file

@ -1283,10 +1283,10 @@ pub async fn create_join_event_template_route(
if let Some(join_rules_event_content) = join_rules_event_content { if let Some(join_rules_event_content) = join_rules_event_content {
if matches!( if matches!(
join_rules_event_content.join_rule, join_rules_event_content.join_rule,
JoinRule::Restricted { .. } JoinRule::Restricted { .. } | JoinRule::KnockRestricted { .. }
) { ) {
return Err(Error::BadRequest( return Err(Error::BadRequest(
ErrorKind::Unknown, ErrorKind::UnableToAuthorizeJoin,
"Conduit does not support restricted rooms yet.", "Conduit does not support restricted rooms yet.",
)); ));
} }
@ -1376,10 +1376,10 @@ async fn create_join_event(
if let Some(join_rules_event_content) = join_rules_event_content { if let Some(join_rules_event_content) = join_rules_event_content {
if matches!( if matches!(
join_rules_event_content.join_rule, join_rules_event_content.join_rule,
JoinRule::Restricted { .. } JoinRule::Restricted { .. } | JoinRule::KnockRestricted { .. }
) { ) {
return Err(Error::BadRequest( return Err(Error::BadRequest(
ErrorKind::Unknown, ErrorKind::UnableToAuthorizeJoin,
"Conduit does not support restricted rooms yet.", "Conduit does not support restricted rooms yet.",
)); ));
} }