Implement federated user following (fixes #752) (#2577)

[lemmy.git] / crates / apub / src / activities / create_or_update / post.rs

diff --git a/crates/apub/src/activities/create_or_update/post.rs b/crates/apub/src/activities/create_or_update/post.rs
index a0d8ce6f44c48ed793ada69cac95c44080500c01..bff289d99f033e540aeb901962fd46a12a18bae6 100644 (file)
--- a/crates/apub/src/activities/create_or_update/post.rs
+++ b/crates/apub/src/activities/create_or_update/post.rs
@@ -19,7 +19,6 @@ use activitypub_federation::{
   utils::{verify_domains_match, verify_urls_match},
 };
 use activitystreams_kinds::public;
-use lemmy_api_common::utils::blocking;
 use lemmy_db_schema::{
   source::{
     community::Community,
@@ -50,7 +49,6 @@ impl CreateOrUpdatePost {
       cc: vec![community.actor_id()],
       kind,
       id: id.clone(),
-      unparsed: Default::default(),
     })
   }
 
@@ -62,16 +60,13 @@ impl CreateOrUpdatePost {
     context: &LemmyContext,
   ) -> Result<(), LemmyError> {
     let community_id = post.community_id;
-    let community: ApubCommunity = blocking(context.pool(), move |conn| {
-      Community::read(conn, community_id)
-    })
-    .await??
-    .into();
+    let community: ApubCommunity = Community::read(context.pool(), community_id).await?.into();
 
     let create_or_update = CreateOrUpdatePost::new(post, actor, &community, kind, context).await?;
-    let id = create_or_update.id.clone();
-    let activity = AnnouncableActivities::CreateOrUpdatePost(Box::new(create_or_update));
-    send_activity_in_community(activity, &id, actor, &community, vec![], context).await
+    let is_mod_action = create_or_update.object.is_mod_action(context).await?;
+    let activity = AnnouncableActivities::CreateOrUpdatePost(create_or_update);
+    send_activity_in_community(activity, actor, &community, vec![], is_mod_action, context).await?;
+    Ok(())
   }
 }
 
@@ -121,7 +116,7 @@ impl ActivityHandler for CreateOrUpdatePost {
           verify_mod_action(
             &self.actor,
             self.object.id.inner(),
-            &community,
+            community.id,
             context,
             request_counter,
           )
@@ -150,10 +145,7 @@ impl ActivityHandler for CreateOrUpdatePost {
       person_id: post.creator_id,
       score: 1,
     };
-    blocking(context.pool(), move |conn: &'_ _| {
-      PostLike::like(conn, &like_form)
-    })
-    .await??;
+    PostLike::like(context.pool(), &like_form).await?;
 
     let notif_type = match self.kind {
       CreateOrUpdateType::Create => UserOperationCrud::CreatePost,