refactor code

abhinavxd · Mar 28, 2022 · 82df5ae · 82df5ae
1 parent 06e5cb9
commit 82df5ae
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -23,10 +23,6 @@ import (
 )
 
 func main() {
-	// Add your cookies here
-	// Google would sometimes ask you to solve a CAPTCHA before accessing it's websites
-	// or ask for your CONSENT if you are an EU user
-	// You can add those cookies here.
 	customCookies := []*http.Cookie{
 		{Name: "PREF",
 			Value:  "tz=Europe.Rome",
@@ -35,9 +31,13 @@ func main() {
 			Value:  fmt.Sprintf("YES+yt.432048971.it+FX+%d", 100+rand.Intn(999-100+1)),
 			MaxAge: 300},
 	}
+	// Google would sometimes ask user to solve a CAPTCHA before accessing it's websites.
+	// or ask for your CONSENT if you are an EU user
+	// You can add those cookies here.
+	// Adding cookies is OPTIONAL
+	YtChat.AddCookies(customCookies)
 
-	// Set customCookies as nil, if you do not require cookies.
-	continuation, cfg, error := YtChat.ParseInitialData("https://www.youtube.com/watch?v=5qap5aO4i9A", customCookies)
+	continuation, cfg, error := YtChat.ParseInitialData("https://www.youtube.com/watch?v=5qap5aO4i9A")
 	if error != nil {
 		log.Fatal(error)
 	}
@@ -60,6 +60,7 @@ func main() {
 	}
 }
 
+
 ```
 
 ## Screenshot

diff --git a/example/main.go b/example/main.go
@@ -10,10 +10,6 @@ import (
 )
 
 func main() {
-	// Add your cookies here
-	// Google would sometimes ask you to solve a CAPTCHA before accessing it's websites
-	// or ask for your CONSENT if you are an EU user
-	// You can add those cookies here.
 	customCookies := []*http.Cookie{
 		{Name: "PREF",
 			Value:  "tz=Europe.Rome",
@@ -22,8 +18,13 @@ func main() {
 			Value:  fmt.Sprintf("YES+yt.432048971.it+FX+%d", 100+rand.Intn(999-100+1)),
 			MaxAge: 300},
 	}
+	// Google would sometimes ask you to solve a CAPTCHA before accessing it's websites.
+	// or ask for your CONSENT if you are an EU user
+	// You can add those cookies here.
+	// Adding cookies is OPTIONAL
+	YtChat.AddCookies(customCookies)
 
-	continuation, cfg, error := YtChat.ParseInitialData("https://www.youtube.com/watch?v=5qap5aO4i9A", customCookies)
+	continuation, cfg, error := YtChat.ParseInitialData("https://www.youtube.com/watch?v=5qap5aO4i9A")
 	if error != nil {
 		log.Fatal(error)
 	}

diff --git a/yt_chat.go b/yt_chat.go
@@ -133,7 +133,11 @@ type InitialData struct {
 }
 
 var (
-	LIVE_CHAT_URL           = `https://www.youtube.com/youtubei/v1/live_chat/get_%s?key=%s`
+	LIVE_CHAT_URL = `https://www.youtube.com/youtubei/v1/live_chat/get_%s?key=%s`
+	// Google would sometimes ask you to solve a CAPTCHA before accessing it's websites
+	// or ask for your CONSENT if you are an EU user
+	// You can add those cookies here.
+	customCookies     []*http.Cookie
 	ErrLiveStreamOver error = errors.New("live stream over")
 	ErrStreamNotLive  error = errors.New("stream not live")
 )
@@ -246,15 +250,12 @@ func fetchChatMessages(initialContinuationInfo string, ytCfg YtCfg) ([]ChatMessa
 	return chatMessages, initialContinuationInfo, timeoutMs, nil
 }
 
-func ParseInitialData(videoUrl string, customCookies []*http.Cookie) (string, YtCfg, error) {
+func ParseInitialData(videoUrl string) (string, YtCfg, error) {
 	req, err := http.NewRequest("GET", videoUrl, nil)
 	if err != nil {
 		return "", YtCfg{}, err
 	}
 
-	// Google would sometimes ask you to solve a CAPTCHA before accessing it's websites
-	// or ask for your CONSENT if you are an EU user
-	// You can add those cookies here.
 	for _, cookie := range customCookies {
 		req.AddCookie(cookie)
 	}
@@ -315,3 +316,7 @@ func FetchContinuationChat(continuation string, ytCfg YtCfg) ([]ChatMessage, str
 	}
 	return chatMessages, continuation, nil
 }
+
+func AddCookies(cookies []*http.Cookie) {
+	customCookies = cookies
+}