Fixing some defaults

pull/1672/head
Dessalines 3 years ago
parent 4ebddab10b
commit e26acd8413

@ -132,35 +132,52 @@ impl Settings {
Ok(Self::read_config_file()?) Ok(Self::read_config_file()?)
} }
pub(crate) fn actor_name_max_length(&self) -> usize {
self
.actor_name_max_length
.unwrap_or_else(|| Settings::default().actor_name_max_length.unwrap())
}
pub fn database(&self) -> DatabaseConfig {
self.database.to_owned().unwrap_or_default()
}
pub fn hostname(&self) -> String { pub fn hostname(&self) -> String {
self.hostname.to_owned().unwrap_or_default() self.hostname.to_owned().expect("No hostname given")
} }
pub fn bind(&self) -> IpAddr { pub fn bind(&self) -> IpAddr {
self.bind.expect("return bind address") self.bind.expect("return bind address")
} }
pub fn port(&self) -> u16 { pub fn port(&self) -> u16 {
self.port.unwrap_or_default() self
.port
.unwrap_or_else(|| Settings::default().port.expect("missing port"))
} }
pub fn tls_enabled(&self) -> bool { pub fn tls_enabled(&self) -> bool {
self.tls_enabled.unwrap_or_default() self.tls_enabled.unwrap_or_else(|| {
Settings::default()
.tls_enabled
.expect("missing tls_enabled")
})
} }
pub fn jwt_secret(&self) -> String { pub fn jwt_secret(&self) -> String {
self.jwt_secret.to_owned().unwrap_or_default() self
.jwt_secret
.to_owned()
.unwrap_or_else(|| Settings::default().jwt_secret.expect("missing jwt_secret"))
} }
pub fn pictrs_url(&self) -> String { pub fn pictrs_url(&self) -> String {
self.pictrs_url.to_owned().unwrap_or_default() self
.pictrs_url
.to_owned()
.unwrap_or_else(|| Settings::default().pictrs_url.expect("missing pictrs_url"))
} }
pub fn iframely_url(&self) -> String { pub fn iframely_url(&self) -> String {
self.iframely_url.to_owned().unwrap_or_default() self.iframely_url.to_owned().unwrap_or_else(|| {
Settings::default()
.iframely_url
.expect("missing iframely_url")
})
}
pub fn actor_name_max_length(&self) -> usize {
self.actor_name_max_length.unwrap_or_else(|| {
Settings::default()
.actor_name_max_length
.expect("missing actor name length")
})
}
pub fn database(&self) -> DatabaseConfig {
self.database.to_owned().unwrap_or_default()
} }
pub fn rate_limit(&self) -> RateLimitConfig { pub fn rate_limit(&self) -> RateLimitConfig {
self.rate_limit.to_owned().unwrap_or_default() self.rate_limit.to_owned().unwrap_or_default()

@ -21,8 +21,6 @@ pub struct Settings {
pub(crate) actor_name_max_length: Option<usize>, pub(crate) actor_name_max_length: Option<usize>,
} }
impl Settings {}
#[derive(Debug, Deserialize, Clone)] #[derive(Debug, Deserialize, Clone)]
pub struct CaptchaConfig { pub struct CaptchaConfig {
pub enabled: bool, pub enabled: bool,

Loading…
Cancel
Save