Rewritten infinite scrolling

pages/index.go

@@ -120,9 +120,9 @@ func Configure(app *aero.Application) {
 	l.Page("/quote/:id/edit", quote.Edit)
 	l.Page("/quote/:id/history", quote.History)
 	l.Page("/quotes", quotes.Latest)
-	l.Page("/quotes/from/:index", quotes.LatestFrom)
+	l.Page("/quotes/from/:index", quotes.Latest)
 	l.Page("/quotes/best", quotes.Best)
-	l.Page("/quotes/best/from/:index", quotes.BestFrom)
+	l.Page("/quotes/best/from/:index", quotes.Best)
 
 	// Calendar
 	l.Page("/calendar", calendar.Get)
@@ -144,9 +144,9 @@ func Configure(app *aero.Application) {
 
 	// Soundtracks
 	l.Page("/soundtracks", soundtracks.Latest)
-	l.Page("/soundtracks/from/:index", soundtracks.LatestFrom)
+	l.Page("/soundtracks/from/:index", soundtracks.Latest)
 	l.Page("/soundtracks/best", soundtracks.Best)
-	l.Page("/soundtracks/best/from/:index", soundtracks.BestFrom)
+	l.Page("/soundtracks/best/from/:index", soundtracks.Best)
 	l.Page("/soundtracks/tag/:tag", soundtracks.FilterByTag)
 	l.Page("/soundtracks/tag/:tag/from/:index", soundtracks.FilterByTagFrom)
 	l.Page("/soundtrack/:id", soundtrack.Get)

pages/quotes/best.go

@@ -1,70 +1,39 @@
 package quotes
 
 import (
-	"net/http"
-	"strconv"
-
 	"github.com/aerogo/aero"
 	"github.com/animenotifier/arn"
 	"github.com/animenotifier/notify.moe/components"
 	"github.com/animenotifier/notify.moe/utils"
+	"github.com/animenotifier/notify.moe/utils/infinitescroll"
 )
 
-// Best renders the quotes page ordered by the most favorites first.
+// Best renders the best quotes.
 func Best(ctx *aero.Context) string {
 	user := utils.GetUser(ctx)
+	index, _ := ctx.GetInt("index")
 
-	quotes := arn.FilterQuotes(func(track *arn.Quote) bool {
+	// Fetch all eligible quotes
-		return !track.IsDraft
+	allQuotes := fetchAll()
-	})
-
-	arn.SortQuotesPopularFirst(quotes)
-
-	// Limit the number of displayed quotes
-	loadMoreIndex := 0
-
-	if len(quotes) > maxQuotes {
-		quotes = quotes[:maxQuotes]
-		loadMoreIndex = maxQuotes
-	}
-
-	return ctx.HTML(components.Quotes(quotes, loadMoreIndex, user))
-}
-
-// BestFrom renders the quotes from the given index.
-func BestFrom(ctx *aero.Context) string {
-	user := utils.GetUser(ctx)
-	index, err := ctx.GetInt("index")
-
-	if err != nil {
-		return ctx.Error(http.StatusBadRequest, "Invalid start index", err)
-	}
-
-	allQuotes := arn.FilterQuotes(func(track *arn.Quote) bool {
-		return !track.IsDraft
-	})
-
-	if index < 0 || index >= len(allQuotes) {
-		return ctx.Error(http.StatusBadRequest, "Invalid start index (maximum is "+strconv.Itoa(len(allQuotes))+")", nil)
-	}
 
+	// Sort the quotes by date
 	arn.SortQuotesPopularFirst(allQuotes)
 
+	// Slice the part that we need
 	quotes := allQuotes[index:]
 
 	if len(quotes) > maxQuotes {
 		quotes = quotes[:maxQuotes]
 	}
 
-	nextIndex := index + maxQuotes
+	// Next index
-
+	nextIndex := infinitescroll.NextIndex(ctx, len(allQuotes), maxQuotes, index)
-	if nextIndex >= len(allQuotes) {
-		// End of data - no more scrolling
-		ctx.Response().Header().Set("X-LoadMore-Index", "-1")
-	} else {
-		// Send the index for the next request
-		ctx.Response().Header().Set("X-LoadMore-Index", strconv.Itoa(nextIndex))
-	}
 
+	// In case we're scrolling, send quotes only (without the page frame)
+	if index > 0 {
 		return ctx.HTML(components.QuotesScrollable(quotes, user))
 	}
+
+	// Otherwise, send the full page
+	return ctx.HTML(components.Quotes(quotes, nextIndex, user))
+}

pages/quotes/fetch.go

@@ -0,0 +1,10 @@
+package quotes
+
+import "github.com/animenotifier/arn"
+
+// fetchAll returns all quotes
+func fetchAll() []*arn.Quote {
+	return arn.FilterQuotes(func(quote *arn.Quote) bool {
+		return !quote.IsDraft && len(quote.Text.English) > 0
+	})
+}

pages/quotes/quotes.go

@@ -1,72 +1,41 @@
 package quotes
 
 import (
-	"net/http"
-	"strconv"
-
 	"github.com/aerogo/aero"
 	"github.com/animenotifier/arn"
 	"github.com/animenotifier/notify.moe/components"
 	"github.com/animenotifier/notify.moe/utils"
+	"github.com/animenotifier/notify.moe/utils/infinitescroll"
 )
 
-const maxQuotes = 9
+const maxQuotes = 12
 
-// Latest renders the quotes page.
+// Latest renders the latest quotes.
 func Latest(ctx *aero.Context) string {
 	user := utils.GetUser(ctx)
+	index, _ := ctx.GetInt("index")
 
-	quotes := arn.FilterQuotes(func(track *arn.Quote) bool {
+	// Fetch all eligible quotes
-		return !track.IsDraft
+	allQuotes := fetchAll()
-	})
-
-	arn.SortQuotesLatestFirst(quotes)
-
-	// Limit the number of displayed quotes
-	loadMoreIndex := 0
-
-	if len(quotes) > maxQuotes {
-		quotes = quotes[:maxQuotes]
-		loadMoreIndex = maxQuotes
-	}
-
-	return ctx.HTML(components.Quotes(quotes, loadMoreIndex, user))
-}
-
-// LatestFrom renders the quotes from the given index.
-func LatestFrom(ctx *aero.Context) string {
-	user := utils.GetUser(ctx)
-	index, err := ctx.GetInt("index")
-
-	if err != nil {
-		return ctx.Error(http.StatusBadRequest, "Invalid start index", err)
-	}
-
-	allQuotes := arn.FilterQuotes(func(track *arn.Quote) bool {
-		return !track.IsDraft
-	})
-
-	if index < 0 || index >= len(allQuotes) {
-		return ctx.Error(http.StatusBadRequest, "Invalid start index (maximum is "+strconv.Itoa(len(allQuotes))+")", nil)
-	}
 
+	// Sort the quotes by date
 	arn.SortQuotesLatestFirst(allQuotes)
 
+	// Slice the part that we need
 	quotes := allQuotes[index:]
 
 	if len(quotes) > maxQuotes {
 		quotes = quotes[:maxQuotes]
 	}
 
-	nextIndex := index + maxQuotes
+	// Next index
-
+	nextIndex := infinitescroll.NextIndex(ctx, len(allQuotes), maxQuotes, index)
-	if nextIndex >= len(allQuotes) {
-		// End of data - no more scrolling
-		ctx.Response().Header().Set("X-LoadMore-Index", "-1")
-	} else {
-		// Send the index for the next request
-		ctx.Response().Header().Set("X-LoadMore-Index", strconv.Itoa(nextIndex))
-	}
 
+	// In case we're scrolling, send quotes only (without the page frame)
+	if index > 0 {
 		return ctx.HTML(components.QuotesScrollable(quotes, user))
 	}
+
+	// Otherwise, send the full page
+	return ctx.HTML(components.Quotes(quotes, nextIndex, user))
+}

pages/quotes/quotes.pixy

@@ -17,7 +17,7 @@ component Quotes(quotes []*arn.Quote, loadMoreIndex int, user *arn.User)
 	#load-more-target.quotes
 		QuotesScrollable(quotes, user)
 
-	if loadMoreIndex != 0
+	if loadMoreIndex != -1
 		.buttons
 			LoadMore(loadMoreIndex)
 

pages/soundtracks/best.go

@@ -1,70 +1,39 @@
 package soundtracks
 
 import (
-	"net/http"
-	"strconv"
-
 	"github.com/aerogo/aero"
 	"github.com/animenotifier/arn"
 	"github.com/animenotifier/notify.moe/components"
 	"github.com/animenotifier/notify.moe/utils"
+	"github.com/animenotifier/notify.moe/utils/infinitescroll"
 )
 
-// Best renders the soundtracks page.
+// Best renders the best soundtracks.
 func Best(ctx *aero.Context) string {
 	user := utils.GetUser(ctx)
+	index, _ := ctx.GetInt("index")
 
-	tracks := arn.FilterSoundTracks(func(track *arn.SoundTrack) bool {
+	// Fetch all eligible tracks
-		return !track.IsDraft && len(track.Media) > 0
+	allTracks := fetchAll()
-	})
-
-	arn.SortSoundTracksPopularFirst(tracks)
-
-	// Limit the number of displayed tracks
-	loadMoreIndex := 0
-
-	if len(tracks) > maxTracks {
-		tracks = tracks[:maxTracks]
-		loadMoreIndex = maxTracks
-	}
-
-	return ctx.HTML(components.SoundTracks(tracks, loadMoreIndex, "", user))
-}
-
-// BestFrom renders the soundtracks from the given index.
-func BestFrom(ctx *aero.Context) string {
-	user := utils.GetUser(ctx)
-	index, err := ctx.GetInt("index")
-
-	if err != nil {
-		return ctx.Error(http.StatusBadRequest, "Invalid start index", err)
-	}
-
-	allTracks := arn.FilterSoundTracks(func(track *arn.SoundTrack) bool {
-		return !track.IsDraft && len(track.Media) > 0
-	})
-
-	if index < 0 || index >= len(allTracks) {
-		return ctx.Error(http.StatusBadRequest, "Invalid start index (maximum is "+strconv.Itoa(len(allTracks))+")", nil)
-	}
 
+	// Sort the tracks by date
 	arn.SortSoundTracksPopularFirst(allTracks)
 
+	// Slice the part that we need
 	tracks := allTracks[index:]
 
 	if len(tracks) > maxTracks {
 		tracks = tracks[:maxTracks]
 	}
 
-	nextIndex := index + maxTracks
+	// Next index
-
+	nextIndex := infinitescroll.NextIndex(ctx, len(allTracks), maxTracks, index)
-	if nextIndex >= len(allTracks) {
-		// End of data - no more scrolling
-		ctx.Response().Header().Set("X-LoadMore-Index", "-1")
-	} else {
-		// Send the index for the next request
-		ctx.Response().Header().Set("X-LoadMore-Index", strconv.Itoa(nextIndex))
-	}
 
+	// In case we're scrolling, send soundtracks only (without the page frame)
+	if index > 0 {
 		return ctx.HTML(components.SoundTracksScrollable(tracks, user))
 	}
+
+	// Otherwise, send the full page
+	return ctx.HTML(components.SoundTracks(tracks, nextIndex, "", user))
+}

pages/soundtracks/fetch.go

@@ -0,0 +1,12 @@
+package soundtracks
+
+import (
+	"github.com/animenotifier/arn"
+)
+
+// fetchAll returns all soundtracks
+func fetchAll() []*arn.SoundTrack {
+	return arn.FilterSoundTracks(func(track *arn.SoundTrack) bool {
+		return !track.IsDraft && len(track.Media) > 0
+	})
+}

pages/soundtracks/soundtracks.go

@@ -1,72 +1,41 @@
 package soundtracks
 
 import (
-	"net/http"
-	"strconv"
-
 	"github.com/aerogo/aero"
 	"github.com/animenotifier/arn"
 	"github.com/animenotifier/notify.moe/components"
 	"github.com/animenotifier/notify.moe/utils"
+	"github.com/animenotifier/notify.moe/utils/infinitescroll"
 )
 
 const maxTracks = 12
 
-// Latest renders the soundtracks page.
+// Latest renders the latest soundtracks.
 func Latest(ctx *aero.Context) string {
 	user := utils.GetUser(ctx)
+	index, _ := ctx.GetInt("index")
 
-	tracks := arn.FilterSoundTracks(func(track *arn.SoundTrack) bool {
+	// Fetch all eligible tracks
-		return !track.IsDraft && len(track.Media) > 0
+	allTracks := fetchAll()
-	})
-
-	arn.SortSoundTracksLatestFirst(tracks)
-
-	// Limit the number of displayed tracks
-	loadMoreIndex := 0
-
-	if len(tracks) > maxTracks {
-		tracks = tracks[:maxTracks]
-		loadMoreIndex = maxTracks
-	}
-
-	return ctx.HTML(components.SoundTracks(tracks, loadMoreIndex, "", user))
-}
-
-// LatestFrom renders the soundtracks from the given index.
-func LatestFrom(ctx *aero.Context) string {
-	user := utils.GetUser(ctx)
-	index, err := ctx.GetInt("index")
-
-	if err != nil {
-		return ctx.Error(http.StatusBadRequest, "Invalid start index", err)
-	}
-
-	allTracks := arn.FilterSoundTracks(func(track *arn.SoundTrack) bool {
-		return !track.IsDraft && len(track.Media) > 0
-	})
-
-	if index < 0 || index >= len(allTracks) {
-		return ctx.Error(http.StatusBadRequest, "Invalid start index (maximum is "+strconv.Itoa(len(allTracks))+")", nil)
-	}
 
+	// Sort the tracks by date
 	arn.SortSoundTracksLatestFirst(allTracks)
 
+	// Slice the part that we need
 	tracks := allTracks[index:]
 
 	if len(tracks) > maxTracks {
 		tracks = tracks[:maxTracks]
 	}
 
-	nextIndex := index + maxTracks
+	// Next index
-
+	nextIndex := infinitescroll.NextIndex(ctx, len(allTracks), maxTracks, index)
-	if nextIndex >= len(allTracks) {
-		// End of data - no more scrolling
-		ctx.Response().Header().Set("X-LoadMore-Index", "-1")
-	} else {
-		// Send the index for the next request
-		ctx.Response().Header().Set("X-LoadMore-Index", strconv.Itoa(nextIndex))
-	}
 
+	// In case we're scrolling, send soundtracks only (without the page frame)
+	if index > 0 {
 		return ctx.HTML(components.SoundTracksScrollable(tracks, user))
 	}
+
+	// Otherwise, send the full page
+	return ctx.HTML(components.SoundTracks(tracks, nextIndex, "", user))
+}

pages/soundtracks/soundtracks.pixy

@@ -1,4 +1,4 @@
-component SoundTracks(tracks []*arn.SoundTrack, loadMoreIndex int, tag string, user *arn.User)
+component SoundTracks(tracks []*arn.SoundTrack, nextIndex int, tag string, user *arn.User)
 	h1.page-title Soundtracks
 
 	SoundTracksTabs(tag)
@@ -17,9 +17,9 @@ component SoundTracks(tracks []*arn.SoundTrack, loadMoreIndex int, tag string, u
 	#load-more-target.soundtracks
 		SoundTracksScrollable(tracks, user)
 	
-	if loadMoreIndex != 0
+	if nextIndex != -1
 		.buttons
-			LoadMore(loadMoreIndex)
+			LoadMore(nextIndex)
 
 component SoundTracksScrollable(tracks []*arn.SoundTrack, user *arn.User)
 	each track in tracks

utils/infinitescroll/NextIndex.go

@@ -0,0 +1,21 @@
+package infinitescroll
+
+import (
+	"strconv"
+
+	"github.com/aerogo/aero"
+)
+
+// NextIndex calculates the next index and sends HTTP header
+func NextIndex(ctx *aero.Context, allElementsLength int, elementsPerScroll int, index int) int {
+	nextIndex := index + elementsPerScroll
+
+	if nextIndex >= allElementsLength {
+		nextIndex = -1
+	}
+
+	// Send the index for the next request
+	ctx.Response().Header().Set("X-LoadMore-Index", strconv.Itoa(nextIndex))
+
+	return nextIndex
+}