Moving settings to Database. (#2492)

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

diff --git a/crates/apub/src/activities/following/follow.rs b/crates/apub/src/activities/following/follow.rs
index aa96fb39f453f5e91642512088af39e58c2f9287..512c074cdc068472a975fc880c994114c80958d1 100644 (file)
--- a/crates/apub/src/activities/following/follow.rs
+++ b/crates/apub/src/activities/following/follow.rs
@@ -1,42 +1,54 @@
 use crate::{
   activities::{
-    following::accept::AcceptFollowCommunity,
     generate_activity_id,
-    verify_activity,
+    send_lemmy_activity,
     verify_person,
+    verify_person_in_community,
   },
-  activity_queue::send_activity_new,
-  extensions::context::lemmy_context,
-  fetcher::{community::get_or_fetch_and_upsert_community, person::get_or_fetch_and_upsert_person},
+  check_apub_id_valid,
+  fetch_local_site_data,
+  local_instance,
+  objects::{community::ApubCommunity, person::ApubPerson},
+  protocol::activities::following::{accept::AcceptFollowCommunity, follow::FollowCommunity},
   ActorType,
 };
-use activitystreams::activity::kind::FollowType;
-use lemmy_api_common::blocking;
-use lemmy_apub_lib::{verify_urls_match, ActivityCommonFields, ActivityHandler};
-use lemmy_db_queries::Followable;
-use lemmy_db_schema::source::{
-  community::{Community, CommunityFollower, CommunityFollowerForm},
-  person::Person,
+use activitypub_federation::{
+  core::object_id::ObjectId,
+  data::Data,
+  traits::{ActivityHandler, Actor},
 };
-use lemmy_utils::LemmyError;
+use activitystreams_kinds::activity::FollowType;
+use lemmy_api_common::utils::blocking;
+use lemmy_db_schema::{
+  source::community::{CommunityFollower, CommunityFollowerForm},
+  traits::Followable,
+};
+use lemmy_utils::error::LemmyError;
 use lemmy_websocket::LemmyContext;
 use url::Url;
 
-#[derive(Clone, Debug, serde::Deserialize, serde::Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct FollowCommunity {
-  pub(in crate::activities::following) to: Url,
-  pub(in crate::activities::following) object: Url,
-  #[serde(rename = "type")]
-  pub(in crate::activities::following) kind: FollowType,
-  #[serde(flatten)]
-  pub(in crate::activities::following) common: ActivityCommonFields,
-}
-
 impl FollowCommunity {
+  pub(in crate::activities::following) fn new(
+    actor: &ApubPerson,
+    community: &ApubCommunity,
+    context: &LemmyContext,
+  ) -> Result<FollowCommunity, LemmyError> {
+    Ok(FollowCommunity {
+      actor: ObjectId::new(actor.actor_id()),
+      object: ObjectId::new(community.actor_id()),
+      kind: FollowType::Follow,
+      id: generate_activity_id(
+        FollowType::Follow,
+        &context.settings().get_protocol_and_hostname(),
+      )?,
+      unparsed: Default::default(),
+    })
+  }
+
+  #[tracing::instrument(skip_all)]
   pub async fn send(
-    actor: &Person,
-    community: &Community,
+    actor: &ApubPerson,
+    community: &ApubCommunity,
     context: &LemmyContext,
   ) -> Result<(), LemmyError> {
     let community_follower_form = CommunityFollowerForm {
@@ -49,48 +61,60 @@ impl FollowCommunity {
     })
     .await?;
 
-    let id = generate_activity_id(FollowType::Follow)?;
-    let follow = FollowCommunity {
-      to: community.actor_id(),
-      object: community.actor_id(),
-      kind: FollowType::Follow,
-      common: ActivityCommonFields {
-        context: lemmy_context(),
-        id: id.clone(),
-        actor: actor.actor_id(),
-        unparsed: Default::default(),
-      },
-    };
-    let inbox = vec![community.inbox_url.clone().into()];
-    send_activity_new(context, &follow, &id, actor, inbox, true).await
+    let follow = FollowCommunity::new(actor, community, context)?;
+    let inbox = vec![community.shared_inbox_or_inbox()];
+    send_lemmy_activity(context, follow, actor, inbox, true).await
   }
 }
 
 #[async_trait::async_trait(?Send)]
 impl ActivityHandler for FollowCommunity {
+  type DataType = LemmyContext;
+  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: &LemmyContext,
+    context: &Data<LemmyContext>,
     request_counter: &mut i32,
   ) -> Result<(), LemmyError> {
-    verify_activity(self.common())?;
-    verify_urls_match(&self.to, &self.object)?;
-    verify_person(&self.common.actor, context, request_counter).await?;
+    let local_site_data = blocking(context.pool(), fetch_local_site_data).await??;
+    check_apub_id_valid(self.id(), &local_site_data, context.settings())
+      .map_err(LemmyError::from_message)?;
+    verify_person(&self.actor, context, request_counter).await?;
+    let community = self
+      .object
+      .dereference(context, local_instance(context), request_counter)
+      .await?;
+    verify_person_in_community(&self.actor, &community, context, request_counter).await?;
     Ok(())
   }
 
+  #[tracing::instrument(skip_all)]
   async fn receive(
     self,
-    context: &LemmyContext,
+    context: &Data<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.object, context, request_counter).await?;
+    let person = self
+      .actor
+      .dereference(context, local_instance(context), request_counter)
+      .await?;
+    let community = self
+      .object
+      .dereference(context, local_instance(context), request_counter)
+      .await?;
     let community_follower_form = CommunityFollowerForm {
       community_id: community.id,
-      person_id: actor.id,
+      person_id: person.id,
       pending: false,
     };
 
@@ -100,10 +124,6 @@ impl ActivityHandler for FollowCommunity {
     })
     .await?;
 
-    AcceptFollowCommunity::send(self, context).await
-  }
-
-  fn common(&self) -> &ActivityCommonFields {
-    &self.common
+    AcceptFollowCommunity::send(self, context, request_counter).await
   }
 }