diff --git a/src/api/client/media.rs b/src/api/client/media.rs index f30a7966..0d610011 100644 --- a/src/api/client/media.rs +++ b/src/api/client/media.rs @@ -149,7 +149,8 @@ pub(crate) async fn get_content_route( content, content_type, content_disposition, - }) = fetch_file(&services, &mxc, user, body.timeout_ms, None).await else { + }) = fetch_file(&services, &mxc, user, body.timeout_ms, None).await + else { return Err!(Request(NotFound("Media not found."))); }; @@ -188,22 +189,27 @@ pub(crate) async fn get_content_as_filename_route( content_type, content_disposition, } = match fetch_file(&services, &mxc, user, body.timeout_ms, None).await { - Ok(meta) => meta, - Err(e) => { + | Ok(meta) => meta, + | Err(e) => { match e { - conduwuit::Error::Io(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."))), + | 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."))), } - } + }, }; Ok(get_content_as_filename::v1::Response {