Implement separate mod activities for feature, lock post (#2716)

[lemmy.git] / crates / apub / src / protocol / objects / note.rs

diff --git a/crates/apub/src/protocol/objects/note.rs b/crates/apub/src/protocol/objects/note.rs
index 21f7bcf38b67ffc30c12d7c7001afe3cc1d5f82a..f93a41ef884a8ed5edb54bd1a90be9375afb1504 100644 (file)
--- a/crates/apub/src/protocol/objects/note.rs
+++ b/crates/apub/src/protocol/objects/note.rs
@@ -15,12 +15,12 @@ use activitypub_federation::{
 };
 use activitystreams_kinds::object::NoteType;
 use chrono::{DateTime, FixedOffset};
+use lemmy_api_common::context::LemmyContext;
 use lemmy_db_schema::{
   source::{community::Community, post::Post},
   traits::Crud,
 };
 use lemmy_utils::error::LemmyError;
-use lemmy_websocket::LemmyContext;
 use serde::{Deserialize, Serialize};
 use serde_with::skip_serializing_none;
 use std::ops::Deref;
@@ -67,15 +67,11 @@ impl Note {
         .await?,
     );
     match parent.deref() {
-      PostOrComment::Post(p) => {
-        let post = p.deref().clone();
-        Ok((post, None))
-      }
+      PostOrComment::Post(p) => Ok((p.clone(), None)),
       PostOrComment::Comment(c) => {
         let post_id = c.post_id;
         let post = Post::read(context.pool(), post_id).await?;
-        let comment = c.deref().clone();
-        Ok((post.into(), Some(comment)))
+        Ok((post.into(), Some(c.clone())))
       }
     }
   }
@@ -89,15 +85,10 @@ impl InCommunity for Note {
     request_counter: &mut i32,
   ) -> Result<ApubCommunity, LemmyError> {
     let (post, _) = self.get_parents(context, request_counter).await?;
-    let community_id = post.community_id;
+    let community = Community::read(context.pool(), post.community_id).await?;
     if let Some(audience) = &self.audience {
-      let audience = audience
-        .dereference(context, local_instance(context).await, request_counter)
-        .await?;
-      verify_community_matches(&audience, community_id)?;
-      Ok(audience)
-    } else {
-      Ok(Community::read(context.pool(), community_id).await?.into())
+      verify_community_matches(audience, community.actor_id.clone())?;
     }
+    Ok(community.into())
   }
 }