Split activity table into sent and received parts (fixes #3103) (#3583)

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

diff --git a/crates/apub/src/activities/following/accept.rs b/crates/apub/src/activities/following/accept.rs
index 250fbf5454df88a0afdd0d58b4433b9a6d3e94c4..adaad51d14b263d1d41fa2cf07ce4d5814a1a6e1 100644 (file)
--- a/crates/apub/src/activities/following/accept.rs
+++ b/crates/apub/src/activities/following/accept.rs
@@ -1,6 +1,6 @@
 use crate::{
   activities::{generate_activity_id, send_lemmy_activity},
-  insert_activity,
+  insert_received_activity,
   protocol::activities::following::{accept::AcceptFollow, follow::Follow},
 };
 use activitypub_federation::{
@@ -9,17 +9,8 @@ use activitypub_federation::{
   protocol::verification::verify_urls_match,
   traits::{ActivityHandler, Actor},
 };
-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;
 
@@ -30,6 +21,7 @@ impl AcceptFollow {
     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(
@@ -58,47 +50,23 @@ impl ActivityHandler for AcceptFollow {
 
   #[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(())
   }
 
   #[tracing::instrument(skip_all)]
   async fn receive(self, context: &Data<LemmyContext>) -> Result<(), LemmyError> {
-    insert_activity(&self.id, &self, false, true, context).await?;
     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), None).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(())
   }