From 2d086e81df2b95c5f594295617ed60e2d8a340c5 Mon Sep 17 00:00:00 2001 From: phiresky Date: Sun, 23 Jul 2023 22:16:58 +0000 Subject: [PATCH] dead instance detection not needed here --- crates/apub/src/activities/mod.rs | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/crates/apub/src/activities/mod.rs b/crates/apub/src/activities/mod.rs index 0c9a9313b..2208ba6df 100644 --- a/crates/apub/src/activities/mod.rs +++ b/crates/apub/src/activities/mod.rs @@ -20,9 +20,7 @@ use lemmy_db_schema::{ source::{ activity::{ActivitySendTargets, ActorType, SentActivity, SentActivityForm}, community::Community, - instance::Instance, }, - traits::Crud, }; use lemmy_db_views_actor::structs::{CommunityPersonBanView, CommunityView}; use lemmy_utils::{ @@ -30,10 +28,8 @@ use lemmy_utils::{ spawn_try_task, SYNCHRONOUS_FEDERATION, }; -use moka::future::Cache; -use once_cell::sync::Lazy; use serde::Serialize; -use std::{ops::Deref, sync::Arc, time::Duration}; +use std::{ops::Deref, time::Duration}; use tracing::info; use url::{ParseError, Url}; use uuid::Uuid; @@ -172,7 +168,7 @@ async fn send_lemmy_activity( data: &Data, activity: Activity, actor: &ActorT, - mut send_targets: ActivitySendTargets, + send_targets: ActivitySendTargets, sensitive: bool, ) -> Result<(), LemmyError> where @@ -180,22 +176,6 @@ where ActorT: Actor + GetActorType, Activity: ActivityHandler, { - static CACHE: Lazy>>> = Lazy::new(|| { - Cache::builder() - .max_capacity(1) - .time_to_live(DEAD_INSTANCE_LIST_CACHE_DURATION) - .build() - }); - let dead_instances = CACHE - .try_get_with((), async { - Ok::<_, diesel::result::Error>(Arc::new(Instance::dead_instances(&mut data.pool()).await?)) - }) - .await?; - - send_targets.inboxes.retain(|i| { - let domain = i.domain().expect("has domain").to_string(); - !dead_instances.contains(&domain) - }); info!("Sending activity {}", activity.id().to_string()); let activity = WithContext::new(activity, CONTEXT.deref().clone());