diff --git a/pkg/activity/activity.go b/pkg/activity/activity.go index e0a7f73..30812f5 100644 --- a/pkg/activity/activity.go +++ b/pkg/activity/activity.go @@ -144,11 +144,13 @@ func WithRegionCode(regionCode string) Option { } func WithService(svc *youtube.Service) Option { - return func(a *activity) { - if svc != nil { - service = svc - } else { - service = auth.NewY2BService() + return func(_ *activity) { + if svc == nil { + svc = auth.NewY2BService( + auth.WithCredential(""), + auth.WithCacheToken(""), + ) } + service = svc } } diff --git a/pkg/caption/caption.go b/pkg/caption/caption.go index acb432b..cebe1bc 100644 --- a/pkg/caption/caption.go +++ b/pkg/caption/caption.go @@ -376,11 +376,13 @@ func WithTlang(tlang string) Option { } func WithService(svc *youtube.Service) Option { - return func(c *caption) { - if svc != nil { - service = svc - } else { - service = auth.NewY2BService() + return func(_ *caption) { + if svc == nil { + svc = auth.NewY2BService( + auth.WithCredential(""), + auth.WithCacheToken(""), + ) } + service = svc } } diff --git a/pkg/channel/channel.go b/pkg/channel/channel.go index 2e522f2..35af6bb 100644 --- a/pkg/channel/channel.go +++ b/pkg/channel/channel.go @@ -246,11 +246,13 @@ func WithTitle(title string) Option { } func WithService(svc *youtube.Service) Option { - return func(c *channel) { - if svc != nil { - service = svc - } else { - service = auth.NewY2BService() + return func(_ *channel) { + if svc == nil { + svc = auth.NewY2BService( + auth.WithCredential(""), + auth.WithCacheToken(""), + ) } + service = svc } } diff --git a/pkg/channelBanner/channelBanner.go b/pkg/channelBanner/channelBanner.go index 9f45c13..e3e57e0 100644 --- a/pkg/channelBanner/channelBanner.go +++ b/pkg/channelBanner/channelBanner.go @@ -91,11 +91,13 @@ func WithOnBehalfOfContentOwnerChannel(onBehalfOfContentOwnerChannel string) Opt } func WithService(svc *youtube.Service) Option { - return func(cb *channelBanner) { - if svc != nil { - service = svc - } else { - service = auth.NewY2BService() + return func(_ *channelBanner) { + if svc == nil { + svc = auth.NewY2BService( + auth.WithCredential(""), + auth.WithCacheToken(""), + ) } + service = svc } } diff --git a/pkg/channelSection/channelSection.go b/pkg/channelSection/channelSection.go index 7993687..915f0c3 100644 --- a/pkg/channelSection/channelSection.go +++ b/pkg/channelSection/channelSection.go @@ -134,11 +134,13 @@ func WithOnBehalfOfContentOwner(onBehalfOfContentOwner string) Option { } func WithService(svc *youtube.Service) Option { - return func(cs *channelSection) { - if svc != nil { - service = svc - } else { - service = auth.NewY2BService() + return func(_ *channelSection) { + if svc == nil { + svc = auth.NewY2BService( + auth.WithCredential(""), + auth.WithCacheToken(""), + ) } + service = svc } } diff --git a/pkg/comment/comment.go b/pkg/comment/comment.go index ca6ffac..49d09ac 100644 --- a/pkg/comment/comment.go +++ b/pkg/comment/comment.go @@ -212,7 +212,9 @@ func (c *comment) SetModerationStatus(output string) { utils.PrintYAML(c) case "silent": default: - fmt.Printf("Comment moderation status set to %s: %s\n", c.ModerationStatus, c.IDs) + fmt.Printf( + "Comment moderation status set to %s: %s\n", c.ModerationStatus, c.IDs, + ) } } @@ -304,11 +306,13 @@ func WithViewerRating(viewerRating string) Option { } func WithService(svc *youtube.Service) Option { - return func(c *comment) { - if svc != nil { - service = svc - } else { - service = auth.NewY2BService() + return func(_ *comment) { + if svc == nil { + svc = auth.NewY2BService( + auth.WithCredential(""), + auth.WithCacheToken(""), + ) } + service = svc } } diff --git a/pkg/commentThread/commentThread.go b/pkg/commentThread/commentThread.go index e77820c..742fa1d 100644 --- a/pkg/commentThread/commentThread.go +++ b/pkg/commentThread/commentThread.go @@ -106,7 +106,9 @@ func (c *commentThread) List(parts []string, output string) { default: fmt.Println("ID\tTopLevelCommentID") for _, commentThread := range commentThreads { - fmt.Printf("%s\t%s\n", commentThread.Id, commentThread.Snippet.TopLevelComment.Id) + fmt.Printf( + "%s\t%s\n", commentThread.Id, commentThread.Snippet.TopLevelComment.Id, + ) } } } @@ -212,11 +214,13 @@ func WithVideoId(videoId string) Option { } func WithService(svc *youtube.Service) Option { - return func(c *commentThread) { - if svc != nil { - service = svc - } else { - service = auth.NewY2BService() + return func(_ *commentThread) { + if svc == nil { + svc = auth.NewY2BService( + auth.WithCredential(""), + auth.WithCacheToken(""), + ) } + service = svc } } diff --git a/pkg/i18nLanguage/i18nLanguage.go b/pkg/i18nLanguage/i18nLanguage.go index 2c2479c..59e64da 100644 --- a/pkg/i18nLanguage/i18nLanguage.go +++ b/pkg/i18nLanguage/i18nLanguage.go @@ -75,11 +75,13 @@ func WithHl(hl string) Option { } func WithService(svc *youtube.Service) Option { - return func(i *i18nLanguage) { - if svc != nil { - service = svc - } else { - service = auth.NewY2BService() + return func(_ *i18nLanguage) { + if svc == nil { + svc = auth.NewY2BService( + auth.WithCredential(""), + auth.WithCacheToken(""), + ) } + service = svc } } diff --git a/pkg/i18nRegion/i18nRegion.go b/pkg/i18nRegion/i18nRegion.go index 8bebe1c..301f4e8 100644 --- a/pkg/i18nRegion/i18nRegion.go +++ b/pkg/i18nRegion/i18nRegion.go @@ -75,11 +75,13 @@ func WithHl(hl string) Option { } func WithService(svc *youtube.Service) Option { - return func(i *i18nRegion) { - if svc != nil { - service = svc - } else { - service = auth.NewY2BService() + return func(_ *i18nRegion) { + if svc == nil { + svc = auth.NewY2BService( + auth.WithCredential(""), + auth.WithCacheToken(""), + ) } + service = svc } } diff --git a/pkg/member/member.go b/pkg/member/member.go index 27ffe0e..5ffc75d 100644 --- a/pkg/member/member.go +++ b/pkg/member/member.go @@ -107,11 +107,13 @@ func WithMode(mode string) Option { } func WithService(svc *youtube.Service) Option { - return func(m *member) { - if svc != nil { - service = svc - } else { - service = auth.NewY2BService() + return func(_ *member) { + if svc == nil { + svc = auth.NewY2BService( + auth.WithCredential(""), + auth.WithCacheToken(""), + ) } + service = svc } } diff --git a/pkg/membershipsLevel/membershipsLevel.go b/pkg/membershipsLevel/membershipsLevel.go index 86ac812..93754d9 100644 --- a/pkg/membershipsLevel/membershipsLevel.go +++ b/pkg/membershipsLevel/membershipsLevel.go @@ -63,11 +63,13 @@ func (m *membershipsLevel) List(parts []string, output string) { } func WithService(svc *youtube.Service) Option { - return func(m *membershipsLevel) { - if svc != nil { - service = svc - } else { - service = auth.NewY2BService() + return func(_ *membershipsLevel) { + if svc == nil { + svc = auth.NewY2BService( + auth.WithCredential(""), + auth.WithCacheToken(""), + ) } + service = svc } } diff --git a/pkg/playlist/playlist.go b/pkg/playlist/playlist.go index 3370207..c31587f 100644 --- a/pkg/playlist/playlist.go +++ b/pkg/playlist/playlist.go @@ -258,11 +258,13 @@ func WithOnBehalfOfContentOwnerChannel(channel string) Option { } func WithService(svc *youtube.Service) Option { - return func(p *playlist) { - if svc != nil { - service = svc - } else { - service = auth.NewY2BService() + return func(_ *playlist) { + if svc == nil { + svc = auth.NewY2BService( + auth.WithCredential(""), + auth.WithCacheToken(""), + ) } + service = svc } } diff --git a/pkg/playlistItem/playlistItem.go b/pkg/playlistItem/playlistItem.go index 23b9b23..fb749de 100644 --- a/pkg/playlistItem/playlistItem.go +++ b/pkg/playlistItem/playlistItem.go @@ -284,11 +284,13 @@ func WithOnBehalfOfContentOwner(onBehalfOfContentOwner string) Option { } func WithService(svc *youtube.Service) Option { - return func(p *playlistItem) { - if svc != nil { - service = svc - } else { - service = auth.NewY2BService() + return func(_ *playlistItem) { + if svc == nil { + svc = auth.NewY2BService( + auth.WithCredential(""), + auth.WithCacheToken(""), + ) } + service = svc } } diff --git a/pkg/search/search.go b/pkg/search/search.go index af370c3..18287f2 100644 --- a/pkg/search/search.go +++ b/pkg/search/search.go @@ -387,11 +387,13 @@ func WithVideoType(videoType string) Option { } func WithService(svc *youtube.Service) Option { - return func(s *search) { - if svc != nil { - service = svc - } else { - service = auth.NewY2BService() + return func(_ *search) { + if svc == nil { + svc = auth.NewY2BService( + auth.WithCredential(""), + auth.WithCacheToken(""), + ) } + service = svc } } diff --git a/pkg/subscription/subscription.go b/pkg/subscription/subscription.go index d364734..968624d 100644 --- a/pkg/subscription/subscription.go +++ b/pkg/subscription/subscription.go @@ -239,11 +239,13 @@ func WithTitle(title string) Option { } func WithService(svc *youtube.Service) Option { - return func(s *subscription) { - if svc != nil { - service = svc - } else { - service = auth.NewY2BService() + return func(_ *subscription) { + if svc == nil { + svc = auth.NewY2BService( + auth.WithCredential(""), + auth.WithCacheToken(""), + ) } + service = svc } } diff --git a/pkg/thumbnail/thumbnail.go b/pkg/thumbnail/thumbnail.go index 2b105d4..6be5480 100644 --- a/pkg/thumbnail/thumbnail.go +++ b/pkg/thumbnail/thumbnail.go @@ -71,11 +71,13 @@ func WithFile(file string) Option { } func WithService(svc *youtube.Service) Option { - return func(t *thumbnail) { - if svc != nil { - service = svc - } else { - service = auth.NewY2BService() + return func(_ *thumbnail) { + if svc == nil { + svc = auth.NewY2BService( + auth.WithCredential(""), + auth.WithCacheToken(""), + ) } + service = svc } } diff --git a/pkg/video/video.go b/pkg/video/video.go index e388587..8df7e82 100644 --- a/pkg/video/video.go +++ b/pkg/video/video.go @@ -571,11 +571,13 @@ func WithSecondaryReasonId(secondaryReasonId string) Option { } func WithService(svc *youtube.Service) Option { - return func(v *video) { - if svc != nil { - service = svc - } else { - service = auth.NewY2BService() + return func(_ *video) { + if svc == nil { + svc = auth.NewY2BService( + auth.WithCredential(""), + auth.WithCacheToken(""), + ) } + service = svc } } diff --git a/pkg/videoAbuseReportReason/videoAbuseReportReason.go b/pkg/videoAbuseReportReason/videoAbuseReportReason.go index 1e72dda..2348fab 100644 --- a/pkg/videoAbuseReportReason/videoAbuseReportReason.go +++ b/pkg/videoAbuseReportReason/videoAbuseReportReason.go @@ -73,11 +73,13 @@ func WithHL(hl string) Option { } func WithService(svc *youtube.Service) Option { - return func(vc *videoAbuseReportReason) { - if svc != nil { - service = svc - } else { - service = auth.NewY2BService() + return func(_ *videoAbuseReportReason) { + if svc == nil { + svc = auth.NewY2BService( + auth.WithCredential(""), + auth.WithCacheToken(""), + ) } + service = svc } } diff --git a/pkg/videoCategory/videoCategory.go b/pkg/videoCategory/videoCategory.go index 113a6bd..8aeb1b2 100644 --- a/pkg/videoCategory/videoCategory.go +++ b/pkg/videoCategory/videoCategory.go @@ -94,11 +94,13 @@ func WithRegionCode(regionCode string) Option { } func WithService(svc *youtube.Service) Option { - return func(vc *videoCategory) { - if svc != nil { - service = svc - } else { - service = auth.NewY2BService() + return func(_ *videoCategory) { + if svc == nil { + svc = auth.NewY2BService( + auth.WithCredential(""), + auth.WithCacheToken(""), + ) } + service = svc } } diff --git a/pkg/watermark/watermark.go b/pkg/watermark/watermark.go index 255377c..e76a031 100644 --- a/pkg/watermark/watermark.go +++ b/pkg/watermark/watermark.go @@ -140,11 +140,13 @@ func WithOnBehalfOfContentOwner(onBehalfOfContentOwner string) Option { } func WithService(svc *youtube.Service) Option { - return func(w *watermark) { - if svc != nil { - service = svc - } else { - service = auth.NewY2BService() + return func(_ *watermark) { + if svc == nil { + svc = auth.NewY2BService( + auth.WithCredential(""), + auth.WithCacheToken(""), + ) } + service = svc } }