cotugno/conduit
2
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2024-11-17 10:48:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

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