Mirrors/continuwuity
1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity.git synced 2026-05-26 20:49:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

made error handling more concise

Browse Source
This commit is contained in:
Ben Botwin
2026-02-23 15:22:18 +00:00
committed by Ellis Git
parent 27ff2d9363
commit 19b78ec73e
1 changed files with 12 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/client/media.rs
+12 -36
View File
@@ -151,26 +151,14 @@ pub(crate) async fn get_content_route(
content_disposition, content_disposition,
} = match fetch_file(&services, &mxc, user, body.timeout_ms, None).await { } = match fetch_file(&services, &mxc, user, body.timeout_ms, None).await {
| Ok(meta) => meta, | Ok(meta) => meta,
| Err(e) => { | Err(conduwuit::Error::Io(e)) => {
match e { if matches!(e.kind(), std::io::ErrorKind::PermissionDenied | std::io::ErrorKind::NotFound) {
| conduwuit::Error::Io(e) => { return Err!(Request(NotFound("Media not found.")));
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."))),
} }
return Err!(Request(Unknown("Unknown error when fetching file.")));
}, },
| Err(_) => return Err!(Request(Unknown("Unknown error when fetching file."))),
}; };
Ok(get_content::v1::Response { Ok(get_content::v1::Response {
@@ -209,26 +197,14 @@ pub(crate) async fn get_content_as_filename_route(
content_disposition, content_disposition,
} = match fetch_file(&services, &mxc, user, body.timeout_ms, None).await { } = match fetch_file(&services, &mxc, user, body.timeout_ms, None).await {
| Ok(meta) => meta, | Ok(meta) => meta,
| Err(e) => { | Err(conduwuit::Error::Io(e)) => {
match e { if matches!(e.kind(), std::io::ErrorKind::PermissionDenied | std::io::ErrorKind::NotFound) {
| conduwuit::Error::Io(e) => { return Err!(Request(NotFound("Media not found.")));
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."))),
} }
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 { Ok(get_content_as_filename::v1::Response {