nero/tsuki
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

Style fixes from 'cargo fmt'

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

22
src/client_server/media.rs
View file

@ -78,7 +78,7 @@ pub async fn get_remote_content(
db: &DatabaseGuard, db: &DatabaseGuard,
mxc: &str, mxc: &str,
server_name: &ruma::ServerName, server_name: &ruma::ServerName,
media_id: &str media_id: &str,
) -> Result<get_content::Response, Error> { ) -> Result<get_content::Response, Error> {
let content_response = db let content_response = db
.sending .sending
@ -88,7 +88,7 @@ pub async fn get_remote_content(
get_content::Request { get_content::Request {
allow_remote: false, allow_remote: false,
server_name, server_name,
media_id media_id,
}, },
) )
.await?; .await?;
@ -135,12 +135,8 @@ pub async fn get_content_route(
} }
.into()) .into())
} else if &*body.server_name != db.globals.server_name() && body.allow_remote { } else if &*body.server_name != db.globals.server_name() && body.allow_remote {
let remote_content_response = get_remote_content( let remote_content_response =
&db, get_remote_content(&db, &mxc, &body.server_name, &body.media_id).await?;
&mxc,
&body.server_name,
&body.media_id
).await?;
Ok(remote_content_response.into()) Ok(remote_content_response.into())
} else { } else {
Err(Error::BadRequest(ErrorKind::NotFound, "Media not found.")) Err(Error::BadRequest(ErrorKind::NotFound, "Media not found."))
@ -176,17 +172,13 @@ pub async fn get_content_as_filename_route(
} }
.into()) .into())
} else if &*body.server_name != db.globals.server_name() && body.allow_remote { } else if &*body.server_name != db.globals.server_name() && body.allow_remote {
let remote_content_response = get_remote_content( let remote_content_response =
&db, get_remote_content(&db, &mxc, &body.server_name, &body.media_id).await?;
&mxc,
&body.server_name,
&body.media_id
).await?;
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.content_type, content_type: remote_content_response.content_type,
file: remote_content_response.file file: remote_content_response.file,
} }
.into()) .into())
} else { } else {