X-Git-Url: http://these/git/?a=blobdiff_plain;f=crates%2Fapub%2Fsrc%2Factivity_lists.rs;h=4cce3372fa01a6cba14e67efb7e959e97fe05cf3;hb=92568956353f21649ed9aff68b42699c9d036f30;hp=86e87a2a3cc047f16a08b947a29398f2e5077a21;hpb=a0fed24ceeb7961e9e16045cdca55f3f756edaae;p=lemmy.git

diff --git a/crates/apub/src/activity_lists.rs b/crates/apub/src/activity_lists.rs
index 86e87a2a..4cce3372 100644
--- a/crates/apub/src/activity_lists.rs
+++ b/crates/apub/src/activity_lists.rs
@@ -1,41 +1,42 @@
 use crate::{
-  activities::community::announce::GetCommunity,
   objects::community::ApubCommunity,
   protocol::{
     activities::{
       block::{block_user::BlockUser, undo_block_user::UndoBlockUser},
       community::{
-        add_mod::AddMod,
         announce::{AnnounceActivity, RawAnnouncableActivities},
-        remove_mod::RemoveMod,
+        collection_add::CollectionAdd,
+        collection_remove::CollectionRemove,
+        lock_page::{LockPage, UndoLockPage},
         report::Report,
         update::UpdateCommunity,
       },
       create_or_update::{
-        comment::CreateOrUpdateComment,
-        post::CreateOrUpdatePost,
-        private_message::CreateOrUpdatePrivateMessage,
+        chat_message::CreateOrUpdateChatMessage,
+        note::CreateOrUpdateNote,
+        page::CreateOrUpdatePage,
       },
       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,
+    InCommunity,
   },
 };
-use activitypub_federation::{deser::context::WithContext, traits::activity_handler};
+use activitypub_federation::{
+  config::Data,
+  protocol::context::WithContext,
+  traits::ActivityHandler,
+};
+use lemmy_api_common::context::LemmyContext;
 use lemmy_utils::error::LemmyError;
-use lemmy_websocket::LemmyContext;
 use serde::{Deserialize, Serialize};
 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 +44,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,10 +55,12 @@ pub enum GroupInboxActivities {
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
 #[serde(untagged)]
-#[activity_handler(LemmyContext, LemmyError)]
+#[enum_delegate::implement(ActivityHandler)]
 pub enum PersonInboxActivities {
-  AcceptFollowCommunity(AcceptFollowCommunity),
-  CreateOrUpdatePrivateMessage(CreateOrUpdatePrivateMessage),
+  Follow(Follow),
+  AcceptFollow(AcceptFollow),
+  UndoFollow(UndoFollow),
+  CreateOrUpdatePrivateMessage(CreateOrUpdateChatMessage),
   Delete(Delete),
   UndoDelete(UndoDelete),
   AnnounceActivity(AnnounceActivity),
@@ -68,18 +71,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>),
+  CreateOrUpdateComment(CreateOrUpdateNote),
+  CreateOrUpdatePost(CreateOrUpdatePage),
   Vote(Vote),
   UndoVote(UndoVote),
   Delete(Delete),
@@ -87,15 +90,17 @@ pub enum AnnouncableActivities {
   UpdateCommunity(UpdateCommunity),
   BlockUser(BlockUser),
   UndoBlockUser(UndoBlockUser),
-  AddMod(AddMod),
-  RemoveMod(RemoveMod),
+  CollectionAdd(CollectionAdd),
+  CollectionRemove(CollectionRemove),
+  LockPost(LockPage),
+  UndoLockPost(UndoLockPage),
   // For compatibility with Pleroma/Mastodon (send only)
   Page(Page),
 }
 
 #[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),
@@ -103,38 +108,43 @@ pub enum SiteInboxActivities {
   DeleteUser(DeleteUser),
 }
 
-#[async_trait::async_trait(?Send)]
-impl GetCommunity for AnnouncableActivities {
+#[async_trait::async_trait]
+impl InCommunity for AnnouncableActivities {
   #[tracing::instrument(skip(self, context))]
-  async fn get_community(
-    &self,
-    context: &LemmyContext,
-    request_counter: &mut i32,
-  ) -> Result<ApubCommunity, LemmyError> {
+  async fn community(&self, context: &Data<LemmyContext>) -> Result<ApubCommunity, LemmyError> {
     use AnnouncableActivities::*;
-    let community = match self {
-      CreateOrUpdateComment(a) => a.get_community(context, request_counter).await?,
-      CreateOrUpdatePost(a) => a.get_community(context, request_counter).await?,
-      Vote(a) => a.get_community(context, request_counter).await?,
-      UndoVote(a) => a.get_community(context, request_counter).await?,
-      Delete(a) => a.get_community(context, request_counter).await?,
-      UndoDelete(a) => a.get_community(context, request_counter).await?,
-      UpdateCommunity(a) => a.get_community(context, request_counter).await?,
-      BlockUser(a) => a.get_community(context, request_counter).await?,
-      UndoBlockUser(a) => a.get_community(context, request_counter).await?,
-      AddMod(a) => a.get_community(context, request_counter).await?,
-      RemoveMod(a) => a.get_community(context, request_counter).await?,
+    match self {
+      CreateOrUpdateComment(a) => a.community(context).await,
+      CreateOrUpdatePost(a) => a.community(context).await,
+      Vote(a) => a.community(context).await,
+      UndoVote(a) => a.community(context).await,
+      Delete(a) => a.community(context).await,
+      UndoDelete(a) => a.community(context).await,
+      UpdateCommunity(a) => a.community(context).await,
+      BlockUser(a) => a.community(context).await,
+      UndoBlockUser(a) => a.community(context).await,
+      CollectionAdd(a) => a.community(context).await,
+      CollectionRemove(a) => a.community(context).await,
+      LockPost(a) => a.community(context).await,
+      UndoLockPost(a) => a.community(context).await,
       Page(_) => unimplemented!(),
-    };
-    Ok(community)
+    }
   }
 }
 
 #[cfg(test)]
 mod tests {
+  #![allow(clippy::unwrap_used)]
+  #![allow(clippy::indexing_slicing)]
+
   use crate::{
-    activity_lists::{GroupInboxActivities, PersonInboxActivities, SiteInboxActivities},
-    protocol::tests::test_parse_lemmy_item,
+    activity_lists::{
+      GroupInboxActivities,
+      PersonInboxActivities,
+      PersonInboxActivitiesWithAnnouncable,
+      SiteInboxActivities,
+    },
+    protocol::tests::{test_json, test_parse_lemmy_item},
   };
 
   #[test]
@@ -151,14 +161,16 @@ 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();
+    test_json::<PersonInboxActivitiesWithAnnouncable>("assets/mastodon/activities/follow.json")
+      .unwrap();
   }
 
   #[test]