add federation crate

Cargo.toml

@@ -25,6 +25,7 @@ members = [
     "crates/kitsune-db",
     "crates/kitsune-email",
     "crates/kitsune-embed",
+    "crates/kitsune-federation",
     "crates/kitsune-federation-filter",
     "crates/kitsune-http-client",
     "crates/kitsune-http-signatures",

crates/kitsune-activitypub/src/error.rs

@@ -74,8 +74,8 @@ pub enum Error {
 }
 
 impl From<Infallible> for Error {
-    fn from(_: Infallible) -> Self {
-        unreachable!();
+    fn from(err: Infallible) -> Self {
+        match err {}
     }
 }
 

crates/kitsune-core/src/lib.rs

@@ -15,10 +15,8 @@ extern crate tracing;
 pub mod error;
 pub mod event;
 //pub mod mapping;
-//pub mod resolve;
 //pub mod state;
 pub mod traits;
-//pub mod util;
 
 /*
 use self::{

crates/kitsune-core/src/traits/fetcher.rs

@@ -3,7 +3,7 @@ use kitsune_db::model::{account::Account, custom_emoji::CustomEmoji, post::Post}
 use std::future::Future;
 use typed_builder::TypedBuilder;
 
-#[derive(Clone, Debug, TypedBuilder)]
+#[derive(Clone, Copy, Debug, TypedBuilder)]
 /// Options passed to the fetcher
 pub struct AccountFetchOptions<'a> {
     /// Prefetched WebFinger `acct` URI
@@ -43,3 +43,7 @@ pub trait Fetcher: Send + Sync + 'static {
 
     fn fetch_post(&self, url: &str) -> impl Future<Output = Result<Post, Self::Error>> + Send;
 }
+
+// TODO: How can we implement this trait for an array?
+// Probably by changing the return type to a `Result<Option>` and then just fatally failing on actual errors
+// Would make the most sense.

crates/kitsune-federation/Cargo.toml

@@ -0,0 +1,12 @@
+[package]
+name = "kitsune-federation"
+edition.workspace = true
+version.workspace = true
+
+[dependencies]
+derive_more = { version = "1.0.0-beta.6", features = ["from"] }
+futures-util = "0.3.29"
+kitsune-activitypub = { path = "../kitsune-activitypub" }
+kitsune-core = { path = "../kitsune-core" }
+kitsune-db = { path = "../kitsune-db" }
+kitsune-webfinger = { path = "../kitsune-webfinger" }

crates/kitsune-federation/src/lib.rs

@@ -0,0 +1,70 @@
+use derive_more::From;
+use futures_util::{future::BoxFuture, FutureExt, TryFutureExt};
+use kitsune_activitypub::{Deliverer as ActivityPubDeliverer, Fetcher as ActivityPubFetcher};
+use kitsune_core::{
+    error::BoxError,
+    traits::{deliverer, fetcher::AccountFetchOptions, Deliverer, Fetcher},
+};
+use kitsune_db::model::{account::Account, custom_emoji::CustomEmoji, post::Post};
+use kitsune_webfinger::Webfinger;
+use std::sync::Arc;
+
+pub struct Federator {
+    pub deliverer: Vec<AnyDeliverer>,
+    pub fetcher: Vec<AnyFetcher>,
+}
+
+#[derive(Clone, From)]
+pub enum AnyDeliverer {
+    ActivityPub(Arc<ActivityPubDeliverer>),
+}
+
+impl Deliverer for AnyDeliverer {
+    type Error = BoxError;
+
+    fn deliver(&self, action: deliverer::Action) -> BoxFuture<'_, Result<(), Self::Error>> {
+        match self {
+            Self::ActivityPub(deliverer) => deliverer.deliver(action).map_err(Into::into).boxed(),
+        }
+    }
+}
+
+#[derive(Clone, From)]
+pub enum AnyFetcher {
+    ActivityPub(ActivityPubFetcher<Webfinger>),
+}
+
+impl Fetcher for AnyFetcher {
+    type Error = BoxError;
+
+    async fn fetch_account(&self, opts: AccountFetchOptions<'_>) -> Result<Account, Self::Error> {
+        match self {
+            Self::ActivityPub(fetcher) => fetcher.fetch_account(opts).await.map_err(Into::into),
+        }
+    }
+
+    async fn fetch_emoji(&self, url: &str) -> Result<CustomEmoji, Self::Error> {
+        match self {
+            Self::ActivityPub(fetcher) => fetcher.fetch_emoji(url).await.map_err(Into::into),
+        }
+    }
+
+    async fn fetch_post(&self, url: &str) -> Result<Post, Self::Error> {
+        match self {
+            Self::ActivityPub(fetcher) => fetcher.fetch_post(url).await.map_err(Into::into),
+        }
+    }
+}
+
+fn prepare_activitypub() -> (ActivityPubFetcher<Webfinger>, Arc<ActivityPubDeliverer>) {
+    todo!();
+}
+
+pub fn prepare_federator() -> Federator {
+    let (fetcher, deliverer) = prepare_activitypub();
+
+    Federator {
+        deliverer: vec![deliverer.into()],
+        fetcher: vec![fetcher.into()],
+    }
+}

crates/kitsune-service/src/account.rs

@@ -337,6 +337,7 @@ where
                 .acct((&webfinger_actor.username, &webfinger_actor.domain))
                 .url(&webfinger_actor.uri)
                 .build();
+
             self.fetcher
                 .fetch_account(opts)
                 .await

kitsune-job-runner/src/lib.rs

@@ -37,7 +37,11 @@ pub async fn run_dispatcher(
     let deliverer = Deliverer::builder()
         .federation_filter(state.service.federation_filter.clone())
         .build();
-    let ctx = Arc::new(JobRunnerContext { deliverer, state });
+
+    let ctx = Arc::new(JobRunnerContext {
+        db_pool: state.db_pool,
+        deliverer,
+    });
 
     let mut job_joinset = JoinSet::new();
     loop {