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

Update dependencies

Browse source
This commit is contained in:
Timo 2020-08-25 11:49:51 +02:00 • committed by Timo Kösters
parent aa5e9e607e
commit d1099e9224
No known key found for this signature in database
GPG key ID: 24DA7517711A2BA4
3 changed files with 56 additions and 297 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/client_server/media.rs
View file

@ -36,8 +36,12 @@ pub fn create_content_route(
db.globals.server_name(),
utils::random_string(MXC_LENGTH)
);
db.media
.create(mxc.clone(), &body.filename.as_deref(), &body.content_type, &body.file)?;
db.media.create(
mxc.clone(),
&body.filename.as_deref(),
&body.content_type,
&body.file,
)?;
Ok(create_content::Response { content_uri: mxc }.into())
}
@ -55,19 +59,17 @@ pub async fn get_content_route(
_server_name: String,
_media_id: String,
) -> ConduitResult<get_content::Response> {
let mxc = format!(
"mxc://{}/{}",
db.globals.server_name(),
utils::random_string(MXC_LENGTH)
);
let mxc = format!(
"mxc://{}/{}",
db.globals.server_name(),
utils::random_string(MXC_LENGTH)
);
if let Some(FileMeta {
filename,
content_type,
file,
}) = db
.media
.get(&mxc)?
}) = db.media.get(&mxc)?
{
Ok(get_content::Response {
file,