Add proxy option in yt

Author: JustHumanz

pkg/engine/engine.go

@@ -666,16 +666,28 @@ func RemoveTwitterShortLink(text string) string {
 }
 
 //GetRSS GetRSS from Channel
-func GetRSS(YtID string) []string {
+func GetRSS(YtID string, proxy bool) []string {
 	var (
 		DataXML YtXML
 		VideoID []string
+		URL     = "https://www.youtube.com/feeds/videos.xml?channel_id=" + YtID + "&q=searchterms"
 	)
 
-	Data, err := network.Curl("https://www.youtube.com/feeds/videos.xml?channel_id="+YtID+"&q=searchterms", nil)
-	if err != nil {
-		log.Error(err, string(Data))
-	}
+	Data := func() []byte {
+		if proxy {
+			D, err := network.Curl(URL, nil)
+			if err != nil {
+				log.Error(err, string(D))
+			}
+			return D
+		} else {
+			D, err := network.CoolerCurl(URL, nil)
+			if err != nil {
+				log.Error(err, string(D))
+			}
+			return D
+		}
+	}()
 
 	xml.Unmarshal(Data, &DataXML)
 

service/livestream/youtube/checker/getdata.go

@@ -27,7 +27,7 @@ func StartCheckYT(Group database.Group, Update bool, wg *sync.WaitGroup) {
 				"Group": Group.GroupName,
 			}).Info("Checking Group channel")
 
-			VideoID := engine.GetRSS(YtChan.YtChannel)
+			VideoID := engine.GetRSS(YtChan.YtChannel, *proxy)
 			for _, ID := range VideoID {
 				YoutubeData, err := YtChan.CheckYoutubeVideo(ID)
 				if err != nil {
@@ -231,7 +231,7 @@ func StartCheckYT(Group database.Group, Update bool, wg *sync.WaitGroup) {
 				"Group":  Group.GroupName,
 			}).Info("Checking Vtuber channel")
 
-			VideoID := engine.GetRSS(Member.YoutubeID)
+			VideoID := engine.GetRSS(Member.YoutubeID, *proxy)
 			for _, ID := range VideoID {
 				YoutubeData, err := Member.CheckYoutubeVideo(ID)
 				if err != nil {

service/livestream/youtube/checker/youtube.go

@@ -3,6 +3,7 @@ package main
 import (
 	"context"
 	"encoding/json"
+	"flag"
 	"math"
 	"strings"
 	"sync"
@@ -24,6 +25,7 @@ var (
 	Bot          *discordgo.Session
 	GroupPayload *[]database.Group
 	gRCPconn     pilot.PilotServiceClient
+	proxy        = flag.Bool("MultiTOR", false, "Enable MultiTOR for scrapping yt rss")
 )
 
 const (
@@ -32,6 +34,7 @@ const (
 
 func init() {
 	log.SetFormatter(&log.TextFormatter{FullTimestamp: true, DisableColors: true})
+	flag.Parse()
 	gRCPconn = pilot.NewPilotServiceClient(network.InitgRPC(config.Pilot))
 }
 

service/migrate/scraper.go

@@ -36,7 +36,7 @@ func TwitterFanart() {
 }
 
 func FilterYt(Dat database.Member, wg *sync.WaitGroup) {
-	VideoID := engine.GetRSS(Dat.YoutubeID)
+	VideoID := engine.GetRSS(Dat.YoutubeID, false)
 	defer wg.Done()
 	body, err := network.Curl("https://www.googleapis.com/youtube/v3/videos?part=statistics,snippet,liveStreamingDetails&fields=items(snippet(publishedAt,title,description,thumbnails(standard),channelTitle,liveBroadcastContent),liveStreamingDetails(scheduledStartTime,actualEndTime),statistics(viewCount))&id="+strings.Join(VideoID, ",")+"&key="+*YoutubeToken, nil)
 	if err != nil {

swarm/live.yaml

@@ -27,6 +27,7 @@ services:
       - "/etc/localtime:/etc/localtime:ro"
     networks:
       - go-simp-net
+    command: ./liveyoutube -MultiTOR  
 
   youtube_counter:
     image: justhumanz/go-simp-youtube-counter-livestream:${RELEASE_VERSION}