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

made error handling more concise

Browse source
This commit is contained in:
Ben Botwin 2026-02-16 13:35:37 -05:00 • committed by Ellis Git
parent 27ff2d9363
commit 19b78ec73e
1 changed files with 12 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/api/client/media.rs
View file

@ -151,26 +151,14 @@ pub(crate) async fn get_content_route(
content_disposition,
} = match fetch_file(&services, &mxc, user, body.timeout_ms, None).await {
| Ok(meta) => meta,
| Err(e) => {
match e {
| conduwuit::Error::Io(e) => {
match e.kind() {
| std::io::ErrorKind::PermissionDenied =>
// to not leak that a file exists
{
return Err!(Request(NotFound("Media not found.")));
},
| std::io::ErrorKind::NotFound => {
return Err!(Request(NotFound("Media not found.")));
},
| _ => {
return Err!(Request(Unknown("Unknown error when fetching file.")));
},
}
},
| _ => return Err!(Request(Unknown("Unknown error when fetching file."))),
| Err(conduwuit::Error::Io(e)) => {
if matches!(e.kind(), std::io::ErrorKind::PermissionDenied | std::io::ErrorKind::NotFound) {
return Err!(Request(NotFound("Media not found.")));
}
return Err!(Request(Unknown("Unknown error when fetching file.")));
},
| Err(_) => return Err!(Request(Unknown("Unknown error when fetching file."))),
};
Ok(get_content::v1::Response {
@ -209,26 +197,14 @@ pub(crate) async fn get_content_as_filename_route(
content_disposition,
} = match fetch_file(&services, &mxc, user, body.timeout_ms, None).await {
| Ok(meta) => meta,
| Err(e) => {
match e {
| conduwuit::Error::Io(e) => {
match e.kind() {
| std::io::ErrorKind::PermissionDenied =>
// to not leak that a file exists
{
return Err!(Request(NotFound("Media not found.")));
},
| std::io::ErrorKind::NotFound => {
return Err!(Request(NotFound("Media not found.")));
},
| _ => {
return Err!(Request(Unknown("Unknown error when fetching file.")));
},
}
},
| _ => return Err!(Request(Unknown("Unknown error when fetching file."))),
| Err(conduwuit::Error::Io(e)) => {
if matches!(e.kind(), std::io::ErrorKind::PermissionDenied | std::io::ErrorKind::NotFound) {
return Err!(Request(NotFound("Media not found.")));
}
return Err!(Request(Unknown("Unknown error when fetching file.")));
},
| Err(_) => return Err!(Request(Unknown("Unknown error when fetching file."))),
};
Ok(get_content_as_filename::v1::Response {