add deliverer trait

crates/kitsune-activitypub/src/lib.rs

@@ -37,6 +37,7 @@ use typed_builder::TypedBuilder;
 pub mod deliverer;
 pub mod error;
 pub mod fetcher;
+pub mod inbox_resolver;
 
 pub use self::{deliverer::Deliverer, fetcher::Fetcher};
 

crates/kitsune-core/src/error.rs

@@ -1,9 +1,8 @@
-use std::error::Error as ErrorTrait;
-
 use kitsune_http_signatures::ring;
+use std::error::Error as StdError;
 use thiserror::Error;
 
-pub type BoxError = Box<dyn ErrorTrait + Send + Sync>;
+pub type BoxError = Box<dyn StdError + Send + Sync>;
 pub type Result<T, E = Error> = std::result::Result<T, E>;
 
 #[derive(Debug, Error)]

crates/kitsune-core/src/resolve/mod.rs

@@ -1,5 +1,3 @@
-mod inbox;
 mod post;
 
-pub use self::inbox::InboxResolver;
 pub use self::post::PostResolver;

crates/kitsune-core/src/traits.rs

@@ -1,3 +1,4 @@
+use crate::error::BoxError;
 use kitsune_db::model::{account::Account, custom_emoji::CustomEmoji, post::Post};
 use serde::{Deserialize, Serialize};
 use std::future::Future;
@@ -39,8 +40,44 @@ pub struct AccountResource {
     pub domain: String,
 }
 
+#[derive(Clone)]
+pub enum Action {
+    Create(Post),
+    Delete(Post),
+    Favourite(Post),
+    Repost(Post),
+    Unfavourite(Post),
+    Unrepost(Post),
+    UpdateAccount(Account),
+    UpdatePost(Post),
+}
+
+pub trait Deliverer: Send + Sync {
+    type Error: Into<BoxError>;
+
+    fn deliver(&self, action: Action) -> impl Future<Output = Result<(), Self::Error>> + Send;
+}
+
+impl<T> Deliverer for [T]
+where
+    T: Deliverer,
+{
+    type Error = BoxError;
+
+    async fn deliver(&self, action: Action) -> Result<(), Self::Error> {
+        for deliverer in self {
+            deliverer
+                .deliver(action.clone())
+                .await
+                .map_err(Into::into)?;
+        }
+
+        Ok(())
+    }
+}
+
 pub trait Fetcher {
-    type Error;
+    type Error: Into<BoxError>;
 
     fn fetch_account(
         &self,
@@ -56,7 +93,7 @@ pub trait Fetcher {
 }
 
 pub trait Resolver {
-    type Error;
+    type Error: Into<BoxError>;
 
     fn resolve_account(
         &self,

crates/kitsune-webfinger/Cargo.toml

@@ -14,7 +14,6 @@ kitsune-core = { path = "../kitsune-core" }
 kitsune-http-client = { path = "../kitsune-http-client" }
 kitsune-type = { path = "../kitsune-type" }
 kitsune-util = { path = "../kitsune-util" }
-serde = { version = "1.0.192", features = ["derive"] }
 thiserror = "1.0.50"
 tracing = "0.1.40"
 

crates/kitsune-webfinger/tests/redirects.rs

@@ -116,7 +116,7 @@ async fn reject_unbounded_number_of_jrd_redirects() {
 
     let webfinger = Webfinger::with_client(client, Arc::new(NoopCache.into()));
     let resource = webfinger
-        .resolve_actor("0x0", "corteximplant.com")
+        .resolve_account("0x0", "corteximplant.com")
         .await
         .expect("Failed to fetch resource");