From 3e196558efdd0909e62af972e6390054fd4742d0 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Mon, 22 Jul 2024 07:12:35 +0100 Subject: [PATCH] WIP --- crates/config/src/tests.rs | 2 +- crates/server-actor/src/lib.rs | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/crates/config/src/tests.rs b/crates/config/src/tests.rs index dfdb683..6a77012 100644 --- a/crates/config/src/tests.rs +++ b/crates/config/src/tests.rs @@ -468,7 +468,7 @@ mod server { let http = &server_config.http()?; let http_addr = http.ip(); let http_port = server_config.http()?.port(); - let webhook_url = server_config.webhook().base_url(); + let webhook_url = server_config.inbound_webhook().base_url(); let storage_path = server_config.storage().path(); let notification_webhook_url = server_config .notification() diff --git a/crates/server-actor/src/lib.rs b/crates/server-actor/src/lib.rs index 88b549f..d55b7df 100644 --- a/crates/server-actor/src/lib.rs +++ b/crates/server-actor/src/lib.rs @@ -14,6 +14,7 @@ use git_next_repo_actor::messages::NotifyUser; use git_next_repo_actor::{messages::CloneRepo, RepoActor}; use git_next_webhook_actor as webhook; use kxio::{fs::FileSystem, network::Network}; +use standardwebhooks::Webhook; use std::{ collections::BTreeMap, path::PathBuf, @@ -53,6 +54,7 @@ pub struct ServerActor { repository_factory: Box, sleep_duration: std::time::Duration, repo_actors: BTreeMap<(ForgeAlias, RepoAlias), Addr>, + webhook: Option, // testing message_log: Option>>>, @@ -70,6 +72,7 @@ impl ServerActor { ) -> Self { let generation = Generation::default(); Self { + server_config: None, generation, webhook_actor_addr: None, fs, @@ -77,7 +80,7 @@ impl ServerActor { repository_factory: repo, sleep_duration, repo_actors: BTreeMap::new(), - server_config: None, + webhook: None, message_log: None, } }