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

[lemmy.git] / crates / apub / src / protocol / activities / block / block_user.rs

diff --git a/crates/apub/src/protocol/activities/block/block_user.rs b/crates/apub/src/protocol/activities/block/block_user.rs
index 3925c55c790def35d7ab7da3b623ddccf58176b6..91467a96ca2060412d44332027c1d2ad3d4adc29 100644 (file)
--- a/crates/apub/src/protocol/activities/block/block_user.rs
+++ b/crates/apub/src/protocol/activities/block/block_user.rs
@@ -1,10 +1,20 @@
-use crate::{activities::block::SiteOrCommunity, objects::person::ApubPerson};
+use crate::{
+  activities::{block::SiteOrCommunity, verify_community_matches},
+  local_instance,
+  objects::{community::ApubCommunity, person::ApubPerson},
+  protocol::InCommunity,
+};
 use activitypub_federation::{core::object_id::ObjectId, deser::helpers::deserialize_one_or_many};
 use activitystreams_kinds::activity::BlockType;
+use anyhow::anyhow;
 use chrono::{DateTime, FixedOffset};
+use lemmy_utils::error::LemmyError;
+use lemmy_websocket::LemmyContext;
 use serde::{Deserialize, Serialize};
+use serde_with::skip_serializing_none;
 use url::Url;
 
+#[skip_serializing_none]
 #[derive(Clone, Debug, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct BlockUser {
@@ -18,6 +28,7 @@ pub struct BlockUser {
   #[serde(rename = "type")]
   pub(crate) kind: BlockType,
   pub(crate) id: Url,
+  pub(crate) audience: Option<ObjectId<ApubCommunity>>,
 
   /// Quick and dirty solution.
   /// TODO: send a separate Delete activity instead
@@ -26,3 +37,30 @@ pub struct BlockUser {
   pub(crate) summary: Option<String>,
   pub(crate) expires: Option<DateTime<FixedOffset>>,
 }
+
+#[async_trait::async_trait(?Send)]
+impl InCommunity for BlockUser {
+  async fn community(
+    &self,
+    context: &LemmyContext,
+    request_counter: &mut i32,
+  ) -> Result<ApubCommunity, LemmyError> {
+    let target = self
+      .target
+      .dereference(context, local_instance(context).await, request_counter)
+      .await?;
+    let target_community = match target {
+      SiteOrCommunity::Community(c) => c,
+      SiteOrCommunity::Site(_) => return Err(anyhow!("activity is not in community").into()),
+    };
+    if let Some(audience) = &self.audience {
+      let audience = audience
+        .dereference(context, local_instance(context).await, request_counter)
+        .await?;
+      verify_community_matches(&audience, target_community.id)?;
+      Ok(audience)
+    } else {
+      Ok(target_community)
+    }
+  }
+}