oss/conduit
oss/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2025-10-15 19:42:07 +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

16
src/service/media/mod.rs
View file

@ -2,7 +2,10 @@ mod data;
use std::io::Cursor;
pub use data::Data;
use ruma::http_headers::{ContentDisposition, ContentDispositionType};
use ruma::{
api::client::error::ErrorKind,
http_headers::{ContentDisposition, ContentDispositionType},
};
use crate::{services, Result};
use image::imageops::FilterType;
@ -219,12 +222,11 @@ impl Service {
file: thumbnail_bytes.to_vec(),
}))
} else {
// Couldn't parse file to generate thumbnail, send original
Ok(Some(FileMeta {
content_disposition,
content_type,
file: file.to_vec(),
}))
// Couldn't parse file to generate thumbnail, likely not an image
return Err(crate::Error::BadRequest(
ErrorKind::Unknown,
"Unable to generate thumbnail for the requested content (likely is not an image)",
));
}
} else {
Ok(None)