oss/conduit
oss/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2025-08-01 17:38:36 +00:00
Code Wiki Activity

Merge branch 'error-parse-image-thumbnail' into 'next'

Browse source 
fix(media): return an error when content is failed to be parsed as an image

See merge request famedly/conduit!734
This commit is contained in:
Matthias Ahouansou 2025-02-04 16:37:26 +00:00
commit e20dd1469a
2 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/api/client_server/media.rs
View file

@ -348,9 +348,9 @@ async fn get_content_thumbnail(
) -> Result<get_content_thumbnail::v1::Response, Error> {
let mxc = format!("mxc://{}/{}", server_name, media_id);
if let Ok(Some(FileMeta {
if let Some(FileMeta {
file, content_type, ..
})) = services()
}) = services()
.media
.get_thumbnail(
mxc.clone(),
@ -361,7 +361,7 @@ async fn get_content_thumbnail(
.try_into()
.map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Height is invalid."))?,
)
.await
.await?
{
Ok(get_content_thumbnail::v1::Response { file, content_type })
} else if server_name != services().globals.server_name() && allow_remote {