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

[lemmy.git] / crates / apub / src / activity_lists.rs

diff --git a/crates/apub/src/activity_lists.rs b/crates/apub/src/activity_lists.rs
index 86e87a2a3cc047f16a08b947a29398f2e5077a21..242f26a1f5088218b1ec1c4ed94cbe5bc371cc0b 100644 (file)
--- a/crates/apub/src/activity_lists.rs
+++ b/crates/apub/src/activity_lists.rs
@@ -17,17 +17,13 @@ use crate::{
         private_message::CreateOrUpdatePrivateMessage,
       },
       deletion::{delete::Delete, delete_user::DeleteUser, undo_delete::UndoDelete},
-      following::{
-        accept::AcceptFollowCommunity,
-        follow::FollowCommunity,
-        undo_follow::UndoFollowCommunity,
-      },
+      following::{accept::AcceptFollow, follow::Follow, undo_follow::UndoFollow},
       voting::{undo_vote::UndoVote, vote::Vote},
     },
     objects::page::Page,
   },
 };
-use activitypub_federation::{deser::context::WithContext, traits::activity_handler};
+use activitypub_federation::{data::Data, deser::context::WithContext, traits::ActivityHandler};
 use lemmy_utils::error::LemmyError;
 use lemmy_websocket::LemmyContext;
 use serde::{Deserialize, Serialize};
@@ -35,7 +31,7 @@ use url::Url;
 
 #[derive(Debug, Deserialize, Serialize)]
 #[serde(untagged)]
-#[activity_handler(LemmyContext, LemmyError)]
+#[enum_delegate::implement(ActivityHandler)]
 pub enum SharedInboxActivities {
   PersonInboxActivities(Box<WithContext<PersonInboxActivities>>),
   GroupInboxActivities(Box<WithContext<GroupInboxActivities>>),
@@ -43,10 +39,10 @@ pub enum SharedInboxActivities {
 
 #[derive(Debug, Deserialize, Serialize)]
 #[serde(untagged)]
-#[activity_handler(LemmyContext, LemmyError)]
+#[enum_delegate::implement(ActivityHandler)]
 pub enum GroupInboxActivities {
-  FollowCommunity(FollowCommunity),
-  UndoFollowCommunity(UndoFollowCommunity),
+  Follow(Follow),
+  UndoFollow(UndoFollow),
   Report(Report),
   // This is a catch-all and needs to be last
   AnnouncableActivities(RawAnnouncableActivities),
@@ -54,9 +50,11 @@ pub enum GroupInboxActivities {
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
 #[serde(untagged)]
-#[activity_handler(LemmyContext, LemmyError)]
+#[enum_delegate::implement(ActivityHandler)]
 pub enum PersonInboxActivities {
-  AcceptFollowCommunity(AcceptFollowCommunity),
+  AcceptFollow(AcceptFollow),
+  UndoFollow(UndoFollow),
+  FollowCommunity(Follow),
   CreateOrUpdatePrivateMessage(CreateOrUpdatePrivateMessage),
   Delete(Delete),
   UndoDelete(UndoDelete),
@@ -68,18 +66,18 @@ pub enum PersonInboxActivities {
 /// inbox can fall through to be parsed as GroupInboxActivities::AnnouncableActivities.
 #[derive(Clone, Debug, Deserialize, Serialize)]
 #[serde(untagged)]
-#[activity_handler(LemmyContext, LemmyError)]
+#[enum_delegate::implement(ActivityHandler)]
 pub enum PersonInboxActivitiesWithAnnouncable {
-  PersonInboxActivities(PersonInboxActivities),
-  AnnouncableActivities(AnnouncableActivities),
+  PersonInboxActivities(Box<PersonInboxActivities>),
+  AnnouncableActivities(Box<AnnouncableActivities>),
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
 #[serde(untagged)]
-#[activity_handler(LemmyContext, LemmyError)]
+#[enum_delegate::implement(ActivityHandler)]
 pub enum AnnouncableActivities {
   CreateOrUpdateComment(CreateOrUpdateComment),
-  CreateOrUpdatePost(Box<CreateOrUpdatePost>),
+  CreateOrUpdatePost(CreateOrUpdatePost),
   Vote(Vote),
   UndoVote(UndoVote),
   Delete(Delete),
@@ -95,7 +93,7 @@ pub enum AnnouncableActivities {
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
 #[serde(untagged)]
-#[activity_handler(LemmyContext, LemmyError)]
+#[enum_delegate::implement(ActivityHandler)]
 #[allow(clippy::enum_variant_names)]
 pub enum SiteInboxActivities {
   BlockUser(BlockUser),
@@ -133,7 +131,12 @@ impl GetCommunity for AnnouncableActivities {
 #[cfg(test)]
 mod tests {
   use crate::{
-    activity_lists::{GroupInboxActivities, PersonInboxActivities, SiteInboxActivities},
+    activity_lists::{
+      GroupInboxActivities,
+      PersonInboxActivities,
+      PersonInboxActivitiesWithAnnouncable,
+      SiteInboxActivities,
+    },
     protocol::tests::test_parse_lemmy_item,
   };
 
@@ -151,11 +154,11 @@ mod tests {
   fn test_person_inbox() {
     test_parse_lemmy_item::<PersonInboxActivities>("assets/lemmy/activities/following/accept.json")
       .unwrap();
-    test_parse_lemmy_item::<PersonInboxActivities>(
+    test_parse_lemmy_item::<PersonInboxActivitiesWithAnnouncable>(
       "assets/lemmy/activities/create_or_update/create_note.json",
     )
     .unwrap();
-    test_parse_lemmy_item::<PersonInboxActivities>(
+    test_parse_lemmy_item::<PersonInboxActivitiesWithAnnouncable>(
       "assets/lemmy/activities/create_or_update/create_private_message.json",
     )
     .unwrap();