X-Git-Url: http://these/git/?a=blobdiff_plain;f=crates%2Fapub%2Fsrc%2Factivities%2Ffollowing%2Faccept.rs;h=adaad51d14b263d1d41fa2cf07ce4d5814a1a6e1;hb=e9e76549a88cfbdab36f00d302cceabcaaa24f4c;hp=984d622a877b28b3118b9e3222285956216fd2bf;hpb=1bec551945a310cd34539da80e2f5e4139be32af;p=lemmy.git

diff --git a/crates/apub/src/activities/following/accept.rs b/crates/apub/src/activities/following/accept.rs
index 984d622a..adaad51d 100644
--- a/crates/apub/src/activities/following/accept.rs
+++ b/crates/apub/src/activities/following/accept.rs
@@ -1,75 +1,72 @@
 use crate::{
-  activities::{generate_activity_id, send_lemmy_activity, verify_activity},
-  fetcher::object_id::ObjectId,
-  protocol::activities::following::{accept::AcceptFollowCommunity, follow::FollowCommunity},
+  activities::{generate_activity_id, send_lemmy_activity},
+  insert_received_activity,
+  protocol::activities::following::{accept::AcceptFollow, follow::Follow},
 };
-use activitystreams::activity::kind::AcceptType;
-use lemmy_api_common::blocking;
-use lemmy_apub_lib::{
-  data::Data,
-  traits::{ActivityFields, ActivityHandler, ActorType},
-  verify::verify_urls_match,
+use activitypub_federation::{
+  config::Data,
+  kinds::activity::AcceptType,
+  protocol::verification::verify_urls_match,
+  traits::{ActivityHandler, Actor},
 };
+use lemmy_api_common::context::LemmyContext;
 use lemmy_db_schema::{source::community::CommunityFollower, traits::Followable};
-use lemmy_utils::LemmyError;
-use lemmy_websocket::LemmyContext;
+use lemmy_utils::error::LemmyError;
+use url::Url;
 
-impl AcceptFollowCommunity {
-  pub async fn send(
-    follow: FollowCommunity,
-    context: &LemmyContext,
-    request_counter: &mut i32,
-  ) -> Result<(), LemmyError> {
-    let community = follow.object.dereference_local(context).await?;
-    let person = follow
-      .actor
-      .clone()
-      .dereference(context, request_counter)
-      .await?;
-    let accept = AcceptFollowCommunity {
-      actor: ObjectId::new(community.actor_id()),
-      to: [ObjectId::new(person.actor_id())],
+impl AcceptFollow {
+  #[tracing::instrument(skip_all)]
+  pub async fn send(follow: Follow, context: &Data<LemmyContext>) -> Result<(), LemmyError> {
+    let user_or_community = follow.object.dereference_local(context).await?;
+    let person = follow.actor.clone().dereference(context).await?;
+    let accept = AcceptFollow {
+      actor: user_or_community.id().into(),
+      to: Some([person.id().into()]),
       object: follow,
       kind: AcceptType::Accept,
       id: generate_activity_id(
         AcceptType::Accept,
         &context.settings().get_protocol_and_hostname(),
       )?,
-      unparsed: Default::default(),
     };
-    let inbox = vec![person.inbox_url()];
-    send_lemmy_activity(context, &accept, &accept.id, &community, inbox, true).await
+    let inbox = vec![person.shared_inbox_or_inbox()];
+    send_lemmy_activity(context, accept, &user_or_community, inbox, true).await
   }
 }
 
 /// Handle accepted follows
-#[async_trait::async_trait(?Send)]
-impl ActivityHandler for AcceptFollowCommunity {
+#[async_trait::async_trait]
+impl ActivityHandler for AcceptFollow {
   type DataType = LemmyContext;
-  async fn verify(
-    &self,
-    context: &Data<LemmyContext>,
-    request_counter: &mut i32,
-  ) -> Result<(), LemmyError> {
-    verify_activity(self, &context.settings())?;
-    verify_urls_match(self.to[0].inner(), self.object.actor())?;
-    verify_urls_match(self.actor(), self.object.to[0].inner())?;
-    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?;
+    verify_urls_match(self.actor.inner(), self.object.object.inner())?;
+    self.object.verify(context).await?;
+    if let Some(to) = &self.to {
+      verify_urls_match(to[0].inner(), self.object.actor.inner())?;
+    }
     Ok(())
   }
 
-  async fn receive(
-    self,
-    context: &Data<LemmyContext>,
-    request_counter: &mut i32,
-  ) -> Result<(), LemmyError> {
-    let actor = self.actor.dereference(context, request_counter).await?;
-    let to = self.to[0].dereference(context, request_counter).await?;
+  #[tracing::instrument(skip_all)]
+  async fn receive(self, context: &Data<LemmyContext>) -> Result<(), LemmyError> {
+    let community = self.actor.dereference(context).await?;
+    let person = self.object.actor.dereference(context).await?;
     // This will throw an error if no follow was requested
-    blocking(context.pool(), move |conn| {
-      CommunityFollower::follow_accepted(conn, actor.id, to.id)
-    })
-    .await??;
+    let community_id = community.id;
+    let person_id = person.id;
+    CommunityFollower::follow_accepted(&mut context.pool(), community_id, person_id).await?;
 
     Ok(())
   }