Implement federated user following (fixes #752) (#2577)

[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 410b678e73cdefa8f786ec0fb8c4175aa2dd4ef2..5a8baa4c7b5525a0b7d83d1390cee4a3e7c9eff5 100644 (file)
--- a/crates/apub/src/activities/following/accept.rs
+++ b/crates/apub/src/activities/following/accept.rs
@@ -1,56 +1,54 @@
 use crate::{
   activities::{generate_activity_id, send_lemmy_activity},
   local_instance,
-  protocol::activities::following::{accept::AcceptFollowCommunity, follow::FollowCommunity},
+  protocol::activities::following::{accept::AcceptFollow, follow::Follow},
   ActorType,
 };
 use activitypub_federation::{
   core::object_id::ObjectId,
   data::Data,
-  traits::ActivityHandler,
+  traits::{ActivityHandler, Actor},
   utils::verify_urls_match,
 };
 use activitystreams_kinds::activity::AcceptType;
-use lemmy_api_common::utils::blocking;
+use lemmy_api_common::community::CommunityResponse;
 use lemmy_db_schema::{source::community::CommunityFollower, traits::Followable};
+use lemmy_db_views::structs::LocalUserView;
+use lemmy_db_views_actor::structs::CommunityView;
 use lemmy_utils::error::LemmyError;
-use lemmy_websocket::LemmyContext;
+use lemmy_websocket::{messages::SendUserRoomMessage, LemmyContext, UserOperation};
 use url::Url;
 
-impl AcceptFollowCommunity {
+impl AcceptFollow {
   #[tracing::instrument(skip_all)]
   pub async fn send(
-    follow: FollowCommunity,
+    follow: Follow,
     context: &LemmyContext,
     request_counter: &mut i32,
   ) -> Result<(), LemmyError> {
-    let community = follow
-      .object
-      .dereference_local::<LemmyError>(context)
-      .await?;
+    let user_or_community = follow.object.dereference_local(context).await?;
     let person = follow
       .actor
       .clone()
-      .dereference::<LemmyError>(context, local_instance(context), request_counter)
+      .dereference(context, local_instance(context).await, request_counter)
       .await?;
-    let accept = AcceptFollowCommunity {
-      actor: ObjectId::new(community.actor_id()),
+    let accept = AcceptFollow {
+      actor: ObjectId::new(user_or_community.actor_id()),
       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 {
+impl ActivityHandler for AcceptFollow {
   type DataType = LemmyContext;
   type Error = LemmyError;
 
@@ -79,20 +77,38 @@ impl ActivityHandler for AcceptFollowCommunity {
     context: &Data<LemmyContext>,
     request_counter: &mut i32,
   ) -> Result<(), LemmyError> {
-    let person = self
+    let community = self
       .actor
-      .dereference::<LemmyError>(context, local_instance(context), request_counter)
+      .dereference(context, local_instance(context).await, request_counter)
       .await?;
-    let community = self
+    let person = self
       .object
       .actor
-      .dereference::<LemmyError>(context, local_instance(context), request_counter)
+      .dereference(context, local_instance(context).await, request_counter)
       .await?;
     // This will throw an error if no follow was requested
-    blocking(context.pool(), move |conn| {
-      CommunityFollower::follow_accepted(conn, person.id, community.id)
-    })
-    .await??;
+    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 response = CommunityResponse { community_view };
+
+    context.chat_server().do_send(SendUserRoomMessage {
+      op: UserOperation::FollowCommunity,
+      response,
+      local_recipient_id,
+      websocket_id: None,
+    });
 
     Ok(())
   }