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 c9debefaa2fb97c0dbd8a7e3982355635c800bb5..242f26a1f5088218b1ec1c4ed94cbe5bc371cc0b 100644 (file)
--- a/crates/apub/src/activity_lists.rs
+++ b/crates/apub/src/activity_lists.rs
@@ -6,7 +6,7 @@ use crate::{
       block::{block_user::BlockUser, undo_block_user::UndoBlockUser},
       community::{
         add_mod::AddMod,
-        announce::AnnounceActivity,
+        announce::{AnnounceActivity, RawAnnouncableActivities},
         remove_mod::RemoveMod,
         report::Report,
         update::UpdateCommunity,
@@ -17,62 +17,67 @@ 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,
-    Id,
   },
 };
-use lemmy_apub_lib::traits::ActivityHandler;
-use lemmy_utils::LemmyError;
+use activitypub_federation::{data::Data, deser::context::WithContext, traits::ActivityHandler};
+use lemmy_utils::error::LemmyError;
 use lemmy_websocket::LemmyContext;
 use serde::{Deserialize, Serialize};
 use url::Url;
 
-#[derive(Clone, Debug, Deserialize, Serialize, ActivityHandler)]
+#[derive(Debug, Deserialize, Serialize)]
 #[serde(untagged)]
-#[activity_handler(LemmyContext)]
+#[enum_delegate::implement(ActivityHandler)]
 pub enum SharedInboxActivities {
-  GroupInboxActivities(Box<GroupInboxActivities>),
-  // Note, pm activities need to be at the end, otherwise comments will end up here. We can probably
-  // avoid this problem by replacing createpm.object with our own struct, instead of NoteExt.
-  PersonInboxActivities(Box<PersonInboxActivities>),
+  PersonInboxActivities(Box<WithContext<PersonInboxActivities>>),
+  GroupInboxActivities(Box<WithContext<GroupInboxActivities>>),
 }
 
-#[derive(Clone, Debug, Deserialize, Serialize, ActivityHandler)]
+#[derive(Debug, Deserialize, Serialize)]
 #[serde(untagged)]
-#[activity_handler(LemmyContext)]
+#[enum_delegate::implement(ActivityHandler)]
 pub enum GroupInboxActivities {
-  FollowCommunity(FollowCommunity),
-  UndoFollowCommunity(UndoFollowCommunity),
-  AnnouncableActivities(Box<AnnouncableActivities>),
+  Follow(Follow),
+  UndoFollow(UndoFollow),
   Report(Report),
+  // This is a catch-all and needs to be last
+  AnnouncableActivities(RawAnnouncableActivities),
 }
 
-#[derive(Clone, Debug, Deserialize, Serialize, ActivityHandler)]
+#[derive(Clone, Debug, Deserialize, Serialize)]
 #[serde(untagged)]
-#[activity_handler(LemmyContext)]
+#[enum_delegate::implement(ActivityHandler)]
 pub enum PersonInboxActivities {
-  AcceptFollowCommunity(AcceptFollowCommunity),
-  /// Some activities can also be sent from user to user, eg a comment with mentions
-  AnnouncableActivities(AnnouncableActivities),
+  AcceptFollow(AcceptFollow),
+  UndoFollow(UndoFollow),
+  FollowCommunity(Follow),
   CreateOrUpdatePrivateMessage(CreateOrUpdatePrivateMessage),
   Delete(Delete),
   UndoDelete(UndoDelete),
   AnnounceActivity(AnnounceActivity),
 }
 
-#[derive(Clone, Debug, Deserialize, Serialize, ActivityHandler)]
+/// This is necessary for user inbox, which can also receive some "announcable" activities,
+/// eg a comment mention. This needs to be a separate enum so that announcables received in shared
+/// inbox can fall through to be parsed as GroupInboxActivities::AnnouncableActivities.
+#[derive(Clone, Debug, Deserialize, Serialize)]
+#[serde(untagged)]
+#[enum_delegate::implement(ActivityHandler)]
+pub enum PersonInboxActivitiesWithAnnouncable {
+  PersonInboxActivities(Box<PersonInboxActivities>),
+  AnnouncableActivities(Box<AnnouncableActivities>),
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
 #[serde(untagged)]
-#[activity_handler(LemmyContext)]
+#[enum_delegate::implement(ActivityHandler)]
 pub enum AnnouncableActivities {
   CreateOrUpdateComment(CreateOrUpdateComment),
-  CreateOrUpdatePost(Box<CreateOrUpdatePost>),
+  CreateOrUpdatePost(CreateOrUpdatePost),
   Vote(Vote),
   UndoVote(UndoVote),
   Delete(Delete),
@@ -86,9 +91,9 @@ pub enum AnnouncableActivities {
   Page(Page),
 }
 
-#[derive(Clone, Debug, Deserialize, Serialize, ActivityHandler)]
+#[derive(Clone, Debug, Deserialize, Serialize)]
 #[serde(untagged)]
-#[activity_handler(LemmyContext)]
+#[enum_delegate::implement(ActivityHandler)]
 #[allow(clippy::enum_variant_names)]
 pub enum SiteInboxActivities {
   BlockUser(BlockUser),
@@ -123,22 +128,47 @@ impl GetCommunity for AnnouncableActivities {
   }
 }
 
-impl Id for AnnouncableActivities {
-  fn id(&self) -> &Url {
-    use AnnouncableActivities::*;
-    match self {
-      CreateOrUpdateComment(c) => &c.id,
-      CreateOrUpdatePost(c) => &c.id,
-      Vote(v) => &v.id,
-      UndoVote(u) => &u.id,
-      Delete(d) => &d.id,
-      UndoDelete(u) => &u.id,
-      UpdateCommunity(u) => &u.id,
-      BlockUser(b) => &b.id,
-      UndoBlockUser(u) => &u.id,
-      AddMod(a) => &a.id,
-      RemoveMod(r) => &r.id,
-      Page(p) => p.id.inner(),
-    }
+#[cfg(test)]
+mod tests {
+  use crate::{
+    activity_lists::{
+      GroupInboxActivities,
+      PersonInboxActivities,
+      PersonInboxActivitiesWithAnnouncable,
+      SiteInboxActivities,
+    },
+    protocol::tests::test_parse_lemmy_item,
+  };
+
+  #[test]
+  fn test_group_inbox() {
+    test_parse_lemmy_item::<GroupInboxActivities>("assets/lemmy/activities/following/follow.json")
+      .unwrap();
+    test_parse_lemmy_item::<GroupInboxActivities>(
+      "assets/lemmy/activities/create_or_update/create_note.json",
+    )
+    .unwrap();
+  }
+
+  #[test]
+  fn test_person_inbox() {
+    test_parse_lemmy_item::<PersonInboxActivities>("assets/lemmy/activities/following/accept.json")
+      .unwrap();
+    test_parse_lemmy_item::<PersonInboxActivitiesWithAnnouncable>(
+      "assets/lemmy/activities/create_or_update/create_note.json",
+    )
+    .unwrap();
+    test_parse_lemmy_item::<PersonInboxActivitiesWithAnnouncable>(
+      "assets/lemmy/activities/create_or_update/create_private_message.json",
+    )
+    .unwrap();
+  }
+
+  #[test]
+  fn test_site_inbox() {
+    test_parse_lemmy_item::<SiteInboxActivities>(
+      "assets/lemmy/activities/deletion/delete_user.json",
+    )
+    .unwrap();
   }
 }