Testing domainservd

Signed-off-by: Till Wegmueller <[email protected]>

crates/activitypub/src/activities.rs

@@ -1,15 +1,43 @@
 use crate::*;
+use activitypub_federation::protocol::helpers::deserialize_skip_error;
+use serde_json::Value;
+use std::collections::HashMap;
 
 #[derive(Debug, Serialize, Deserialize)]
 #[serde(tag = "type")]
 pub enum Activity {
-    Create {
-        context: Context,
-        id: Url,
-        actor: Url,
-        published: chrono::NaiveDateTime,
-        to: Vec<Url>,
-        cc: Vec<Url>,
-        object: Object,
-    },
+    Create(Create),
+    Follow(Follow),
+    Accept(Accept),
+}
+
+#[derive(Debug, Serialize, Deserialize, Clone)]
+pub struct Create {
+    pub context: Context,
+    pub id: Url,
+    pub actor: Url,
+    pub published: chrono::NaiveDateTime,
+    pub to: Vec<Url>,
+    pub cc: Option<Vec<Url>>,
+    pub object: HashMap<String, Value>,
+}
+
+#[derive(Debug, Serialize, Deserialize, Clone)]
+pub struct Follow {
+    pub context: Context,
+    pub id: Url,
+    pub actor: Url,
+    #[serde(deserialize_with = "deserialize_skip_error", default)]
+    pub to: Option<[Url; 1]>,
+    pub object: Url,
+}
+
+#[derive(Debug, Serialize, Deserialize, Clone)]
+pub struct Accept {
+    pub context: Context,
+    pub id: Url,
+    pub actor: Url,
+    #[serde(deserialize_with = "deserialize_skip_error", default)]
+    pub to: Option<[Url; 1]>,
+    pub object: Follow,
 }

crates/activitypub/src/lib.rs

@@ -10,6 +10,8 @@ use serde_json::Value;
 use serde_with::skip_serializing_none;
 use url::Url;
 
+pub const PUBLIC_ACTOR_URL: &str = "";
+
 /// Public key of actors which is used for HTTP signatures.
 ///
 /// This needs to be federated in the `public_key` field of all actors.
@@ -42,14 +44,14 @@ pub fn main_key_id(owner: &Url) -> String {
     format!("{}#main-key", &owner)
 }
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize, Clone)]
 #[serde(untagged)]
 pub enum Context {
     Single(KnownContext),
     List(Vec<KnownContext>),
 }
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize, Clone)]
 pub enum KnownContext {
     #[serde(rename = "https://www.w3.org/ns/activitystreams")]
     ActivityStreams,

crates/domainservd/.gitignore

@@ -0,0 +1,2 @@
+domainservd.toml
+keys

crates/domainservd/Cargo.toml

@@ -16,7 +16,7 @@ serde.workspace = true
 serde_json.workspace = true
 activitypub.workspace = true
 thiserror.workspace = true
-miette.workspace = true
+miette = { workspace = true, features = ["fancy"] }
 clap.workspace = true
 tracing.workspace = true
 tracing-subscriber.workspace = true

crates/domainservd/sample_data/follow_toasterson.json

@@ -0,0 +1,13 @@
+{
+  "context": [
+    "https://www.w3.org/ns/activitystreams",
+    "https://w3id.org/security/v1"
+  ],
+  "type": "Follow",
+  "id": "https://abomb.zip/objects/blubber",
+  "actor": "https://abomb.zip/actors/Toasterson",
+  "to": [
+    "https://hephaistos.taileff33.ts.net/actors/Toasterson"
+  ],
+  "object": "https://hephaistos.taileff33.ts.net/actors/Toasterson"
+}