diff --git a/crates/apub/src/activities/community/announce.rs b/crates/apub/src/activities/community/announce.rs index 2784039bc..cc30a89f3 100644 --- a/crates/apub/src/activities/community/announce.rs +++ b/crates/apub/src/activities/community/announce.rs @@ -1,7 +1,7 @@ use crate::{ activities::{generate_activity_id, send_lemmy_activity, verify_activity, verify_is_public}, activity_lists::AnnouncableActivities, - http::{is_activity_already_known, ActivityCommonFields}, + http::ActivityCommonFields, insert_activity, objects::community::ApubCommunity, protocol::activities::{community::announce::AnnounceActivity, CreateOrUpdateType}, @@ -109,9 +109,6 @@ impl ActivityHandler for AnnounceActivity { let object_value = serde_json::to_value(&self.object)?; let object_data: ActivityCommonFields = serde_json::from_value(object_value.to_owned())?; - if is_activity_already_known(context.pool(), &object_data.id).await? { - return Ok(()); - } insert_activity(&object_data.id, object_value, false, true, context.pool()).await?; } } diff --git a/crates/apub/src/http/mod.rs b/crates/apub/src/http/mod.rs index 18e654d43..03eb9e5bf 100644 --- a/crates/apub/src/http/mod.rs +++ b/crates/apub/src/http/mod.rs @@ -24,7 +24,7 @@ use lemmy_apub_lib::{ traits::{ActivityHandler, ActorType}, APUB_JSON_CONTENT_TYPE, }; -use lemmy_db_schema::{source::activity::Activity, DbPool}; +use lemmy_db_schema::source::activity::Activity; use lemmy_utils::{location_info, LemmyError}; use lemmy_websocket::LemmyContext; use log::info; @@ -97,10 +97,6 @@ where .await?; verify_signature(&request, &actor.public_key())?; - // Do nothing if we received the same activity before - if is_activity_already_known(context.pool(), &activity_data.id).await? { - return Ok(HttpResponse::Ok().finish()); - } info!("Verifying activity {}", activity_data.id.to_string()); activity .verify(&Data::new(context.clone()), request_counter) @@ -178,21 +174,6 @@ pub(crate) async fn get_activity( } } -pub(crate) async fn is_activity_already_known( - pool: &DbPool, - activity_id: &Url, -) -> Result { - let activity_id = activity_id.to_owned().into(); - let existing = blocking(pool, move |conn| { - Activity::read_from_apub_id(conn, &activity_id) - }) - .await?; - match existing { - Ok(_) => Ok(true), - Err(_) => Ok(false), - } -} - fn assert_activity_not_local(id: &Url, hostname: &str) -> Result<(), LemmyError> { let activity_domain = id.domain().context(location_info!())?;