Add youtube playlists (#86)

* Added playlist command and functionality for YoutubeProvide * Added playlist struct * Applied feedback * fixes * derefencen Co-authored-by: Floris van Maldegem <[email protected]>
svenwiltink · Oct 4, 2022 · f045a10 · f045a10
1 parent 5f259e2
commit f045a10
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/pkg/bot/commands.go b/pkg/bot/commands.go
@@ -434,6 +434,7 @@ var addPlaylistCommand = Command{
 		playlist, err := bot.musicPlayer.AddPlaylist(parameter)
 		if err != nil {
 			bot.ReplyToMessage(message, fmt.Sprintf("error: %v", err))
+			return
 		}
 
 		bot.ReplyToMessage(message, fmt.Sprintf("Started playing Playlist '%s' with %d songs", playlist.Title, playlist.Length()))

diff --git a/pkg/music/dataprovider/youtube/youtube.go b/pkg/music/dataprovider/youtube/youtube.go
@@ -22,7 +22,7 @@ const (
 )
 
 var youtubeURLRegex = regexp.MustCompile(`^(https?:\/\/)?(www\.)?(youtube\.com|youtu\.?be)\/.+$`)
-var youtubePlaylistUrlRegex = regexp.MustCompile(`^(https?:\/\/)?(www\.)?(youtube\.com|youtu\.?be)\/watch\?v=.+&list=.+$`)
+var youtubePlaylistUrlRegex = regexp.MustCompile(`^(https?:\/\/)?(www\.)?(youtube\.com|youtu\.?be)\/(watch|playlist)\?(v=.+&)?list=.+$`)
 
 type DataProvider struct {
 	apiKey  string
@@ -180,7 +180,7 @@ func (provider *DataProvider) AddPlaylist(ytUrl string) (*music.Playlist, error)
 		if item.Kind != "youtube#playlist" {
 			continue
 		}
-		playlist.Title = item.Snippet.Title
+		playlist = music.Playlist{Title: item.Snippet.Title}
 	}
 
 	nextPageToken := ""