LemmyNet/lemmy
2
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2025-01-27 12:26:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

dead instance detection not needed here

Browse source
This commit is contained in:
phiresky 2023-07-23 22:16:58 +00:00
parent 0d6042ec11
commit 2d086e81df
1 changed files with 2 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
crates/apub/src/activities/mod.rs
View file

@ -20,9 +20,7 @@ use lemmy_db_schema::{
source::{ source::{
activity::{ActivitySendTargets, ActorType, SentActivity, SentActivityForm}, activity::{ActivitySendTargets, ActorType, SentActivity, SentActivityForm},
community::Community, community::Community,
instance::Instance,
}, },
traits::Crud,
}; };
use lemmy_db_views_actor::structs::{CommunityPersonBanView, CommunityView}; use lemmy_db_views_actor::structs::{CommunityPersonBanView, CommunityView};
use lemmy_utils::{ use lemmy_utils::{
@ -30,10 +28,8 @@ use lemmy_utils::{
spawn_try_task, spawn_try_task,
SYNCHRONOUS_FEDERATION, SYNCHRONOUS_FEDERATION,
}; };
use moka::future::Cache;
use once_cell::sync::Lazy;
use serde::Serialize; use serde::Serialize;
use std::{ops::Deref, sync::Arc, time::Duration}; use std::{ops::Deref, time::Duration};
use tracing::info; use tracing::info;
use url::{ParseError, Url}; use url::{ParseError, Url};
use uuid::Uuid; use uuid::Uuid;
@ -172,7 +168,7 @@ async fn send_lemmy_activity<Activity, ActorT>(
data: &Data<LemmyContext>, data: &Data<LemmyContext>,
activity: Activity, activity: Activity,
actor: &ActorT, actor: &ActorT,
mut send_targets: ActivitySendTargets, send_targets: ActivitySendTargets,
sensitive: bool, sensitive: bool,
) -> Result<(), LemmyError> ) -> Result<(), LemmyError>
where where
@ -180,22 +176,6 @@ where
ActorT: Actor + GetActorType, ActorT: Actor + GetActorType,
Activity: ActivityHandler<Error = LemmyError>, Activity: ActivityHandler<Error = LemmyError>,
{ {
static CACHE: Lazy<Cache<(), Arc<Vec<String>>>> = 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()); info!("Sending activity {}", activity.id().to_string());
let activity = WithContext::new(activity, CONTEXT.deref().clone()); let activity = WithContext::new(activity, CONTEXT.deref().clone());