From 12478854f96cec098a5d48f220a3bf706f81597f Mon Sep 17 00:00:00 2001 From: FM1337 Date: Mon, 26 Jun 2017 12:50:15 -0300 Subject: [PATCH 1/3] Updated dashboard --- pages/dashboard/dashboard.go | 42 +++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/pages/dashboard/dashboard.go b/pages/dashboard/dashboard.go index c4033b6f..56cfa6d1 100644 --- a/pages/dashboard/dashboard.go +++ b/pages/dashboard/dashboard.go @@ -2,6 +2,7 @@ package dashboard import ( "github.com/aerogo/aero" + "github.com/aerogo/flow" "github.com/animenotifier/arn" "github.com/animenotifier/notify.moe/components" "github.com/animenotifier/notify.moe/pages/frontpage" @@ -11,7 +12,6 @@ import ( const maxPosts = 5 const maxFollowing = 5 -// Get dashboard. func Get(ctx *aero.Context) string { user := utils.GetUser(ctx) @@ -19,32 +19,40 @@ func Get(ctx *aero.Context) string { return frontpage.Get(ctx) } - posts, err := arn.AllPostsSlice() + return Dashboard(ctx) +} - if err != nil { - return ctx.Error(500, "Error fetching posts", err) - } +// Get dashboard. +func Dashboard(ctx *aero.Context) string { + var user *arn.User + var posts []*arn.Post + var err error - arn.SortPostsLatestFirst(posts) + flow.Parallel(func() { + user = utils.GetUser(ctx) + }, func() { + posts, err = arn.AllPostsSlice() + arn.SortPostsLatestFirst(posts) - if len(posts) > maxPosts { - posts = posts[:maxPosts] - } + if len(posts) > maxPosts { + posts = posts[:maxPosts] + } + + }) followIDList := user.Following - var followingList []*arn.User - - if len(followIDList) > maxFollowing { - followIDList = followIDList[:maxFollowing] - } - userList, err := arn.DB.GetMany("User", followIDList) if err != nil { - return ctx.Error(500, "Error fetching followed users", err) + return ctx.Error(500, "Error displaying dashboard", err) } - followingList = userList.([]*arn.User) + followingList := userList.([]*arn.User) + followingList = arn.SortByLastSeen(followingList) + + if len(followingList) > maxFollowing { + followingList = followingList[:maxFollowing] + } return ctx.HTML(components.Dashboard(posts, followingList)) } From b8ff2e3e2fd5248ba3c871a97ea6153e508811ca Mon Sep 17 00:00:00 2001 From: FM1337 Date: Mon, 26 Jun 2017 13:53:06 -0300 Subject: [PATCH 2/3] Updated dashboard --- pages/dashboard/dashboard.go | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/pages/dashboard/dashboard.go b/pages/dashboard/dashboard.go index 56cfa6d1..aa1cd1ef 100644 --- a/pages/dashboard/dashboard.go +++ b/pages/dashboard/dashboard.go @@ -24,13 +24,14 @@ func Get(ctx *aero.Context) string { // Get dashboard. func Dashboard(ctx *aero.Context) string { - var user *arn.User + user := utils.GetUser(ctx) var posts []*arn.Post var err error + var followIDList []string + var userList interface{} + var followingList []*arn.User flow.Parallel(func() { - user = utils.GetUser(ctx) - }, func() { posts, err = arn.AllPostsSlice() arn.SortPostsLatestFirst(posts) @@ -38,21 +39,21 @@ func Dashboard(ctx *aero.Context) string { posts = posts[:maxPosts] } - }) + }, func() { + followIDList = user.Following + userList, err = arn.DB.GetMany("User", followIDList) + followingList = userList.([]*arn.User) + followingList = arn.SortUsersLastSeen(followingList) - followIDList := user.Following - userList, err := arn.DB.GetMany("User", followIDList) + if len(followingList) > maxFollowing { + followingList = followingList[:maxFollowing] + } + + }) if err != nil { return ctx.Error(500, "Error displaying dashboard", err) } - followingList := userList.([]*arn.User) - followingList = arn.SortByLastSeen(followingList) - - if len(followingList) > maxFollowing { - followingList = followingList[:maxFollowing] - } - return ctx.HTML(components.Dashboard(posts, followingList)) } From 5083d67a62a4990cd6800efccad6ffb501a35c9e Mon Sep 17 00:00:00 2001 From: Allen Lydiard Date: Mon, 26 Jun 2017 13:58:02 -0300 Subject: [PATCH 3/3] Update dashboard.go --- pages/dashboard/dashboard.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/dashboard/dashboard.go b/pages/dashboard/dashboard.go index aa1cd1ef..8aa9b386 100644 --- a/pages/dashboard/dashboard.go +++ b/pages/dashboard/dashboard.go @@ -24,12 +24,12 @@ func Get(ctx *aero.Context) string { // Get dashboard. func Dashboard(ctx *aero.Context) string { - user := utils.GetUser(ctx) var posts []*arn.Post var err error var followIDList []string var userList interface{} var followingList []*arn.User + user := utils.GetUser(ctx) flow.Parallel(func() { posts, err = arn.AllPostsSlice()