chore(youtube): Add funcs for URL generation and timestamp parsing

gabe565 · Mar 3, 2025 · 2ad14a4 · 2ad14a4
1 parent 552ebf8
commit 2ad14a4
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 18 deletions.
diff --git a/internal/youtube/playlist/description.go b/internal/youtube/playlist/description.go
@@ -22,7 +22,7 @@ func (i *Item) TemplateDescription(embed bool) g.Group {
 					html.Width("640"),
 					html.Height("390"),
 					g.Attr("frameborder", "0"),
-					html.Src("https://youtube.com/embed/"+i.ResourceId.VideoId),
+					html.Src(i.EmbedURL().String()),
 				),
 			)
 		}),

diff --git a/internal/youtube/playlist/feed_item.go b/internal/youtube/playlist/feed_item.go
@@ -2,6 +2,7 @@ package playlist
 
 import (
 	"net/url"
+	"path"
 	"time"
 
 	"github.com/gorilla/feeds"
@@ -11,24 +12,38 @@ import (
 type Item youtube.PlaylistItemSnippet
 
 func (i *Item) FeedItem(embed bool) (*feeds.Item, error) {
-	published, err := time.Parse(time.RFC3339, i.PublishedAt)
+	published, err := i.ParsePublishedAt()
 	if err != nil {
 		return nil, err
 	}
 
-	u := url.URL{
-		Scheme:   "https",
-		Host:     "youtube.com",
-		Path:     "/watch",
-		RawQuery: url.Values{"v": []string{i.ResourceId.VideoId}}.Encode(),
-	}
-
 	return &feeds.Item{
 		Title:   i.Title,
-		Link:    &feeds.Link{Href: u.String()},
+		Link:    &feeds.Link{Href: i.URL().String()},
 		Author:  &feeds.Author{Name: i.ChannelTitle},
 		Id:      i.ResourceId.VideoId,
 		Created: published,
 		Content: i.TemplateDescription(embed).String(),
 	}, nil
 }
+
+func (i *Item) ParsePublishedAt() (time.Time, error) {
+	return time.Parse(time.RFC3339, i.PublishedAt)
+}
+
+func (i *Item) URL() *url.URL {
+	return &url.URL{
+		Scheme:   "https",
+		Host:     "youtube.com",
+		Path:     "/watch",
+		RawQuery: url.Values{"v": []string{i.ResourceId.VideoId}}.Encode(),
+	}
+}
+
+func (i *Item) EmbedURL() *url.URL {
+	return &url.URL{
+		Scheme: "https",
+		Host:   "youtube.com",
+		Path:   path.Join("embed", i.ResourceId.VideoId),
+	}
+}
diff --git a/internal/youtube/playlist/playlist.go b/internal/youtube/playlist/playlist.go
@@ -59,16 +59,9 @@ func (p Playlist) Feed(ctx context.Context) (*feeds.Feed, error) {
 		return nil, err
 	}
 
-	u := url.URL{
-		Scheme:   "https",
-		Host:     "youtube.com",
-		Path:     "/playlist",
-		RawQuery: url.Values{"list": []string{p.ID}}.Encode(),
-	}
-
 	feed := &feeds.Feed{
 		Title:       "YouTube - " + meta.Title,
-		Link:        &feeds.Link{Href: u.String()},
+		Link:        &feeds.Link{Href: p.URL().String()},
 		Description: meta.Description,
 		Author: &feeds.Author{
 			Name: meta.ChannelTitle,
@@ -144,3 +137,12 @@ func (p Playlist) FeedItems(ctx context.Context) ([]*feeds.Item, error) {
 
 	return feedItems, nil
 }
+
+func (p *Playlist) URL() *url.URL {
+	return &url.URL{
+		Scheme:   "https",
+		Host:     "youtube.com",
+		Path:     "/playlist",
+		RawQuery: url.Values{"list": []string{p.ID}}.Encode(),
+	}
+}