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

Create media::FileMeta to represent a file and meta data

Browse source
This commit is contained in:
Devin Ragotzy 2020-07-28 08:59:30 -04:00 • committed by timokoesters
parent 2da48b941d
commit 1c6f211933
No known key found for this signature in database
GPG key ID: 24DA7517711A2BA4
4 changed files with 33 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/client_server.rs
View file

@ -4,7 +4,9 @@ use std::{
time::{Duration, SystemTime},
};
use crate::{utils, ConduitResult, Database, Error, Ruma};
use crate::{
database::media::FileMeta, pdu::PduBuilder, utils, ConduitResult, Database, Error, Ruma,
};
use keys::{upload_signatures, upload_signing_keys};
use log::warn;
@ -3273,7 +3275,11 @@ pub fn get_content_route(
_server_name: String,
_media_id: String,
) -> ConduitResult<get_content::Response> {
if let Some((filename, content_type, file)) = db
if let Some(FileMeta {
filename,
content_type,
file,
}) = db
.media
.get(format!("mxc://{}/{}", body.server_name, body.media_id))?
{
@ -3301,7 +3307,9 @@ pub fn get_content_thumbnail_route(
_server_name: String,
_media_id: String,
) -> ConduitResult<get_content_thumbnail::Response> {
if let Some((_, content_type, file)) = db.media.get_thumbnail(
if let Some(FileMeta {
content_type, file, ..
}) = db.media.get_thumbnail(
format!("mxc://{}/{}", body.server_name, body.media_id),
body.width
.try_into()