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

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

diff --git a/crates/apub/src/protocol/activities/block/undo_block_user.rs b/crates/apub/src/protocol/activities/block/undo_block_user.rs
index 8e756be5559ecde7bf0d296dca9f5eebccbe519b..9466fedc9f6a432ac163f79adafcf2b5c7f31806 100644 (file)
--- a/crates/apub/src/protocol/activities/block/undo_block_user.rs
+++ b/crates/apub/src/protocol/activities/block/undo_block_user.rs
@@ -1,25 +1,43 @@
 use crate::{
-  objects::person::ApubPerson,
-  protocol::{activities::block::block_user::BlockUser, Unparsed},
+  activities::verify_community_matches,
+  objects::{community::ApubCommunity, person::ApubPerson},
+  protocol::{activities::block::block_user::BlockUser, InCommunity},
 };
+use activitypub_federation::{core::object_id::ObjectId, deser::helpers::deserialize_one_or_many};
 use activitystreams_kinds::activity::UndoType;
-use lemmy_apub_lib::object_id::ObjectId;
+use lemmy_api_common::context::LemmyContext;
+use lemmy_utils::error::LemmyError;
 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 UndoBlockUser {
   pub(crate) actor: ObjectId<ApubPerson>,
-  #[serde(deserialize_with = "crate::deserialize_one_or_many")]
+  #[serde(deserialize_with = "deserialize_one_or_many")]
   pub(crate) to: Vec<Url>,
   pub(crate) object: BlockUser,
-  #[serde(deserialize_with = "crate::deserialize_one_or_many")]
+  #[serde(deserialize_with = "deserialize_one_or_many")]
   pub(crate) cc: Vec<Url>,
   #[serde(rename = "type")]
   pub(crate) kind: UndoType,
   pub(crate) id: Url,
+  pub(crate) audience: Option<ObjectId<ApubCommunity>>,
+}
 
-  #[serde(flatten)]
-  pub(crate) unparsed: Unparsed,
+#[async_trait::async_trait(?Send)]
+impl InCommunity for UndoBlockUser {
+  async fn community(
+    &self,
+    context: &LemmyContext,
+    request_counter: &mut i32,
+  ) -> Result<ApubCommunity, LemmyError> {
+    let community = self.object.community(context, request_counter).await?;
+    if let Some(audience) = &self.audience {
+      verify_community_matches(audience, community.actor_id.clone())?;
+    }
+    Ok(community)
+  }
 }