Rewrite activitypub following, person, community, pm (#1692)

[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 49c9970c0f1484b865fea39911e72140c43a3700..aa96fb39f453f5e91642512088af39e58c2f9287 100644 (file)
--- a/crates/apub/src/activities/following/follow.rs
+++ b/crates/apub/src/activities/following/follow.rs
@@ -1,18 +1,24 @@
 use crate::{
-  activities::{verify_activity, verify_person},
+  activities::{
+    following::accept::AcceptFollowCommunity,
+    generate_activity_id,
+    verify_activity,
+    verify_person,
+  },
+  activity_queue::send_activity_new,
+  extensions::context::lemmy_context,
   fetcher::{community::get_or_fetch_and_upsert_community, person::get_or_fetch_and_upsert_person},
-  CommunityType,
+  ActorType,
 };
-use activitystreams::{
-  activity::{kind::FollowType, Follow},
-  base::{AnyBase, ExtendsExt},
-};
-use anyhow::Context;
+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::{CommunityFollower, CommunityFollowerForm};
-use lemmy_utils::{location_info, LemmyError};
+use lemmy_db_schema::source::{
+  community::{Community, CommunityFollower, CommunityFollowerForm},
+  person::Person,
+};
+use lemmy_utils::LemmyError;
 use lemmy_websocket::LemmyContext;
 use url::Url;
 
@@ -22,11 +28,44 @@ pub struct FollowCommunity {
   pub(in crate::activities::following) to: Url,
   pub(in crate::activities::following) object: Url,
   #[serde(rename = "type")]
-  kind: FollowType,
+  pub(in crate::activities::following) kind: FollowType,
   #[serde(flatten)]
   pub(in crate::activities::following) common: ActivityCommonFields,
 }
 
+impl FollowCommunity {
+  pub async fn send(
+    actor: &Person,
+    community: &Community,
+    context: &LemmyContext,
+  ) -> Result<(), LemmyError> {
+    let community_follower_form = CommunityFollowerForm {
+      community_id: community.id,
+      person_id: actor.id,
+      pending: true,
+    };
+    blocking(context.pool(), move |conn| {
+      CommunityFollower::follow(conn, &community_follower_form).ok()
+    })
+    .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
+  }
+}
+
 #[async_trait::async_trait(?Send)]
 impl ActivityHandler for FollowCommunity {
   async fn verify(
@@ -41,7 +80,7 @@ impl ActivityHandler for FollowCommunity {
   }
 
   async fn receive(
-    &self,
+    self,
     context: &LemmyContext,
     request_counter: &mut i32,
   ) -> Result<(), LemmyError> {
@@ -61,10 +100,7 @@ impl ActivityHandler for FollowCommunity {
     })
     .await?;
 
-    // TODO: avoid the conversion and pass our own follow struct directly
-    let anybase = AnyBase::from_arbitrary_json(serde_json::to_string(self)?)?;
-    let anybase = Follow::from_any_base(anybase)?.context(location_info!())?;
-    community.send_accept_follow(anybase, context).await
+    AcceptFollowCommunity::send(self, context).await
   }
 
   fn common(&self) -> &ActivityCommonFields {