|
|
|
@ -59,14 +59,8 @@ pub async fn fetch_link_metadata(
|
|
|
|
|
let opengraph_data = extract_opengraph_data(&html_bytes, url)
|
|
|
|
|
.map_err(|e| info!("{e}"))
|
|
|
|
|
.unwrap_or_default();
|
|
|
|
|
let thumbnail = extract_thumbnail_from_opengraph_data(
|
|
|
|
|
url,
|
|
|
|
|
&opengraph_data,
|
|
|
|
|
&content_type,
|
|
|
|
|
generate_thumbnail,
|
|
|
|
|
context,
|
|
|
|
|
)
|
|
|
|
|
.await;
|
|
|
|
|
let thumbnail =
|
|
|
|
|
extract_thumbnail_from_opengraph_data(url, &opengraph_data, generate_thumbnail, context).await;
|
|
|
|
|
|
|
|
|
|
Ok(LinkMetadata {
|
|
|
|
|
opengraph_data,
|
|
|
|
@ -158,23 +152,21 @@ fn extract_opengraph_data(html_bytes: &[u8], url: &Url) -> Result<OpenGraphData,
|
|
|
|
|
pub async fn extract_thumbnail_from_opengraph_data(
|
|
|
|
|
url: &Url,
|
|
|
|
|
opengraph_data: &OpenGraphData,
|
|
|
|
|
content_type: &Option<Mime>,
|
|
|
|
|
generate_thumbnail: bool,
|
|
|
|
|
context: &LemmyContext,
|
|
|
|
|
) -> Option<DbUrl> {
|
|
|
|
|
let is_image = content_type.as_ref().unwrap_or(&mime::TEXT_PLAIN).type_() == mime::IMAGE;
|
|
|
|
|
if generate_thumbnail && is_image {
|
|
|
|
|
if generate_thumbnail {
|
|
|
|
|
let image_url = opengraph_data
|
|
|
|
|
.image
|
|
|
|
|
.as_ref()
|
|
|
|
|
.map(lemmy_db_schema::newtypes::DbUrl::inner)
|
|
|
|
|
.map(DbUrl::inner)
|
|
|
|
|
.unwrap_or(url);
|
|
|
|
|
generate_pictrs_thumbnail(image_url, context)
|
|
|
|
|
.await
|
|
|
|
|
.ok()
|
|
|
|
|
.map(Into::into)
|
|
|
|
|
} else {
|
|
|
|
|
None
|
|
|
|
|
opengraph_data.image.clone()
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -363,7 +355,7 @@ mod tests {
|
|
|
|
|
Some(mime::TEXT_HTML_UTF_8.to_string()),
|
|
|
|
|
sample_res.content_type
|
|
|
|
|
);
|
|
|
|
|
assert_eq!(None, sample_res.thumbnail);
|
|
|
|
|
assert!(sample_res.thumbnail.is_some());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// #[test]
|
|
|
|
|