Rewrite remaining activities (#1712)

[lemmy.git] / crates / apub / src / activities / undo_remove.rs

diff --git a/crates/apub/src/activities/removal/undo_remove.rs b/crates/apub/src/activities/undo_remove.rs
similarity index 69%
rename from crates/apub/src/activities/removal/undo_remove.rs
rename to crates/apub/src/activities/undo_remove.rs
index e2c7ef76f34a64dcecd214c64a9d739b412ba700..03b2f888e16b71728227f90837088d5affba2e49 100644 (file)
--- a/crates/apub/src/activities/removal/undo_remove.rs
+++ b/crates/apub/src/activities/undo_remove.rs
@@ -1,25 +1,35 @@
 use crate::activities::{
+  community::remove_mod::RemoveMod,
   deletion::{undo_delete::UndoDelete, verify_delete_activity},
-  removal::remove::RemoveMod,
   verify_activity,
 };
-use activitystreams::activity::kind::UndoType;
-use lemmy_apub_lib::{values::PublicUrl, ActivityCommonFields, ActivityHandler};
+use activitystreams::{
+  activity::kind::UndoType,
+  base::AnyBase,
+  primitives::OneOrMany,
+  unparsed::Unparsed,
+};
+use lemmy_apub_lib::{values::PublicUrl, ActivityFields, ActivityHandler};
 use lemmy_utils::LemmyError;
 use lemmy_websocket::LemmyContext;
+use serde::{Deserialize, Serialize};
 use url::Url;
 
-#[derive(Clone, Debug, serde::Deserialize, serde::Serialize)]
+#[derive(Clone, Debug, Deserialize, Serialize, ActivityFields)]
 #[serde(rename_all = "camelCase")]
 pub struct UndoRemovePostCommentOrCommunity {
+  actor: Url,
   to: PublicUrl,
   // Note, there is no such thing as Undo/Remove/Mod, so we ignore that
   object: RemoveMod,
   cc: [Url; 1],
   #[serde(rename = "type")]
   kind: UndoType,
+  id: Url,
+  #[serde(rename = "@context")]
+  context: OneOrMany<AnyBase>,
   #[serde(flatten)]
-  common: ActivityCommonFields,
+  unparsed: Unparsed,
 }
 
 #[async_trait::async_trait(?Send)]
@@ -29,13 +39,13 @@ impl ActivityHandler for UndoRemovePostCommentOrCommunity {
     context: &LemmyContext,
     request_counter: &mut i32,
   ) -> Result<(), LemmyError> {
-    verify_activity(self.common())?;
+    verify_activity(self)?;
     self.object.verify(context, request_counter).await?;
 
     verify_delete_activity(
       &self.object.object,
+      self,
       &self.cc[0],
-      self.common(),
       true,
       context,
       request_counter,
@@ -51,8 +61,4 @@ impl ActivityHandler for UndoRemovePostCommentOrCommunity {
   ) -> Result<(), LemmyError> {
     UndoDelete::receive_undo_remove_action(&self.object.object, context).await
   }
-
-  fn common(&self) -> &ActivityCommonFields {
-    &self.common
-  }
 }