Added joined groups page

pages/groups/fetch.go

@@ -2,8 +2,16 @@ package groups
 
 import "github.com/animenotifier/arn"
 
-func fetchGroups() []*arn.Group {
+func fetchGroups(memberID string) []*arn.Group {
 	return arn.FilterGroups(func(group *arn.Group) bool {
-		return !group.IsDraft
+		if group.IsDraft {
+			return false
+		}
+
+		if memberID != "" && !group.HasMember(memberID) {
+			return false
+		}
+
+		return true
 	})
 }

pages/groups/groups.pixy

@@ -3,6 +3,9 @@ component Groups(groups []*arn.Group, nextIndex int, user *arn.User)
 		Tab("Latest", "users", "/groups")
 		Tab("Popular", "globe", "/groups/popular")
 
+		if user != nil
+			Tab("Joined", "user-plus", "/groups/joined")
+
 	h1.page-title Groups
 	
 	.corner-buttons

pages/groups/joined.go

@@ -0,0 +1,31 @@
+package groups
+
+import (
+	"net/http"
+	"sort"
+
+	"github.com/animenotifier/notify.moe/utils"
+
+	"github.com/aerogo/aero"
+)
+
+// Joined shows the most popular joined groups.
+func Joined(ctx *aero.Context) string {
+	user := utils.GetUser(ctx)
+
+	if user == nil {
+		return ctx.Error(http.StatusUnauthorized, "Not logged in")
+	}
+
+	groups := fetchGroups(user.ID)
+
+	// Sort by join date
+	sort.Slice(groups, func(i, j int) bool {
+		aMember := groups[i].FindMember(user.ID)
+		bMember := groups[j].FindMember(user.ID)
+
+		return aMember.Joined > bMember.Joined
+	})
+
+	return render(ctx, groups)
+}

pages/groups/latest.go

@@ -8,7 +8,7 @@ import (
 
 // Latest shows the latest groups.
 func Latest(ctx *aero.Context) string {
-	groups := fetchGroups()
+	groups := fetchGroups("")
 
 	sort.Slice(groups, func(i, j int) bool {
 		return groups[i].Created > groups[j].Created

pages/groups/popular.go

@@ -8,7 +8,7 @@ import (
 
 // Popular shows the most popular groups.
 func Popular(ctx *aero.Context) string {
-	groups := fetchGroups()
+	groups := fetchGroups("")
 
 	sort.Slice(groups, func(i, j int) bool {
 		if len(groups[i].Members) == len(groups[j].Members) {

pages/groups/render.go

@@ -9,8 +9,8 @@ import (
 )
 
 const (
-	groupsFirstLoad = 24
+	groupsFirstLoad = 27
-	groupsPerScroll = 12
+	groupsPerScroll = 18
 )
 
 // render renders the groups page with the given groups.

pages/index/grouproutes/grouproutes.go

@@ -13,6 +13,8 @@ func Register(l *layout.Layout) {
 	l.Page("/groups/from/:index", groups.Latest)
 	l.Page("/groups/popular", groups.Popular)
 	l.Page("/groups/popular/from/:index", groups.Popular)
+	l.Page("/groups/joined", groups.Joined)
+	l.Page("/groups/joined/from/:index", groups.Joined)
 	l.Page("/group/:id", group.Feed)
 	l.Page("/group/:id/info", group.Info)
 	l.Page("/group/:id/members", group.Members)

utils/routetests/All.go

@@ -467,6 +467,7 @@ var routeTests = map[string][]string{
 	"/editor/anilist":                                nil,
 	"/editor/shoboi":                                 nil,
 	"/dark-flame-master":                             nil,
+	"/groups/joined":                                 nil,
 	"/user":                                          nil,
 	"/settings":                                      nil,
 	"/settings/accounts":                             nil,