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

Make get_remote_content() return Result instead of ConduitResult

Browse source
This commit is contained in:
Andrej Kacian 2022-01-27 17:00:08 +01:00
parent f7148def90
commit ccfc243c2c
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/client_server/media.rs
View file

@ -79,7 +79,7 @@ pub async fn get_remote_content(
mxc: &str, mxc: &str,
server_name: &ruma::ServerName, server_name: &ruma::ServerName,
media_id: &str media_id: &str
) -> ConduitResult<get_content::Response> { ) -> Result<get_content::Response, Error> {
let content_response = db let content_response = db
.sending .sending
.send_federation_request( .send_federation_request(
@ -103,7 +103,7 @@ pub async fn get_remote_content(
) )
.await?; .await?;
Ok(content_response.into()) Ok(content_response)
} }
/// # `GET /_matrix/media/r0/download/{serverName}/{mediaId}` /// # `GET /_matrix/media/r0/download/{serverName}/{mediaId}`
@ -141,7 +141,7 @@ pub async fn get_content_route(
&body.server_name, &body.server_name,
&body.media_id &body.media_id
).await?; ).await?;
Ok(remote_content_response) Ok(remote_content_response.into())
} else { } else {
Err(Error::BadRequest(ErrorKind::NotFound, "Media not found.")) Err(Error::BadRequest(ErrorKind::NotFound, "Media not found."))
} }
@ -185,8 +185,8 @@ pub async fn get_content_as_filename_route(
Ok(get_content_as_filename::Response { Ok(get_content_as_filename::Response {
content_disposition: Some(format!("inline: filename={}", body.filename)), content_disposition: Some(format!("inline: filename={}", body.filename)),
content_type: remote_content_response.0.content_type, content_type: remote_content_response.content_type,
file: remote_content_response.0.file file: remote_content_response.file
} }
.into()) .into())
} else { } else {