From d6de3b3437422937ee224c1c40a0d3be8fc7f50a Mon Sep 17 00:00:00 2001
From: Igor Kim <igorkim.an@gmail.com>
Date: Sat, 28 Jun 2025 02:53:37 +0500
Subject: [PATCH] Add sort config for videos widget

---
 docs/configuration.md            |  5 +++++
 internal/glance/widget-videos.go | 28 ++++++++++++++++++++++++----
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/docs/configuration.md b/docs/configuration.md
index 174de83..70e76de 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -870,6 +870,7 @@ Preview:
 | playlists | array | no | |
 | limit | integer | no | 25 |
 | style | string | no | horizontal-cards |
+| sort-by | string | no | posted |
 | collapse-after | integer | no | 7 |
 | collapse-after-rows | integer | no | 4 |
 | include-shorts | boolean | no | false |
@@ -905,6 +906,10 @@ https://www.youtube.com...&list={ID}&...
 ##### `limit`
 The maximum number of videos to show.
 
+##### `sort-by`
+Used to specify the order in which the videos should get returned. Possible values are `none`, `updated`, and `posted`. 
+Default value is `posted`.
+
 ##### `collapse-after`
 Specify the number of videos to show when using the `vertical-list` style before the "SHOW MORE" button appears.
 
diff --git a/internal/glance/widget-videos.go b/internal/glance/widget-videos.go
index ff79864..ecf77fa 100644
--- a/internal/glance/widget-videos.go
+++ b/internal/glance/widget-videos.go
@@ -31,6 +31,7 @@ type videosWidget struct {
 	Playlists         []string  `yaml:"playlists"`
 	Limit             int       `yaml:"limit"`
 	IncludeShorts     bool      `yaml:"include-shorts"`
+	SortBy            string    `yaml:"sort-by"`
 }
 
 func (widget *videosWidget) initialize() error {
@@ -64,7 +65,7 @@ func (widget *videosWidget) initialize() error {
 }
 
 func (widget *videosWidget) update(ctx context.Context) {
-	videos, err := fetchYoutubeChannelUploads(widget.Channels, widget.VideoUrlTemplate, widget.IncludeShorts)
+	videos, err := fetchYoutubeChannelUploads(widget.Channels, widget.VideoUrlTemplate, widget.IncludeShorts, widget.SortBy)
 
 	if !widget.canContinueUpdateAfterHandlingErr(err) {
 		return
@@ -98,6 +99,7 @@ type youtubeFeedResponseXml struct {
 	Videos      []struct {
 		Title     string `xml:"title"`
 		Published string `xml:"published"`
+		Updated   string `xml:"updated"`
 		Link      struct {
 			Href string `xml:"href,attr"`
 		} `xml:"link"`
@@ -126,11 +128,12 @@ type video struct {
 	Author       string
 	AuthorUrl    string
 	TimePosted   time.Time
+	TimeUpdated  time.Time
 }
 
 type videoList []video
 
-func (v videoList) sortByNewest() videoList {
+func (v videoList) sortByPosted() videoList {
 	sort.Slice(v, func(i, j int) bool {
 		return v[i].TimePosted.After(v[j].TimePosted)
 	})
@@ -138,7 +141,15 @@ func (v videoList) sortByNewest() videoList {
 	return v
 }
 
-func fetchYoutubeChannelUploads(channelOrPlaylistIDs []string, videoUrlTemplate string, includeShorts bool) (videoList, error) {
+func (v videoList) sortByUpdated() videoList {
+	sort.Slice(v, func(i, j int) bool {
+		return v[i].TimeUpdated.After(v[j].TimeUpdated)
+	})
+
+	return v
+}
+
+func fetchYoutubeChannelUploads(channelOrPlaylistIDs []string, videoUrlTemplate string, includeShorts bool, sortBy string) (videoList, error) {
 	requests := make([]*http.Request, 0, len(channelOrPlaylistIDs))
 
 	for i := range channelOrPlaylistIDs {
@@ -198,6 +209,7 @@ func fetchYoutubeChannelUploads(channelOrPlaylistIDs []string, videoUrlTemplate
 				Author:       response.Channel,
 				AuthorUrl:    response.ChannelLink + "/videos",
 				TimePosted:   parseYoutubeFeedTime(v.Published),
+				TimeUpdated:  parseYoutubeFeedTime(v.Updated),
 			})
 		}
 	}
@@ -206,7 +218,15 @@ func fetchYoutubeChannelUploads(channelOrPlaylistIDs []string, videoUrlTemplate
 		return nil, errNoContent
 	}
 
-	videos.sortByNewest()
+	switch sortBy {
+	case "none":
+	case "updated":
+		videos.sortByUpdated()
+	case "posted":
+		videos.sortByPosted()
+	default: // "posted"
+		videos.sortByPosted()
+	}
 
 	if failed > 0 {
 		return videos, fmt.Errorf("%w: missing videos from %d channels", errPartialContent, failed)