diff options
author | Felix Ableitner <me@nutomic.com> | 2019-12-15 17:40:55 +0100 |
---|---|---|
committer | Felix Ableitner <me@nutomic.com> | 2019-12-27 17:28:44 +0100 |
commit | cf3ae15ee9289fa4030828363158b02facbab1bb (patch) | |
tree | ec4d1973f62185624fdd570267a6a73d7e3285ba /server/src/api | |
parent | 34def84d4307d1f4d822091a35d94ab090c558af (diff) |
Implement config (fixes #351)
Diffstat (limited to 'server/src/api')
-rw-r--r-- | server/src/api/mod.rs | 2 | ||||
-rw-r--r-- | server/src/api/user.rs | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/server/src/api/mod.rs b/server/src/api/mod.rs index 97a11900..07712e87 100644 --- a/server/src/api/mod.rs +++ b/server/src/api/mod.rs @@ -15,7 +15,7 @@ use crate::db::user_mention::*; use crate::db::user_mention_view::*; use crate::db::user_view::*; use crate::db::*; -use crate::{extract_usernames, has_slurs, naive_from_unix, naive_now, remove_slurs, Settings}; +use crate::{extract_usernames, has_slurs, naive_from_unix, naive_now, remove_slurs}; use failure::Error; use serde::{Deserialize, Serialize}; diff --git a/server/src/api/user.rs b/server/src/api/user.rs index df38dc99..9a343427 100644 --- a/server/src/api/user.rs +++ b/server/src/api/user.rs @@ -1,4 +1,5 @@ use super::*; +use crate::settings::Settings; use crate::{generate_random_string, send_email}; use bcrypt::verify; use std::str::FromStr; @@ -217,7 +218,7 @@ impl Perform<LoginResponse> for Oper<Register> { // Register the new user let user_form = UserForm { name: data.username.to_owned(), - fedi_name: Settings::get().hostname.into(), + fedi_name: Settings::get().hostname.to_owned(), email: data.email.to_owned(), password_encrypted: data.password.to_owned(), preferred_username: None, |