Infra-Mirrors
/
lemmy
mirror of https://github.com/LemmyNet/lemmy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removing pointless backgrounded metadata generation version.

This commit is contained in:
Dessalines 2024-05-13 18:29:10 -04:00
parent 542f9233d5
commit 85be7e956f
2 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
crates/api_common/src/request.rs
View File

@ -19,7 +19,6 @@ use lemmy_db_schema::{
use lemmy_utils::{
error::{LemmyError, LemmyErrorType, LemmyResult},
settings::structs::{PictrsImageMode, Settings},
spawn_try_task,
REQWEST_TIMEOUT,
VERSION,
};
@ -140,19 +139,6 @@ pub async fn generate_post_link_metadata(
Ok(())
}
/// Generates a post thumbnail in background task, because some sites can be very slow to respond.
pub fn generate_post_link_metadata_background(
post: Post,
custom_thumbnail: Option<Url>,
send_activity: impl FnOnce(Post) -> Option<SendActivityData> + Send + 'static,
local_site: Option<LocalSite>,
context: Data<LemmyContext>,
) {
spawn_try_task(async move {
generate_post_link_metadata(post, custom_thumbnail, send_activity, local_site, context).await
})
}
/// Extract site metadata from HTML Opengraph attributes.
fn extract_opengraph_data(html_bytes: &[u8], url: &Url) -> LemmyResult<OpenGraphData> {
let html = String::from_utf8_lossy(html_bytes);

16
crates/apub/src/objects/post.rs
View File

@ -24,7 +24,7 @@ use chrono::{DateTime, Utc};
use html2text::{from_read_with_decorator, render::text_renderer::TrivialDecorator};
use lemmy_api_common::{
context::LemmyContext,
request::generate_post_link_metadata_background,
request::generate_post_link_metadata,
utils::{get_url_blocklist, local_site_opt_to_slur_regex, process_markdown_opt},
};
use lemmy_db_schema::{
@ -41,6 +41,7 @@ use lemmy_db_schema::{
use lemmy_db_views_actor::structs::CommunityModeratorView;
use lemmy_utils::{
error::{LemmyError, LemmyErrorType, LemmyResult},
spawn_try_task,
utils::{markdown::markdown_to_html, slurs::check_slurs_opt, validation::check_url_scheme},
};
use std::ops::Deref;
@ -270,14 +271,13 @@ impl Object for ApubPost {
let timestamp = page.updated.or(page.published).unwrap_or_else(naive_now);
let post = Post::insert_apub(&mut context.pool(), timestamp, &form).await?;
let post_ = post.clone();
let context_ = context.reset_request_count();
generate_post_link_metadata_background(
post.clone(),
None,
|_| None,
local_site,
context.reset_request_count(),
);
// Generates a post thumbnail in background task, because some sites can be very slow to respond.
spawn_try_task(async move {
generate_post_link_metadata(post_, None, |_| None, local_site, context_).await
});
// write mod log entry for lock
if Page::is_locked_changed(&old_post, &page.comments_enabled) {