aitzol/Plume
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Show your own posts in your feed

Browse Source 
Fixes #213
This commit is contained in:
Bat 2018-10-06 13:41:23 +01:00
parent 4b8c090def
commit 478e9dcac9
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/routes/instance.rs
View File

@ -25,7 +25,9 @@ fn index(conn: DbConn, user: Option<User>) -> Template {
let local = Post::get_instance_page(&*conn, inst.id, Page::first().limits()); let local = Post::get_instance_page(&*conn, inst.id, Page::first().limits());
let user_feed = user.clone().map(|user| { let user_feed = user.clone().map(|user| {
let followed = user.get_following(&*conn); let followed = user.get_following(&*conn);
Post::user_feed_page(&*conn, followed.into_iter().map(|u| u.id).collect(), Page::first().limits()) let mut in_feed = followed.into_iter().map(|u| u.id).collect::<Vec<i32>>();
in_feed.push(user.id);
Post::user_feed_page(&*conn, in_feed, Page::first().limits())
}); });
Template::render("instance/index", json!({ Template::render("instance/index", json!({
@ -72,7 +74,9 @@ fn feed(conn: DbConn, user: User) -> Template {
#[get("/feed?<page>")] #[get("/feed?<page>")]
fn paginated_feed(conn: DbConn, user: User, page: Page) -> Template { fn paginated_feed(conn: DbConn, user: User, page: Page) -> Template {
let followed = user.get_following(&*conn); let followed = user.get_following(&*conn);
let articles = Post::user_feed_page(&*conn, followed.into_iter().map(|u| u.id).collect(), page.limits()); let mut in_feed = followed.into_iter().map(|u| u.id).collect::<Vec<i32>>();
in_feed.push(user.id);
let articles = Post::user_feed_page(&*conn, in_feed, page.limits());
Template::render("instance/feed", json!({ Template::render("instance/feed", json!({
"account": user.to_json(&*conn), "account": user.to_json(&*conn),
"page": page.page, "page": page.page,