When announcing incoming activities, keep extra fields (#2550)

[lemmy.git] / crates / apub / src / protocol / activities / community / announce.rs

diff --git a/crates/apub/src/protocol/activities/community/announce.rs b/crates/apub/src/protocol/activities/community/announce.rs
index 9db17a0fef48cfc2f5085740da87c160c338733b..7c2e16ec6b648775c56e2d639a2b9c00cb0fa676 100644 (file)
--- a/crates/apub/src/protocol/activities/community/announce.rs
+++ b/crates/apub/src/protocol/activities/community/announce.rs
@@ -1,11 +1,8 @@
-use crate::{
-  activity_lists::AnnouncableActivities,
-  objects::community::ApubCommunity,
-  protocol::{IdOrNestedObject, Unparsed},
-};
+use crate::{objects::community::ApubCommunity, protocol::IdOrNestedObject};
 use activitypub_federation::{core::object_id::ObjectId, deser::helpers::deserialize_one_or_many};
 use activitystreams_kinds::activity::AnnounceType;
 use serde::{Deserialize, Serialize};
+use serde_json::{Map, Value};
 use url::Url;
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
@@ -14,13 +11,20 @@ pub struct AnnounceActivity {
   pub(crate) actor: ObjectId<ApubCommunity>,
   #[serde(deserialize_with = "deserialize_one_or_many")]
   pub(crate) to: Vec<Url>,
-  pub(crate) object: IdOrNestedObject<AnnouncableActivities>,
+  pub(crate) object: IdOrNestedObject<RawAnnouncableActivities>,
   #[serde(deserialize_with = "deserialize_one_or_many")]
   pub(crate) cc: Vec<Url>,
   #[serde(rename = "type")]
   pub(crate) kind: AnnounceType,
   pub(crate) id: Url,
+}
 
+/// Use this to receive community inbox activities, and then announce them if valid. This
+/// ensures that all json fields are kept, even if Lemmy doesnt understand them.
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct RawAnnouncableActivities {
+  pub(crate) id: Url,
+  pub(crate) actor: Url,
   #[serde(flatten)]
-  pub(crate) unparsed: Unparsed,
+  pub(crate) other: Map<String, Value>,
 }