From: Nutomic <me@nutomic.com>
Date: Mon, 14 Mar 2022 20:18:19 +0000 (+0000)
Subject: Revert "Add logging to debug federation issues (ref #2096) (#2099)" (#2130)
X-Git-Url: http://these/git/%7B%60%24%7BwebArchiveUrl%7D/%22%7B%7D/readmes/%22https:/hacktivis.me/%7BpictshareAvatarThumbnail%28mod.avatar%29%7D?a=commitdiff_plain;h=7d61616dff91dd5b7514cdaadd37b293e5410dad;p=lemmy.git

Revert "Add logging to debug federation issues (ref #2096) (#2099)" (#2130)

This reverts commit e094989a4c6baaa637a0ab1c63179706c5a3bc6c.
---

diff --git a/crates/apub/src/activities/community/announce.rs b/crates/apub/src/activities/community/announce.rs
index 3e1e2041..0ece90b7 100644
--- a/crates/apub/src/activities/community/announce.rs
+++ b/crates/apub/src/activities/community/announce.rs
@@ -14,7 +14,6 @@ use lemmy_apub_lib::{
 };
 use lemmy_utils::LemmyError;
 use lemmy_websocket::LemmyContext;
-use tracing::info;
 
 #[async_trait::async_trait(?Send)]
 pub(crate) trait GetCommunity {
@@ -52,14 +51,6 @@ impl AnnounceActivity {
     context: &LemmyContext,
   ) -> Result<(), LemmyError> {
     let announce = AnnounceActivity::new(object.clone(), community, context)?;
-    // temporary hack to get activity id of object
-    let object_fields: ActivityCommonFields =
-      serde_json::from_value(serde_json::to_value(&object)?)?;
-    info!(
-      "Announcing activity {} as {}",
-      object_fields.id, announce.id
-    );
-
     let inboxes = community.get_follower_inboxes(context).await?;
     send_lemmy_activity(
       context,
diff --git a/crates/apub/src/activities/create_or_update/comment.rs b/crates/apub/src/activities/create_or_update/comment.rs
index 451cb867..7d6d8904 100644
--- a/crates/apub/src/activities/create_or_update/comment.rs
+++ b/crates/apub/src/activities/create_or_update/comment.rs
@@ -26,7 +26,6 @@ use lemmy_db_schema::{
 };
 use lemmy_utils::LemmyError;
 use lemmy_websocket::{send::send_comment_ws_message, LemmyContext, UserOperationCrud};
-use tracing::info;
 
 impl CreateOrUpdateComment {
   #[tracing::instrument(skip(comment, actor, kind, context))]
@@ -51,7 +50,6 @@ impl CreateOrUpdateComment {
       kind.clone(),
       &context.settings().get_protocol_and_hostname(),
     )?;
-    info!("Sending Create/Comment for {} as {}", comment.ap_id, id);
     let note = comment.into_apub(context).await?;
 
     let create_or_update = CreateOrUpdateComment {
diff --git a/crates/apub/src/activities/mod.rs b/crates/apub/src/activities/mod.rs
index 4ad4df83..0624b32f 100644
--- a/crates/apub/src/activities/mod.rs
+++ b/crates/apub/src/activities/mod.rs
@@ -6,7 +6,6 @@ use crate::{
   objects::{community::ApubCommunity, person::ApubPerson},
 };
 use activitystreams_kinds::public;
-use itertools::Itertools;
 use lemmy_api_common::blocking;
 use lemmy_apub_lib::{
   activity_queue::send_activity,
@@ -171,6 +170,8 @@ async fn send_lemmy_activity<T: Serialize>(
   }
   let activity = WithContext::new(activity);
 
+  info!("Sending activity {}", activity_id.to_string());
+
   // Don't send anything to ourselves
   // TODO: this should be a debug assert
   let hostname = context.settings().get_hostname_without_port()?;
@@ -179,12 +180,6 @@ async fn send_lemmy_activity<T: Serialize>(
     .filter(|i| i.domain().expect("valid inbox url") != hostname)
     .collect();
 
-  info!(
-    "Sending activity {} to [{}]",
-    activity_id.to_string(),
-    inboxes.iter().join(",")
-  );
-
   let serialised_activity = serde_json::to_string(&activity)?;
 
   let object_value = serde_json::to_value(&activity)?;