Skip to content

Commit 445b1fa

Browse files
OpenWaygateOpenWaygate
committed
✨ Allow read env when init youtube service
1 parent 44bb314 commit 445b1fa

File tree

20 files changed

+146
-102
lines changed

20 files changed

+146
-102
lines changed

‎pkg/activity/activity.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -144,11 +144,13 @@ func WithRegionCode(regionCode string) Option {
144144
}
145145

146146
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+
)
152153
}
154+
service = svc
153155
}
154156
}

‎pkg/caption/caption.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -376,11 +376,13 @@ func WithTlang(tlang string) Option {
376376
}
377377

378378
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+
)
384385
}
386+
service = svc
385387
}
386388
}

‎pkg/channel/channel.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -246,11 +246,13 @@ func WithTitle(title string) Option {
246246
}
247247

248248
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+
)
254255
}
256+
service = svc
255257
}
256258
}

‎pkg/channelBanner/channelBanner.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,13 @@ func WithOnBehalfOfContentOwnerChannel(onBehalfOfContentOwnerChannel string) Opt
9191
}
9292

9393
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+
)
99100
}
101+
service = svc
100102
}
101103
}

‎pkg/channelSection/channelSection.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -134,11 +134,13 @@ func WithOnBehalfOfContentOwner(onBehalfOfContentOwner string) Option {
134134
}
135135

136136
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+
)
142143
}
144+
service = svc
143145
}
144146
}

‎pkg/comment/comment.go

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,9 @@ func (c *comment) SetModerationStatus(output string) {
212212
utils.PrintYAML(c)
213213
case "silent":
214214
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+
)
216218
}
217219
}
218220

@@ -304,11 +306,13 @@ func WithViewerRating(viewerRating string) Option {
304306
}
305307

306308
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+
)
312315
}
316+
service = svc
313317
}
314318
}

‎pkg/commentThread/commentThread.go

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,9 @@ func (c *commentThread) List(parts []string, output string) {
106106
default:
107107
fmt.Println("ID\tTopLevelCommentID")
108108
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+
)
110112
}
111113
}
112114
}
@@ -212,11 +214,13 @@ func WithVideoId(videoId string) Option {
212214
}
213215

214216
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+
)
220223
}
224+
service = svc
221225
}
222226
}

‎pkg/i18nLanguage/i18nLanguage.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,13 @@ func WithHl(hl string) Option {
7575
}
7676

7777
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+
)
8384
}
85+
service = svc
8486
}
8587
}

‎pkg/i18nRegion/i18nRegion.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,13 @@ func WithHl(hl string) Option {
7575
}
7676

7777
func WithService(svc *youtube.Service) Option {
78-
return func(i *i18nRegion) {
79-
if svc != nil {
80-
service = svc
81-
} else {
82-
service = auth.NewY2BService()
78+
return func(_ *i18nRegion) {
79+
if svc == nil {
80+
svc = auth.NewY2BService(
81+
auth.WithCredential(""),
82+
auth.WithCacheToken(""),
83+
)
8384
}
85+
service = svc
8486
}
8587
}

‎pkg/member/member.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,13 @@ func WithMode(mode string) Option {
107107
}
108108

109109
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+
)
115116
}
117+
service = svc
116118
}
117119
}

‎pkg/membershipsLevel/membershipsLevel.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,13 @@ func (m *membershipsLevel) List(parts []string, output string) {
6363
}
6464

6565
func WithService(svc *youtube.Service) Option {
66-
return func(m *membershipsLevel) {
67-
if svc != nil {
68-
service = svc
69-
} else {
70-
service = auth.NewY2BService()
66+
return func(_ *membershipsLevel) {
67+
if svc == nil {
68+
svc = auth.NewY2BService(
69+
auth.WithCredential(""),
70+
auth.WithCacheToken(""),
71+
)
7172
}
73+
service = svc
7274
}
7375
}

‎pkg/playlist/playlist.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -258,11 +258,13 @@ func WithOnBehalfOfContentOwnerChannel(channel string) Option {
258258
}
259259

260260
func WithService(svc *youtube.Service) Option {
261-
return func(p *playlist) {
262-
if svc != nil {
263-
service = svc
264-
} else {
265-
service = auth.NewY2BService()
261+
return func(_ *playlist) {
262+
if svc == nil {
263+
svc = auth.NewY2BService(
264+
auth.WithCredential(""),
265+
auth.WithCacheToken(""),
266+
)
266267
}
268+
service = svc
267269
}
268270
}

‎pkg/playlistItem/playlistItem.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -284,11 +284,13 @@ func WithOnBehalfOfContentOwner(onBehalfOfContentOwner string) Option {
284284
}
285285

286286
func WithService(svc *youtube.Service) Option {
287-
return func(p *playlistItem) {
288-
if svc != nil {
289-
service = svc
290-
} else {
291-
service = auth.NewY2BService()
287+
return func(_ *playlistItem) {
288+
if svc == nil {
289+
svc = auth.NewY2BService(
290+
auth.WithCredential(""),
291+
auth.WithCacheToken(""),
292+
)
292293
}
294+
service = svc
293295
}
294296
}

‎pkg/search/search.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -387,11 +387,13 @@ func WithVideoType(videoType string) Option {
387387
}
388388

389389
func WithService(svc *youtube.Service) Option {
390-
return func(s *search) {
391-
if svc != nil {
392-
service = svc
393-
} else {
394-
service = auth.NewY2BService()
390+
return func(_ *search) {
391+
if svc == nil {
392+
svc = auth.NewY2BService(
393+
auth.WithCredential(""),
394+
auth.WithCacheToken(""),
395+
)
395396
}
397+
service = svc
396398
}
397399
}

‎pkg/subscription/subscription.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -239,11 +239,13 @@ func WithTitle(title string) Option {
239239
}
240240

241241
func WithService(svc *youtube.Service) Option {
242-
return func(s *subscription) {
243-
if svc != nil {
244-
service = svc
245-
} else {
246-
service = auth.NewY2BService()
242+
return func(_ *subscription) {
243+
if svc == nil {
244+
svc = auth.NewY2BService(
245+
auth.WithCredential(""),
246+
auth.WithCacheToken(""),
247+
)
247248
}
249+
service = svc
248250
}
249251
}

‎pkg/thumbnail/thumbnail.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,13 @@ func WithFile(file string) Option {
7171
}
7272

7373
func WithService(svc *youtube.Service) Option {
74-
return func(t *thumbnail) {
75-
if svc != nil {
76-
service = svc
77-
} else {
78-
service = auth.NewY2BService()
74+
return func(_ *thumbnail) {
75+
if svc == nil {
76+
svc = auth.NewY2BService(
77+
auth.WithCredential(""),
78+
auth.WithCacheToken(""),
79+
)
7980
}
81+
service = svc
8082
}
8183
}

‎pkg/video/video.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -571,11 +571,13 @@ func WithSecondaryReasonId(secondaryReasonId string) Option {
571571
}
572572

573573
func WithService(svc *youtube.Service) Option {
574-
return func(v *video) {
575-
if svc != nil {
576-
service = svc
577-
} else {
578-
service = auth.NewY2BService()
574+
return func(_ *video) {
575+
if svc == nil {
576+
svc = auth.NewY2BService(
577+
auth.WithCredential(""),
578+
auth.WithCacheToken(""),
579+
)
579580
}
581+
service = svc
580582
}
581583
}

‎pkg/videoAbuseReportReason/videoAbuseReportReason.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,13 @@ func WithHL(hl string) Option {
7373
}
7474

7575
func WithService(svc *youtube.Service) Option {
76-
return func(vc *videoAbuseReportReason) {
77-
if svc != nil {
78-
service = svc
79-
} else {
80-
service = auth.NewY2BService()
76+
return func(_ *videoAbuseReportReason) {
77+
if svc == nil {
78+
svc = auth.NewY2BService(
79+
auth.WithCredential(""),
80+
auth.WithCacheToken(""),
81+
)
8182
}
83+
service = svc
8284
}
8385
}

‎pkg/videoCategory/videoCategory.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,13 @@ func WithRegionCode(regionCode string) Option {
9494
}
9595

9696
func WithService(svc *youtube.Service) Option {
97-
return func(vc *videoCategory) {
98-
if svc != nil {
99-
service = svc
100-
} else {
101-
service = auth.NewY2BService()
97+
return func(_ *videoCategory) {
98+
if svc == nil {
99+
svc = auth.NewY2BService(
100+
auth.WithCredential(""),
101+
auth.WithCacheToken(""),
102+
)
102103
}
104+
service = svc
103105
}
104106
}

0 commit comments

Comments
 (0)