From 74802522c2a50ec06613e37bdcab32e90203d143 Mon Sep 17 00:00:00 2001 From: Greg Heartsfield Date: Sun, 11 Sep 2022 11:01:36 -0500 Subject: [PATCH] improvement: do not create NIP-05 thread if feature is disabled --- src/config.rs | 2 +- src/server.rs | 21 ++++++++++++--------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/config.rs b/src/config.rs index 45c56af..dc8473f 100644 --- a/src/config.rs +++ b/src/config.rs @@ -64,7 +64,7 @@ pub struct Authorization { pub pubkey_whitelist: Option>, // If present, only allow these pubkeys to publish events } -#[derive(Serialize, Deserialize, PartialEq, Debug, Clone)] +#[derive(Serialize, Deserialize, PartialEq, Debug, Clone, Copy)] #[serde(rename_all = "lowercase")] pub enum VerifiedUsersMode { Enabled, diff --git a/src/server.rs b/src/server.rs index a67547c..3ec135f 100644 --- a/src/server.rs +++ b/src/server.rs @@ -1,7 +1,7 @@ //! Server process use crate::close::Close; use crate::close::CloseCmd; -use crate::config::Settings; +use crate::config::{Settings, VerifiedUsersMode}; use crate::conn; use crate::db; use crate::db::SubmittedEvent; @@ -253,14 +253,17 @@ pub fn start_server(settings: Settings, shutdown_rx: MpscReceiver<()>) -> Result .await; info!("db writer created"); - // create a nip-05 verifier thread - let verifier_opt = nip05::Verifier::new(metadata_rx, bcast_tx.clone(), settings.clone()); - if let Ok(mut v) = verifier_opt { - if verified_users_active { - tokio::task::spawn(async move { - info!("starting up NIP-05 verifier..."); - v.run().await; - }); + // create a nip-05 verifier thread; if enabled. + if settings.verified_users.mode != VerifiedUsersMode::Disabled { + let verifier_opt = + nip05::Verifier::new(metadata_rx, bcast_tx.clone(), settings.clone()); + if let Ok(mut v) = verifier_opt { + if verified_users_active { + tokio::task::spawn(async move { + info!("starting up NIP-05 verifier..."); + v.run().await; + }); + } } } // listen for (external to tokio) shutdown request