diff --git a/.gitconfig b/.gitconfig new file mode 100644 index 0000000..cbd0f84 --- /dev/null +++ b/.gitconfig @@ -0,0 +1,3 @@ +[user] + name = _ + email = _@_ diff --git a/crates/ptth_relay/src/config.rs b/crates/ptth_relay/src/config.rs index 3a6ff73..389340e 100644 --- a/crates/ptth_relay/src/config.rs +++ b/crates/ptth_relay/src/config.rs @@ -66,6 +66,8 @@ pub mod file { // Adding a DB will take a while, so I'm moving these out of dev mode. pub scraper_keys: Option >>, + + pub news_url: Option , } } @@ -77,6 +79,7 @@ pub struct Config { pub port: Option , pub servers: HashMap , pub scraper_keys: HashMap >, + pub news_url: Option , } impl TryFrom for Config { @@ -101,6 +104,7 @@ impl TryFrom for Config { port: f.port, servers, scraper_keys, + news_url: f.news_url.clone (), }) } } diff --git a/crates/ptth_relay/src/lib.rs b/crates/ptth_relay/src/lib.rs index c6921d7..841c176 100644 --- a/crates/ptth_relay/src/lib.rs +++ b/crates/ptth_relay/src/lib.rs @@ -269,6 +269,7 @@ struct ServerListPage <'a> { dev_mode: bool, git_version: Option , servers: Vec >, + news_url: Option , } #[derive (Serialize)] @@ -288,17 +289,19 @@ struct AuditLogPage { audit_log: Vec , } - - async fn handle_server_list_internal (state: &Arc ) -> ServerListPage <'static> { use LastSeen::*; - let dev_mode = { + let dev_mode; + let news_url; + + { let guard = state.config.read ().await; - guard.iso.dev_mode.is_some () - }; + dev_mode = guard.iso.dev_mode.is_some (); + news_url = guard.news_url.clone (); + } let git_version = git_version::read ().await; let server_list = scraper_api::v1_server_list (&state).await; @@ -328,6 +331,7 @@ async fn handle_server_list_internal (state: &Arc ) dev_mode, git_version, servers, + news_url, } } diff --git a/handlebars/relay/server_list.hbs b/handlebars/relay/server_list.hbs index 15869d3..9dd799e 100644 --- a/handlebars/relay/server_list.hbs +++ b/handlebars/relay/server_list.hbs @@ -44,11 +44,10 @@ AIABAACAAQAAgAEAAIABAACAAQAAgAEAAIABAACAAQAA" rel="icon" type="image/x-icon" />
Relay is in dev mode. This should never be seen in production!
{{/if}} +{{#if news_url}}

-Unregistered servers - -

-Audit log +News +{{/if}}

{{#if servers}} @@ -75,6 +74,14 @@ AIABAACAAQAAgAEAAIABAACAAQAAgAEAAIABAACAAQAA" rel="icon" type="image/x-icon" /> {{/if}}
+

Admin

+ +

+Unregistered servers + +

+Audit log +

{{#if git_version}} Git version: {{git_version}}