Remove old configuration code
This commit is contained in:
@@ -33,31 +33,6 @@ fn index(conn: DbConn, user: Option<User>) -> Template {
|
||||
}
|
||||
}
|
||||
|
||||
#[get("/configure")]
|
||||
fn configure() -> Template {
|
||||
Template::render("instance/configure", json!({}))
|
||||
}
|
||||
|
||||
#[derive(FromForm)]
|
||||
struct NewInstanceForm {
|
||||
name: String
|
||||
}
|
||||
|
||||
#[post("/configure", data = "<data>")]
|
||||
fn post_config(conn: DbConn, data: Form<NewInstanceForm>) -> Redirect {
|
||||
let form = data.get();
|
||||
let inst = Instance::insert(&*conn, NewInstance {
|
||||
public_domain: BASE_URL.as_str().to_string(),
|
||||
name: form.name.to_string(),
|
||||
local: true
|
||||
});
|
||||
if inst.has_admin(&*conn) {
|
||||
Redirect::to("/")
|
||||
} else {
|
||||
Redirect::to("/users/new")
|
||||
}
|
||||
}
|
||||
|
||||
#[post("/inbox", data = "<data>")]
|
||||
fn shared_inbox(conn: DbConn, data: String) -> String {
|
||||
let act: serde_json::Value = serde_json::from_str(&data[..]).unwrap();
|
||||
|
||||
+5
-6
@@ -164,7 +164,6 @@ struct NewUserForm {
|
||||
|
||||
#[post("/users/new", data = "<data>")]
|
||||
fn create(conn: DbConn, data: Form<NewUserForm>) -> Result<Redirect, String> {
|
||||
let inst = Instance::get_local(&*conn).unwrap();
|
||||
let form = data.get();
|
||||
|
||||
if form.username.clone().len() < 1 {
|
||||
@@ -174,15 +173,15 @@ fn create(conn: DbConn, data: Form<NewUserForm>) -> Result<Redirect, String> {
|
||||
} else if form.password.clone().len() < 8 {
|
||||
Err(String::from("Password should be at least 8 characters long"))
|
||||
} else if form.password == form.password_confirmation {
|
||||
User::insert(&*conn, NewUser::new_local(
|
||||
NewUser::new_local(
|
||||
&*conn,
|
||||
form.username.to_string(),
|
||||
form.username.to_string(),
|
||||
!inst.has_admin(&*conn),
|
||||
false,
|
||||
String::from(""),
|
||||
form.email.to_string(),
|
||||
User::hash_pass(form.password.to_string()),
|
||||
inst.id
|
||||
)).update_boxes(&*conn);
|
||||
User::hash_pass(form.password.to_string())
|
||||
).update_boxes(&*conn);
|
||||
Ok(Redirect::to(format!("/@/{}/", data.get().username)))
|
||||
} else {
|
||||
Err(String::from("Passwords don't match"))
|
||||
|
||||
Reference in New Issue
Block a user