Merge branch 'master' of github.com:Plume-org/Plume

This commit is contained in:
Bat
2018-05-23 18:56:16 +01:00
6 changed files with 8 additions and 8 deletions
+1 -1
View File
@@ -77,7 +77,7 @@ fn create(conn: DbConn, data: Form<NewBlogForm>, user: User) -> Redirect {
is_owner: true
});
Redirect::to(format!("/~/{}", slug).as_str())
Redirect::to(format!("/~/{}/", slug).as_str())
}
#[get("/~/<name>/outbox")]
+1 -1
View File
@@ -98,5 +98,5 @@ fn create(blog_name: String, data: Form<NewPostForm>, user: User, conn: DbConn)
let act = post.create_activity(&*conn);
broadcast(&*conn, &user, act, user.get_followers(&*conn));
Redirect::to(format!("/~/{}/{}", blog_name, slug).as_str())
Redirect::to(format!("/~/{}/{}/", blog_name, slug).as_str())
}
+3 -3
View File
@@ -21,7 +21,7 @@ use models::{
#[get("/me")]
fn me(user: User) -> Redirect {
Redirect::to(format!("/@/{}", user.username).as_ref())
Redirect::to(format!("/@/{}/", user.username).as_ref())
}
#[get("/@/<name>", rank = 2)]
@@ -64,7 +64,7 @@ fn follow(name: String, conn: DbConn, user: User) -> Redirect {
act.set_object_object(user.into_activity(&*conn)).unwrap();
act.object_props.set_id_string(format!("{}/follow/{}", user.ap_url, target.ap_url)).unwrap();
broadcast(&*conn, &user, act, vec![target]);
Redirect::to(format!("/@/{}", name).as_ref())
Redirect::to(format!("/@/{}/", name).as_ref())
}
#[get("/@/<name>/followers", rank = 2)]
@@ -155,7 +155,7 @@ fn create(conn: DbConn, data: Form<NewUserForm>) -> Result<Redirect, String> {
User::hash_pass(form.password.to_string()),
inst.id
)).update_boxes(&*conn);
Ok(Redirect::to(format!("/@/{}", data.get().username).as_str()))
Ok(Redirect::to(format!("/@/{}/", data.get().username).as_str()))
} else {
Err(String::from("Passwords don't match"))
}