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

diff --git a/crates/apub/src/activities/following/accept.rs b/crates/apub/src/activities/following/accept.rs
index 08853c50..adaad51d 100644
--- a/crates/apub/src/activities/following/accept.rs
+++ b/crates/apub/src/activities/following/accept.rs
@@ -1,45 +1,27 @@
 use crate::{
   activities::{generate_activity_id, send_lemmy_activity},
-  local_instance,
+  insert_received_activity,
   protocol::activities::following::{accept::AcceptFollow, follow::Follow},
-  ActorType,
 };
 use activitypub_federation::{
-  core::object_id::ObjectId,
-  data::Data,
+  config::Data,
+  kinds::activity::AcceptType,
+  protocol::verification::verify_urls_match,
   traits::{ActivityHandler, Actor},
-  utils::verify_urls_match,
 };
-use activitystreams_kinds::activity::AcceptType;
-use lemmy_api_common::{
-  community::CommunityResponse,
-  context::LemmyContext,
-  websocket::UserOperation,
-};
-use lemmy_db_schema::{
-  source::{actor_language::CommunityLanguage, community::CommunityFollower},
-  traits::Followable,
-};
-use lemmy_db_views::structs::LocalUserView;
-use lemmy_db_views_actor::structs::CommunityView;
+use lemmy_api_common::context::LemmyContext;
+use lemmy_db_schema::{source::community::CommunityFollower, traits::Followable};
 use lemmy_utils::error::LemmyError;
 use url::Url;
 
 impl AcceptFollow {
   #[tracing::instrument(skip_all)]
-  pub async fn send(
-    follow: Follow,
-    context: &LemmyContext,
-    request_counter: &mut i32,
-  ) -> Result<(), LemmyError> {
+  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, local_instance(context).await, request_counter)
-      .await?;
+    let person = follow.actor.clone().dereference(context).await?;
     let accept = AcceptFollow {
-      actor: ObjectId::new(user_or_community.actor_id()),
+      actor: user_or_community.id().into(),
+      to: Some([person.id().into()]),
       object: follow,
       kind: AcceptType::Accept,
       id: generate_activity_id(
@@ -53,7 +35,7 @@ impl AcceptFollow {
 }
 
 /// Handle accepted follows
-#[async_trait::async_trait(?Send)]
+#[async_trait::async_trait]
 impl ActivityHandler for AcceptFollow {
   type DataType = LemmyContext;
   type Error = LemmyError;
@@ -67,61 +49,24 @@ impl ActivityHandler for AcceptFollow {
   }
 
   #[tracing::instrument(skip_all)]
-  async fn verify(
-    &self,
-    context: &Data<LemmyContext>,
-    request_counter: &mut i32,
-  ) -> Result<(), LemmyError> {
+  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, request_counter).await?;
+    self.object.verify(context).await?;
+    if let Some(to) = &self.to {
+      verify_urls_match(to[0].inner(), self.object.actor.inner())?;
+    }
     Ok(())
   }
 
   #[tracing::instrument(skip_all)]
-  async fn receive(
-    self,
-    context: &Data<LemmyContext>,
-    request_counter: &mut i32,
-  ) -> Result<(), LemmyError> {
-    let community = self
-      .actor
-      .dereference(context, local_instance(context).await, request_counter)
-      .await?;
-    let person = self
-      .object
-      .actor
-      .dereference(context, local_instance(context).await, request_counter)
-      .await?;
+  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
     let community_id = community.id;
     let person_id = person.id;
-    CommunityFollower::follow_accepted(context.pool(), community_id, person_id).await?;
-
-    // Send the Subscribed message over websocket
-    // Re-read the community_view to get the new SubscribedType
-    let community_view = CommunityView::read(context.pool(), community_id, Some(person_id)).await?;
-
-    // Get the local_user_id
-    let local_recipient_id = LocalUserView::read_person(context.pool(), person_id)
-      .await?
-      .local_user
-      .id;
-    let discussion_languages = CommunityLanguage::read(context.pool(), community_id).await?;
-
-    let response = CommunityResponse {
-      community_view,
-      discussion_languages,
-    };
-
-    context
-      .chat_server()
-      .send_user_room_message(
-        &UserOperation::FollowCommunity,
-        &response,
-        local_recipient_id,
-        None,
-      )
-      .await?;
+    CommunityFollower::follow_accepted(&mut context.pool(), community_id, person_id).await?;
 
     Ok(())
   }