X-Git-Url: http://these/git/?a=blobdiff_plain;f=crates%2Fapub%2Fsrc%2Factivities%2Fvoting%2Fundo_vote.rs;h=9616c651f46d59a6188c046cae35aa5baf6a6b13;hb=e9e76549a88cfbdab36f00d302cceabcaaa24f4c;hp=bfb74371d74488ea57b6191f8e440f4ef982a0ef;hpb=f4c783cba5b3363508b8b0bc1c042f6dc835a8d6;p=lemmy.git

diff --git a/crates/apub/src/activities/voting/undo_vote.rs b/crates/apub/src/activities/voting/undo_vote.rs
index bfb74371..9616c651 100644
--- a/crates/apub/src/activities/voting/undo_vote.rs
+++ b/crates/apub/src/activities/voting/undo_vote.rs
@@ -1,120 +1,76 @@
 use crate::{
   activities::{
-    community::{announce::AnnouncableActivities, send_to_community},
     generate_activity_id,
-    verify_activity,
     verify_person_in_community,
-    voting::{
-      undo_vote_comment,
-      undo_vote_post,
-      vote::{Vote, VoteType},
-    },
+    voting::{undo_vote_comment, undo_vote_post},
+  },
+  insert_received_activity,
+  objects::{community::ApubCommunity, person::ApubPerson},
+  protocol::{
+    activities::voting::{undo_vote::UndoVote, vote::Vote},
+    InCommunity,
   },
-  context::lemmy_context,
-  fetcher::object_id::ObjectId,
   PostOrComment,
 };
-use activitystreams::{
-  activity::kind::UndoType,
-  base::AnyBase,
-  primitives::OneOrMany,
-  unparsed::Unparsed,
-};
-use lemmy_api_common::blocking;
-use lemmy_apub_lib::{
-  data::Data,
-  traits::{ActivityFields, ActivityHandler, ActorType},
-  values::PublicUrl,
-  verify::verify_urls_match,
+use activitypub_federation::{
+  config::Data,
+  kinds::activity::UndoType,
+  protocol::verification::verify_urls_match,
+  traits::{ActivityHandler, Actor},
 };
-use lemmy_db_queries::Crud;
-use lemmy_db_schema::{
-  source::{community::Community, person::Person},
-  CommunityId,
-};
-use lemmy_utils::LemmyError;
-use lemmy_websocket::LemmyContext;
-use serde::{Deserialize, Serialize};
-use std::ops::Deref;
+use lemmy_api_common::context::LemmyContext;
+use lemmy_utils::error::LemmyError;
 use url::Url;
 
-#[derive(Clone, Debug, Deserialize, Serialize, ActivityFields)]
-#[serde(rename_all = "camelCase")]
-pub struct UndoVote {
-  actor: ObjectId<Person>,
-  to: [PublicUrl; 1],
-  object: Vote,
-  cc: [ObjectId<Community>; 1],
-  #[serde(rename = "type")]
-  kind: UndoType,
-  id: Url,
-  #[serde(rename = "@context")]
-  context: OneOrMany<AnyBase>,
-  #[serde(flatten)]
-  unparsed: Unparsed,
-}
-
 impl UndoVote {
-  pub async fn send(
-    object: &PostOrComment,
-    actor: &Person,
-    community_id: CommunityId,
-    kind: VoteType,
-    context: &LemmyContext,
-  ) -> Result<(), LemmyError> {
-    let community = blocking(context.pool(), move |conn| {
-      Community::read(conn, community_id)
-    })
-    .await??;
-
-    let object = Vote::new(object, actor, &community, kind.clone(), context)?;
-    let id = generate_activity_id(
-      UndoType::Undo,
-      &context.settings().get_protocol_and_hostname(),
-    )?;
-    let undo_vote = UndoVote {
-      actor: ObjectId::new(actor.actor_id()),
-      to: [PublicUrl::Public],
-      object,
-      cc: [ObjectId::new(community.actor_id())],
+  pub(in crate::activities::voting) fn new(
+    vote: Vote,
+    actor: &ApubPerson,
+    community: &ApubCommunity,
+    context: &Data<LemmyContext>,
+  ) -> Result<Self, LemmyError> {
+    Ok(UndoVote {
+      actor: actor.id().into(),
+      object: vote,
       kind: UndoType::Undo,
-      id: id.clone(),
-      context: lemmy_context(),
-      unparsed: Default::default(),
-    };
-    let activity = AnnouncableActivities::UndoVote(undo_vote);
-    send_to_community(activity, &id, actor, &community, vec![], context).await
+      id: generate_activity_id(
+        UndoType::Undo,
+        &context.settings().get_protocol_and_hostname(),
+      )?,
+      audience: Some(community.id().into()),
+    })
   }
 }
 
-#[async_trait::async_trait(?Send)]
+#[async_trait::async_trait]
 impl ActivityHandler for UndoVote {
   type DataType = LemmyContext;
-  async fn verify(
-    &self,
-    context: &Data<LemmyContext>,
-    request_counter: &mut i32,
-  ) -> Result<(), LemmyError> {
-    verify_activity(self, &context.settings())?;
-    verify_person_in_community(&self.actor, &self.cc[0], context, request_counter).await?;
-    verify_urls_match(self.actor(), self.object.actor())?;
-    self.object.verify(context, request_counter).await?;
+  type Error = LemmyError;
+
+  fn id(&self) -> &Url {
+    &self.id
+  }
+
+  fn actor(&self) -> &Url {
+    self.actor.inner()
+  }
+
+  #[tracing::instrument(skip_all)]
+  async fn verify(&self, context: &Data<LemmyContext>) -> Result<(), LemmyError> {
+    insert_received_activity(&self.id, context).await?;
+    let community = self.community(context).await?;
+    verify_person_in_community(&self.actor, &community, context).await?;
+    verify_urls_match(self.actor.inner(), self.object.actor.inner())?;
+    self.object.verify(context).await?;
     Ok(())
   }
 
-  async fn receive(
-    self,
-    context: &Data<LemmyContext>,
-    request_counter: &mut i32,
-  ) -> Result<(), LemmyError> {
-    let actor = self.actor.dereference(context, request_counter).await?;
-    let object = self
-      .object
-      .object
-      .dereference(context, request_counter)
-      .await?;
+  #[tracing::instrument(skip_all)]
+  async fn receive(self, context: &Data<LemmyContext>) -> Result<(), LemmyError> {
+    let actor = self.actor.dereference(context).await?;
+    let object = self.object.object.dereference(context).await?;
     match object {
-      PostOrComment::Post(p) => undo_vote_post(actor, p.deref(), context).await,
+      PostOrComment::Post(p) => undo_vote_post(actor, &p, context).await,
       PostOrComment::Comment(c) => undo_vote_comment(actor, &c, context).await,
     }
   }