✨ Allow read env when init youtube service

OpenWaygate · OpenWaygate · commit 445b1fa079d4 · 2024-11-26T01:18:13.000+08:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -144,11 +144,13 @@ func WithRegionCode(regionCode string) Option {`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`func WithService(svc *youtube.Service) Option {`
`147`		`- return func(a *activity) {`
`148`		`- if svc != nil {`
`149`		`- service = svc`
`150`		`- } else {`
`151`		`- service = auth.NewY2BService()`
	`147`	`+ return func(_ *activity) {`
	`148`	`+ if svc == nil {`
	`149`	`+ svc = auth.NewY2BService(`
	`150`	`+ auth.WithCredential(""),`
	`151`	`+ auth.WithCacheToken(""),`
	`152`	`+ )`
`152`	`153`	`}`
	`154`	`+ service = svc`
`153`	`155`	`}`
`154`	`156`	`}`
Original file line number	Diff line number	Diff line change
`@@ -376,11 +376,13 @@ func WithTlang(tlang string) Option {`
`376`	`376`	`}`
`377`	`377`
`378`	`378`	`func WithService(svc *youtube.Service) Option {`
`379`		`- return func(c *caption) {`
`380`		`- if svc != nil {`
`381`		`- service = svc`
`382`		`- } else {`
`383`		`- service = auth.NewY2BService()`
	`379`	`+ return func(_ *caption) {`
	`380`	`+ if svc == nil {`
	`381`	`+ svc = auth.NewY2BService(`
	`382`	`+ auth.WithCredential(""),`
	`383`	`+ auth.WithCacheToken(""),`
	`384`	`+ )`
`384`	`385`	`}`
	`386`	`+ service = svc`
`385`	`387`	`}`
`386`	`388`	`}`
Original file line number	Diff line number	Diff line change
`@@ -246,11 +246,13 @@ func WithTitle(title string) Option {`
`246`	`246`	`}`
`247`	`247`
`248`	`248`	`func WithService(svc *youtube.Service) Option {`
`249`		`- return func(c *channel) {`
`250`		`- if svc != nil {`
`251`		`- service = svc`
`252`		`- } else {`
`253`		`- service = auth.NewY2BService()`
	`249`	`+ return func(_ *channel) {`
	`250`	`+ if svc == nil {`
	`251`	`+ svc = auth.NewY2BService(`
	`252`	`+ auth.WithCredential(""),`
	`253`	`+ auth.WithCacheToken(""),`
	`254`	`+ )`
`254`	`255`	`}`
	`256`	`+ service = svc`
`255`	`257`	`}`
`256`	`258`	`}`
Original file line number	Diff line number	Diff line change
`@@ -91,11 +91,13 @@ func WithOnBehalfOfContentOwnerChannel(onBehalfOfContentOwnerChannel string) Opt`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`func WithService(svc *youtube.Service) Option {`
`94`		`- return func(cb *channelBanner) {`
`95`		`- if svc != nil {`
`96`		`- service = svc`
`97`		`- } else {`
`98`		`- service = auth.NewY2BService()`
	`94`	`+ return func(_ *channelBanner) {`
	`95`	`+ if svc == nil {`
	`96`	`+ svc = auth.NewY2BService(`
	`97`	`+ auth.WithCredential(""),`
	`98`	`+ auth.WithCacheToken(""),`
	`99`	`+ )`
`99`	`100`	`}`
	`101`	`+ service = svc`
`100`	`102`	`}`
`101`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -134,11 +134,13 @@ func WithOnBehalfOfContentOwner(onBehalfOfContentOwner string) Option {`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`func WithService(svc *youtube.Service) Option {`
`137`		`- return func(cs *channelSection) {`
`138`		`- if svc != nil {`
`139`		`- service = svc`
`140`		`- } else {`
`141`		`- service = auth.NewY2BService()`
	`137`	`+ return func(_ *channelSection) {`
	`138`	`+ if svc == nil {`
	`139`	`+ svc = auth.NewY2BService(`
	`140`	`+ auth.WithCredential(""),`
	`141`	`+ auth.WithCacheToken(""),`
	`142`	`+ )`
`142`	`143`	`}`
	`144`	`+ service = svc`
`143`	`145`	`}`
`144`	`146`	`}`
Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,9 @@ func (c *comment) SetModerationStatus(output string) {`
`212`	`212`	`utils.PrintYAML(c)`
`213`	`213`	`case "silent":`
`214`	`214`	`default:`
`215`		`- fmt.Printf("Comment moderation status set to %s: %s\n", c.ModerationStatus, c.IDs)`
	`215`	`+ fmt.Printf(`
	`216`	`+ "Comment moderation status set to %s: %s\n", c.ModerationStatus, c.IDs,`
	`217`	`+ )`
`216`	`218`	`}`
`217`	`219`	`}`
`218`	`220`
`@@ -304,11 +306,13 @@ func WithViewerRating(viewerRating string) Option {`
`304`	`306`	`}`
`305`	`307`
`306`	`308`	`func WithService(svc *youtube.Service) Option {`
`307`		`- return func(c *comment) {`
`308`		`- if svc != nil {`
`309`		`- service = svc`
`310`		`- } else {`
`311`		`- service = auth.NewY2BService()`
	`309`	`+ return func(_ *comment) {`
	`310`	`+ if svc == nil {`
	`311`	`+ svc = auth.NewY2BService(`
	`312`	`+ auth.WithCredential(""),`
	`313`	`+ auth.WithCacheToken(""),`
	`314`	`+ )`
`312`	`315`	`}`
	`316`	`+ service = svc`
`313`	`317`	`}`
`314`	`318`	`}`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,9 @@ func (c *commentThread) List(parts []string, output string) {`
`106`	`106`	`default:`
`107`	`107`	`fmt.Println("ID\tTopLevelCommentID")`
`108`	`108`	`for _, commentThread := range commentThreads {`
`109`		`- fmt.Printf("%s\t%s\n", commentThread.Id, commentThread.Snippet.TopLevelComment.Id)`
	`109`	`+ fmt.Printf(`
	`110`	`+ "%s\t%s\n", commentThread.Id, commentThread.Snippet.TopLevelComment.Id,`
	`111`	`+ )`
`110`	`112`	`}`
`111`	`113`	`}`
`112`	`114`	`}`
`@@ -212,11 +214,13 @@ func WithVideoId(videoId string) Option {`
`212`	`214`	`}`
`213`	`215`
`214`	`216`	`func WithService(svc *youtube.Service) Option {`
`215`		`- return func(c *commentThread) {`
`216`		`- if svc != nil {`
`217`		`- service = svc`
`218`		`- } else {`
`219`		`- service = auth.NewY2BService()`
	`217`	`+ return func(_ *commentThread) {`
	`218`	`+ if svc == nil {`
	`219`	`+ svc = auth.NewY2BService(`
	`220`	`+ auth.WithCredential(""),`
	`221`	`+ auth.WithCacheToken(""),`
	`222`	`+ )`
`220`	`223`	`}`
	`224`	`+ service = svc`
`221`	`225`	`}`
`222`	`226`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,11 +75,13 @@ func WithHl(hl string) Option {`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`func WithService(svc *youtube.Service) Option {`
`78`		`- return func(i *i18nLanguage) {`
`79`		`- if svc != nil {`
`80`		`- service = svc`
`81`		`- } else {`
`82`		`- service = auth.NewY2BService()`
	`78`	`+ return func(_ *i18nLanguage) {`
	`79`	`+ if svc == nil {`
	`80`	`+ svc = auth.NewY2BService(`
	`81`	`+ auth.WithCredential(""),`
	`82`	`+ auth.WithCacheToken(""),`
	`83`	`+ )`
`83`	`84`	`}`
	`85`	`+ service = svc`
`84`	`86`	`}`
`85`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -107,11 +107,13 @@ func WithMode(mode string) Option {`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`func WithService(svc *youtube.Service) Option {`
`110`		`- return func(m *member) {`
`111`		`- if svc != nil {`
`112`		`- service = svc`
`113`		`- } else {`
`114`		`- service = auth.NewY2BService()`
	`110`	`+ return func(_ *member) {`
	`111`	`+ if svc == nil {`
	`112`	`+ svc = auth.NewY2BService(`
	`113`	`+ auth.WithCredential(""),`
	`114`	`+ auth.WithCacheToken(""),`
	`115`	`+ )`
`115`	`116`	`}`
	`117`	`+ service = svc`
`116`	`118`	`}`
`117`	`119`	`}`