do send_activity after http response

LemmyNet · Jul 5, 2023 · edda90c · edda90c
1 parent 1e99e8b
commit edda90c
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 9 deletions.
diff --git a/crates/api/src/lib.rs b/crates/api/src/lib.rs
@@ -17,7 +17,7 @@ mod site;
 
 #[async_trait::async_trait(?Send)]
 pub trait Perform {
-  type Response: serde::ser::Serialize + Send;
+  type Response: serde::ser::Serialize + Send + Clone + Sync;
 
   async fn perform(&self, context: &Data<LemmyContext>) -> Result<Self::Response, LemmyError>;
 }

diff --git a/crates/api_common/src/custom_emoji.rs b/crates/api_common/src/custom_emoji.rs
@@ -43,7 +43,7 @@ pub struct DeleteCustomEmoji {
   pub auth: Sensitive<String>,
 }
 
-#[derive(Serialize, Deserialize)]
+#[derive(Serialize, Deserialize, Clone)]
 #[cfg_attr(feature = "full", derive(TS))]
 #[cfg_attr(feature = "full", ts(export))]
 /// The response for deleting a custom emoji.

diff --git a/crates/api_common/src/site.rs b/crates/api_common/src/site.rs
@@ -395,7 +395,7 @@ pub struct PurgeComment {
   pub auth: Sensitive<String>,
 }
 
-#[derive(Serialize, Deserialize)]
+#[derive(Serialize, Deserialize, Clone)]
 #[cfg_attr(feature = "full", derive(TS))]
 #[cfg_attr(feature = "full", ts(export))]
 /// The response for purged items.

diff --git a/crates/api_crud/src/lib.rs b/crates/api_crud/src/lib.rs
@@ -12,7 +12,7 @@ mod user;
 
 #[async_trait::async_trait(?Send)]
 pub trait PerformCrud {
-  type Response: serde::ser::Serialize + Send;
+  type Response: serde::ser::Serialize + Send + Clone + Sync;
 
   async fn perform(&self, context: &Data<LemmyContext>) -> Result<Self::Response, LemmyError>;
 }
diff --git a/crates/apub/src/lib.rs b/crates/apub/src/lib.rs
@@ -181,7 +181,7 @@ where
 
 #[async_trait::async_trait]
 pub trait SendActivity: Sync {
-  type Response: Sync + Send;
+  type Response: Sync + Send + Clone;
 
   async fn send_activity(
     _request: &Self,

diff --git a/src/api_routes_http.rs b/src/api_routes_http.rs
@@ -382,8 +382,13 @@ where
     + 'static,
 {
   let res = data.perform(&context).await?;
-  SendActivity::send_activity(&data, &res, &apub_data).await?;
-  Ok(HttpResponse::Ok().json(res))
+  let res_clone = res.clone();
+  tokio::spawn(async move {
+    if let Err(e) = SendActivity::send_activity(&data, &res_clone, &apub_data).await {
+      tracing::warn!("could not send_activity crud: {e}");
+    }
+  });
+  Ok(HttpResponse::Ok().json(&res))
 }
 
 async fn route_get<'a, Data>(
@@ -432,8 +437,13 @@ where
     + 'static,
 {
   let res = data.perform(&context).await?;
-  SendActivity::send_activity(&data, &res, &apub_data).await?;
-  Ok(HttpResponse::Ok().json(res))
+  let res_clone = res.clone();
+  tokio::spawn(async move {
+    if let Err(e) = SendActivity::send_activity(&data, &res_clone, &apub_data).await {
+      tracing::warn!("could not send_activity crud: {e}");
+    }
+  });
+  Ok(HttpResponse::Ok().json(&res))
 }
 
 async fn route_get_crud<'a, Data>(