Rewrite fetcher (#1792)

[lemmy.git] / crates / apub / src / activities / following / undo.rs

diff --git a/crates/apub/src/activities/following/undo.rs b/crates/apub/src/activities/following/undo.rs
index 1936997f4ce4675b07c1c627d6d4745f291cdc41..f35b3095fc595cb2e2e7bf6995ed3d932bbf5364 100644 (file)
--- a/crates/apub/src/activities/following/undo.rs
+++ b/crates/apub/src/activities/following/undo.rs
@@ -1,25 +1,67 @@
 use crate::{
-  activities::{following::follow::FollowCommunity, verify_activity, verify_person},
-  fetcher::{community::get_or_fetch_and_upsert_community, person::get_or_fetch_and_upsert_person},
+  activities::{
+    following::follow::FollowCommunity,
+    generate_activity_id,
+    verify_activity,
+    verify_person,
+  },
+  activity_queue::send_activity_new,
+  extensions::context::lemmy_context,
+  fetcher::object_id::ObjectId,
+  ActorType,
+};
+use activitystreams::{
+  activity::kind::UndoType,
+  base::AnyBase,
+  primitives::OneOrMany,
+  unparsed::Unparsed,
 };
-use activitystreams::activity::kind::UndoType;
 use lemmy_api_common::blocking;
-use lemmy_apub_lib::{verify_urls_match, ActivityCommonFields, ActivityHandler};
+use lemmy_apub_lib::{verify_urls_match, ActivityFields, ActivityHandler};
 use lemmy_db_queries::Followable;
-use lemmy_db_schema::source::community::{CommunityFollower, CommunityFollowerForm};
+use lemmy_db_schema::source::{
+  community::{Community, CommunityFollower, CommunityFollowerForm},
+  person::Person,
+};
 use lemmy_utils::LemmyError;
 use lemmy_websocket::LemmyContext;
+use serde::{Deserialize, Serialize};
 use url::Url;
 
-#[derive(Clone, Debug, serde::Deserialize, serde::Serialize)]
+#[derive(Clone, Debug, Deserialize, Serialize, ActivityFields)]
 #[serde(rename_all = "camelCase")]
 pub struct UndoFollowCommunity {
-  to: Url,
+  actor: ObjectId<Person>,
+  to: ObjectId<Community>,
   object: FollowCommunity,
   #[serde(rename = "type")]
   kind: UndoType,
+  id: Url,
+  #[serde(rename = "@context")]
+  context: OneOrMany<AnyBase>,
   #[serde(flatten)]
-  common: ActivityCommonFields,
+  unparsed: Unparsed,
+}
+
+impl UndoFollowCommunity {
+  pub async fn send(
+    actor: &Person,
+    community: &Community,
+    context: &LemmyContext,
+  ) -> Result<(), LemmyError> {
+    let object = FollowCommunity::new(actor, community)?;
+    let undo = UndoFollowCommunity {
+      actor: ObjectId::new(actor.actor_id()),
+      to: ObjectId::new(community.actor_id()),
+      object,
+      kind: UndoType::Undo,
+      id: generate_activity_id(UndoType::Undo)?,
+      context: lemmy_context(),
+      unparsed: Default::default(),
+    };
+    let inbox = vec![community.get_shared_inbox_or_inbox_url()];
+    send_activity_new(context, &undo, &undo.id, actor, inbox, true).await
+  }
 }
 
 #[async_trait::async_trait(?Send)]
@@ -29,22 +71,21 @@ impl ActivityHandler for UndoFollowCommunity {
     context: &LemmyContext,
     request_counter: &mut i32,
   ) -> Result<(), LemmyError> {
-    verify_activity(self.common())?;
-    verify_urls_match(&self.to, &self.object.object)?;
-    verify_urls_match(&self.common.actor, &self.object.common.actor)?;
-    verify_person(&self.common.actor, context, request_counter).await?;
+    verify_activity(self)?;
+    verify_urls_match(self.to.inner(), self.object.object.inner())?;
+    verify_urls_match(self.actor(), self.object.actor())?;
+    verify_person(&self.actor, context, request_counter).await?;
     self.object.verify(context, request_counter).await?;
     Ok(())
   }
 
   async fn receive(
-    &self,
+    self,
     context: &LemmyContext,
     request_counter: &mut i32,
   ) -> Result<(), LemmyError> {
-    let actor =
-      get_or_fetch_and_upsert_person(&self.common.actor, context, request_counter).await?;
-    let community = get_or_fetch_and_upsert_community(&self.to, context, request_counter).await?;
+    let actor = self.actor.dereference(context, request_counter).await?;
+    let community = self.to.dereference(context, request_counter).await?;
 
     let community_follower_form = CommunityFollowerForm {
       community_id: community.id,
@@ -59,8 +100,4 @@ impl ActivityHandler for UndoFollowCommunity {
     .await?;
     Ok(())
   }
-
-  fn common(&self) -> &ActivityCommonFields {
-    &self.common
-  }
 }