From 1f93fb5e38ac4435b822bcf872ac7eca86ea7224 Mon Sep 17 00:00:00 2001
From: robviren <robviren@gmail.com>
Date: Tue, 22 Feb 2022 22:27:05 -0600
Subject: [PATCH] Added two weeks, some minor fixes

---
 runner/instagram.go | 40 +++++++++++++++++++++++++++++-----------
 runner/runner.go    |  4 ++--
 runner/scroll.go    | 10 +++++-----
 3 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/runner/instagram.go b/runner/instagram.go
index eb578c6..85ee66c 100644
--- a/runner/instagram.go
+++ b/runner/instagram.go
@@ -42,8 +42,16 @@ var instagram_liked_by string
 const insta_login_url = "https://www.instagram.com/accounts/login/"
 
 func (r *Runner) CheckInstaGram() {
-	r.page.MustNavigate(insta_login_url)
-	r.page.WaitLoad()
+	err := r.page.Navigate(insta_login_url)
+	for err != nil {
+		fmt.Print("check insta")
+		err = r.page.Timeout(5 * time.Second).Navigate(insta_login_url)
+	}
+	err = r.page.Timeout(5 * time.Second).WaitLoad()
+	for err != nil {
+		fmt.Print("check insta wait")
+		err = r.page.Reload()
+	}
 	location := r.page.MustEval("window.location.href").Str()
 	if location == insta_login_url {
 		r.page.MustElement(`input[name="username"]`).Input(r.InstaUser)
@@ -56,8 +64,16 @@ func (r *Runner) CheckInstaGram() {
 }
 
 func (r *Runner) InstaPageNavigate(index int) {
-	r.page.MustNavigate(r.Targets[index].Instagram)
-	r.page.MustWaitLoad()
+	err := r.page.Navigate(r.Targets[index].Instagram)
+	for err != nil {
+		fmt.Print("insta page nav")
+		err = r.page.Timeout(5 * time.Second).Navigate(r.Targets[index].Instagram)
+	}
+	err = r.page.Timeout(5 * time.Second).WaitLoad()
+	for err != nil {
+		fmt.Print("insta page wait")
+		err = r.page.Reload()
+	}
 	r.Scroll(4, 250)
 }
 
@@ -91,9 +107,10 @@ func (r *Runner) GetInstaDataByIndex(index int) Result {
 	res2 := r.InstaGetRes()
 	fmt.Println(len(res.Urls))
 	fmt.Println(len(res2.Urls))
-	for _, url2 := range res.Urls {
+
+	for _, url2 := range res2.Urls {
 		wasIn := false
-		for _, url := range res2.Urls {
+		for _, url := range res.Urls {
 			if url == url2 {
 				wasIn = true
 			}
@@ -129,13 +146,14 @@ func (r *Runner) GetIntsaEgagement(urls []string) []InstaPost {
 		fmt.Print("https://www.instagram.com" + url + " ---> ")
 		err := r.page.Timeout(5 * time.Second).Navigate("https://www.instagram.com" + url)
 		for err != nil {
-			fmt.Print(".")
-			err = r.page.Navigate("https://www.instagram.com" + url)
+			fmt.Print("get insta engage")
+			err = r.page.Timeout(5 * time.Second).Navigate("https://www.instagram.com" + url)
 		}
+
 		err = r.page.Timeout(5 * time.Second).WaitLoad()
 		for err != nil {
-			fmt.Print(".")
-			err = r.page.Timeout(5 * time.Second).WaitLoad()
+			fmt.Print("get insta engage wait")
+			err = r.page.WaitLoad()
 		}
 		r.Scroll(10, 250)
 
@@ -157,7 +175,7 @@ func (r *Runner) GetIntsaEgagement(urls []string) []InstaPost {
 				} else {
 					element.MustClick()
 					r.page.MustWaitLoad()
-					r.Scroll(99999, longTimeOut)
+					r.Scroll(99999, 2000)
 					likes := r.page.MustEval(instagram_liked_by).Int()
 					res.Likes = likes
 				}
diff --git a/runner/runner.go b/runner/runner.go
index ace271b..5c36835 100644
--- a/runner/runner.go
+++ b/runner/runner.go
@@ -99,12 +99,12 @@ func configRod(r *Runner) {
 
 func setTime(r *Runner) {
 	//Establish the date
-	weekago := time.Now().AddDate(0, 0, -7)
+	weekago := time.Now().AddDate(0, 0, -14)
 	hours := weekago.Hour()
 	weekago = weekago.Add(time.Duration(-hours) * time.Hour)
 	r.weekago = weekago
 
-	currentTime := time.Now()
+	currentTime := time.Now().AddDate(0, 0, -7)
 	hours = currentTime.Hour()
 	r.currentTime = currentTime.Add(time.Duration(-hours) * time.Hour)
 }
diff --git a/runner/scroll.go b/runner/scroll.go
index 167e79b..7b91986 100644
--- a/runner/scroll.go
+++ b/runner/scroll.go
@@ -12,11 +12,11 @@ var scroll string
 func (r *Runner) Scroll(limit int, timeout int) {
 	_, err := r.page.Eval(scroll, limit, timeout)
 	if err != nil {
-		panic("Scroll Error")
+		fmt.Println("Scroll error")
 	}
-	err = r.page.Timeout(5 * time.Second).WaitLoad()
-	for err != nil {
-		fmt.Println("scroll")
-		err = r.page.Timeout(5 * time.Second).WaitLoad()
+	r.page.Timeout(5 * time.Second).WaitLoad()
+	if err != nil {
+		fmt.Println("Scroll Waitload Error")
 	}
+
 }