backups/grapevine
1
0
Fork 0
mirror of https://gitlab.computer.surgery/matrix/grapevine.git synced 2025-12-17 07:41:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

use OwnedMxcUri in media service

Browse source 
Not using `MxcData` because it borrows it's fields, and so we wouldn't
be able to return an owned `MxcData` from functions that read the db.
This commit is contained in:
Benjamin Lee 2024-09-14 20:43:56 -07:00
parent e2cba15ed2
commit 7672cc8473
No known key found for this signature in database
GPG key ID: FB9624E2885D55A4
5 changed files with 25 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/api/server_server.rs
View file

@ -2062,7 +2062,7 @@ pub(crate) async fn media_download_route(
content_type,
},
file,
)) = services().media.get(mxc.to_string()).await?
)) = services().media.get(mxc.into()).await?
else {
return Err(Error::BadRequest(
ErrorKind::NotYetUploaded,
@ -2109,7 +2109,7 @@ pub(crate) async fn media_thumbnail_route(
..
},
file,
)) = services().media.get_thumbnail(mxc.to_string(), width, height).await?
)) = services().media.get_thumbnail(mxc.into(), width, height).await?
else {
return Err(Error::BadRequest(
ErrorKind::NotYetUploaded,