use slices.SortFunc to sort slices of pages

Author: emad-elsaid

extensions/activitypub/activitypub.go

@@ -5,8 +5,9 @@ import (
 	"fmt"
 	"html/template"
 	"net/url"
-	"sort"
+	"slices"
 	"strconv"
+	"strings"
 	"time"
 
 	. "github.com/emad-elsaid/xlog"
@@ -222,14 +223,21 @@ func outboxPage(r Request) Output {
 	pageIndex, _ := strconv.ParseInt(r.PathValue("page"), 10, 64)
 	pageIndex--
 
-	var pages orderedPages = Pages(r.Context())
+	pages := Pages(r.Context())
 
 	if int(pageIndex) >= len(pages) || pageIndex < 0 {
 		return NotFound("page index is out of context")
 	}
 
 	var page Page
-	sort.Sort(pages)
+	slices.SortFunc(pages, func(a, b Page) int {
+		if modtime := b.ModTime().Compare(a.ModTime()); modtime != 0 {
+			return modtime
+		}
+
+		return strings.Compare(a.Name(), b.Name())
+	})
+
 	page = pages[pageIndex]
 
 	var u url.URL
@@ -266,9 +274,3 @@ func outboxPage(r Request) Output {
 		},
 	)
 }
-
-type orderedPages []Page
-
-func (a orderedPages) Len() int           { return len(a) }
-func (a orderedPages) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
-func (a orderedPages) Less(i, j int) bool { return a[i].ModTime().After(a[j].ModTime()) }

extensions/hashtags/hashtags.go

@@ -225,9 +225,15 @@ func relatedPages(p Page) template.HTML {
 func hashtagPages(hashtag Markdown) template.HTML {
 	hashtag_value := strings.Trim(string(hashtag), "# \n")
 	pages := tagPages(context.Background(), hashtag_value)
+
 	slices.SortFunc(pages, func(a, b Page) int {
-		return int(b.ModTime().Unix() - a.ModTime().Unix())
+		if modtime := b.ModTime().Compare(a.ModTime()); modtime != 0 {
+			return modtime
+		}
+
+		return strings.Compare(a.Name(), b.Name())
 	})
+
 	output := Partial("hashtag-pages", Locals{"pages": pages})
 	return template.HTML(output)
 }

extensions/photos/photos.go

@@ -15,7 +15,7 @@ import (
 	"os"
 	"path"
 	"path/filepath"
-	"sort"
+	"slices"
 	"strings"
 	"time"
 
@@ -133,8 +133,8 @@ func photosShortcode(input xlog.Markdown) template.HTML {
 		return template.HTML(err.Error())
 	}
 
-	sort.Slice(photos, func(i, j int) bool {
-		return photos[i].Time.After(photos[j].Time)
+	slices.SortFunc(photos, func(i, j *Photo) int {
+		return j.Time.Compare(i.Time)
 	})
 
 	return xlog.Partial("photos", xlog.Locals{

extensions/recent/recent.go

@@ -3,7 +3,8 @@ package recent
 import (
 	"embed"
 	"html/template"
-	"sort"
+	"slices"
+	"strings"
 
 	_ "embed"
 
@@ -28,21 +29,21 @@ func (Recent) Init() {
 }
 
 func recentHandler(r Request) Output {
-	var rp recentPages = Pages(r.Context())
-	sort.Sort(rp)
+	rp := Pages(r.Context())
+	slices.SortFunc(rp, func(a, b Page) int {
+		if modtime := b.ModTime().Compare(a.ModTime()); modtime != 0 {
+			return modtime
+		}
+
+		return strings.Compare(a.Name(), b.Name())
+	})
 
 	return Render("recent", Locals{
 		"page":  DynamicPage{NameVal: "Recent"},
 		"pages": rp,
 	})
 }
 
-type recentPages []Page
-
-func (a recentPages) Len() int           { return len(a) }
-func (a recentPages) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
-func (a recentPages) Less(i, j int) bool { return a[i].ModTime().After(a[j].ModTime()) }
-
 type links struct{}
 
 func (l links) Icon() string { return "fa-solid fa-clock-rotate-left" }

extensions/rss/main.go

@@ -6,7 +6,8 @@ import (
 	"fmt"
 	"html/template"
 	"net/url"
-	"sort"
+	"slices"
+	"strings"
 	"time"
 
 	. "github.com/emad-elsaid/xlog"
@@ -91,8 +92,12 @@ func feed(r Request) Output {
 	}
 
 	pages := Pages(r.Context())
-	sort.Slice(pages, func(i, j int) bool {
-		return pages[i].ModTime().After(pages[j].ModTime())
+	slices.SortFunc(pages, func(a, b Page) int {
+		if modtime := b.ModTime().Compare(a.ModTime()); modtime != 0 {
+			return modtime
+		}
+
+		return strings.Compare(a.Name(), b.Name())
 	})
 
 	if len(pages) > limit {