Use audience field to federate items in groups (fixes #2464) (#2584)

[lemmy.git] / crates / apub / src / activities / voting / undo_vote.rs

diff --git a/crates/apub/src/activities/voting/undo_vote.rs b/crates/apub/src/activities/voting/undo_vote.rs
index 2c1a1b2deb140905a58ed12cd099655ebd623447..20c9432cde52957362b31fa5b1785607ada51717 100644 (file)
--- a/crates/apub/src/activities/voting/undo_vote.rs
+++ b/crates/apub/src/activities/voting/undo_vote.rs
@@ -1,6 +1,6 @@
 use crate::{
   activities::{
-    community::{announce::GetCommunity, send_activity_in_community},
+    community::send_activity_in_community,
     generate_activity_id,
     verify_person_in_community,
     voting::{undo_vote_comment, undo_vote_post},
@@ -8,9 +8,12 @@ use crate::{
   activity_lists::AnnouncableActivities,
   local_instance,
   objects::{community::ApubCommunity, person::ApubPerson},
-  protocol::activities::voting::{
-    undo_vote::UndoVote,
-    vote::{Vote, VoteType},
+  protocol::{
+    activities::voting::{
+      undo_vote::UndoVote,
+      vote::{Vote, VoteType},
+    },
+    InCommunity,
   },
   ActorType,
   PostOrComment,
@@ -41,7 +44,7 @@ impl UndoVote {
   ) -> Result<(), LemmyError> {
     let community: ApubCommunity = Community::read(context.pool(), community_id).await?.into();
 
-    let object = Vote::new(object, actor, kind.clone(), context)?;
+    let object = Vote::new(object, actor, &community, kind.clone(), context)?;
     let id = generate_activity_id(
       UndoType::Undo,
       &context.settings().get_protocol_and_hostname(),
@@ -51,6 +54,7 @@ impl UndoVote {
       object,
       kind: UndoType::Undo,
       id: id.clone(),
+      audience: Some(ObjectId::new(community.actor_id())),
     };
     let activity = AnnouncableActivities::UndoVote(undo_vote);
     send_activity_in_community(activity, actor, &community, vec![], false, context).await
@@ -76,7 +80,7 @@ impl ActivityHandler for UndoVote {
     context: &Data<LemmyContext>,
     request_counter: &mut i32,
   ) -> Result<(), LemmyError> {
-    let community = self.get_community(context, request_counter).await?;
+    let community = self.community(context, request_counter).await?;
     verify_person_in_community(&self.actor, &community, context, request_counter).await?;
     verify_urls_match(self.actor.inner(), self.object.actor.inner())?;
     self.object.verify(context, request_counter).await?;
@@ -104,15 +108,3 @@ impl ActivityHandler for UndoVote {
     }
   }
 }
-
-#[async_trait::async_trait(?Send)]
-impl GetCommunity for UndoVote {
-  #[tracing::instrument(skip_all)]
-  async fn get_community(
-    &self,
-    context: &LemmyContext,
-    request_counter: &mut i32,
-  ) -> Result<ApubCommunity, LemmyError> {
-    self.object.get_community(context, request_counter).await
-  }
-}