TudbuT/conduit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix room ID messages, remove comments

Browse source 
Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
strawberry 2024-01-24 21:09:07 -05:00 • committed by June
parent 08a183e8c7
commit 0e8267656f
3 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/api/client_server/room.rs
View file

@ -76,8 +76,7 @@ pub async fn create_room_route(
if custom_room_id_s.contains(':') {
return Err(Error::BadRequest(
ErrorKind::InvalidParam,
"Custom room ID contained `:` which is not allowed.
Please note that this expects a localpart, not the full room ID.",
"Custom room ID contained `:` which is not allowed. Please note that this expects a localpart, not the full room ID.",
));
} else if custom_room_id_s.contains(char::is_whitespace) {
return Err(Error::BadRequest(
@ -144,8 +143,7 @@ pub async fn create_room_route(
if localpart.contains(':') {
return Err(Error::BadRequest(
ErrorKind::InvalidParam,
"Room alias contained `:` which is not allowed.
Please note that this expects a localpart, not the full room alias.",
"Room alias contained `:` which is not allowed. Please note that this expects a localpart, not the full room alias.",
));
} else if localpart.contains(char::is_whitespace) {
return Err(Error::BadRequest(

2
src/api/server_server.rs
View file

@ -132,8 +132,6 @@ where
));
}
// rust's built in <Ipv4Addr> parsing does not consider things like octal addresses valid
// so we should check both just to be safe.
if destination.is_ip_literal() || IPAddress::is_valid(destination.host()) {
info!(
"Destination {} is an IP literal, checking against IP range denylist.",

2
src/service/sending/mod.rs
View file

@ -717,8 +717,6 @@ impl Service {
where
T: Debug,
{
// rust's built in <Ipv4Addr> parsing does not consider things like octal addresses valid
// so we should check both just to be safe.
if destination.is_ip_literal() || IPAddress::is_valid(destination.host()) {
info!(
"Destination {} is an IP literal, checking against IP range denylist.",