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

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

diff --git a/crates/apub/src/protocol/activities/voting/vote.rs b/crates/apub/src/protocol/activities/voting/vote.rs
index fdc87a3bd7e497f5316643b87bb9d10f4a170eb2..cf79fc9adab41af4a1efde2cbdc20d1e1172ffa1 100644 (file)
--- a/crates/apub/src/protocol/activities/voting/vote.rs
+++ b/crates/apub/src/protocol/activities/voting/vote.rs
@@ -1,31 +1,30 @@
 use crate::{
-  fetcher::{object_id::ObjectId, post_or_comment::PostOrComment},
-  objects::person::ApubPerson,
+  activities::verify_community_matches,
+  fetcher::post_or_comment::PostOrComment,
+  local_instance,
+  objects::{community::ApubCommunity, person::ApubPerson},
+  protocol::InCommunity,
 };
-use activitystreams::unparsed::Unparsed;
-use anyhow::anyhow;
-use lemmy_apub_lib::traits::ActivityFields;
-use lemmy_utils::LemmyError;
+use activitypub_federation::core::object_id::ObjectId;
+use lemmy_api_common::context::LemmyContext;
+use lemmy_utils::error::LemmyError;
 use serde::{Deserialize, Serialize};
 use std::convert::TryFrom;
-use strum_macros::ToString;
+use strum_macros::Display;
 use url::Url;
 
-#[derive(Clone, Debug, Deserialize, Serialize, ActivityFields)]
+#[derive(Clone, Debug, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Vote {
   pub(crate) actor: ObjectId<ApubPerson>,
-  pub(crate) to: Vec<Url>,
   pub(crate) object: ObjectId<PostOrComment>,
-  pub(crate) cc: Vec<Url>,
   #[serde(rename = "type")]
   pub(crate) kind: VoteType,
   pub(crate) id: Url,
-  #[serde(flatten)]
-  pub(crate) unparsed: Unparsed,
+  pub(crate) audience: Option<ObjectId<ApubCommunity>>,
 }
 
-#[derive(Clone, Debug, ToString, Deserialize, Serialize)]
+#[derive(Clone, Debug, Display, Deserialize, Serialize, PartialEq, Eq)]
 pub enum VoteType {
   Like,
   Dislike,
@@ -38,7 +37,7 @@ impl TryFrom<i16> for VoteType {
     match value {
       1 => Ok(VoteType::Like),
       -1 => Ok(VoteType::Dislike),
-      _ => Err(anyhow!("invalid vote value").into()),
+      _ => Err(LemmyError::from_message("invalid vote value")),
     }
   }
 }
@@ -51,3 +50,24 @@ impl From<&VoteType> for i16 {
     }
   }
 }
+
+#[async_trait::async_trait(?Send)]
+impl InCommunity for Vote {
+  async fn community(
+    &self,
+    context: &LemmyContext,
+    request_counter: &mut i32,
+  ) -> Result<ApubCommunity, LemmyError> {
+    let local_instance = local_instance(context).await;
+    let community = self
+      .object
+      .dereference(context, local_instance, request_counter)
+      .await?
+      .community(context, request_counter)
+      .await?;
+    if let Some(audience) = &self.audience {
+      verify_community_matches(audience, community.actor_id.clone())?;
+    }
+    Ok(community)
+  }
+}