From fe577635688ca179bc1c68995653b77d5e12d9c3 Mon Sep 17 00:00:00 2001
From: Alessio <me@playfulpachyderm.com>
Date: Sat, 10 Dec 2022 10:58:32 -0500
Subject: [PATCH] Change entrypoint functions to use NewGuestSession
 constructor for API

---
 scraper/search.go | 2 +-
 scraper/space.go  | 2 +-
 scraper/tweet.go  | 4 ++--
 scraper/user.go   | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/scraper/search.go b/scraper/search.go
index 55b37fa..ebf0c0f 100644
--- a/scraper/search.go
+++ b/scraper/search.go
@@ -18,7 +18,7 @@ func TimestampToDateString(timestamp int) string {
  * - videos
  */
 func Search(query string, min_results int) (trove TweetTrove, err error) {
-	api := API{}
+	api := NewGuestSession()
 	tweet_response, err := api.Search(query, "")
 	if err != nil {
 		return
diff --git a/scraper/space.go b/scraper/space.go
index 19e6676..00a4bb1 100644
--- a/scraper/space.go
+++ b/scraper/space.go
@@ -38,7 +38,7 @@ func ParseAPISpace(apiCard APICard) Space {
 }
 
 func FetchSpaceDetail(id SpaceID) (TweetTrove, error) {
-	api := API{}
+	api := NewGuestSession()
 	space_response, err := api.GetSpace(id)
 	if err != nil {
 		return TweetTrove{}, fmt.Errorf("Error in API call to fetch Space (id %q):\n  %w", id, err)
diff --git a/scraper/tweet.go b/scraper/tweet.go
index c3c0865..d62e01b 100644
--- a/scraper/tweet.go
+++ b/scraper/tweet.go
@@ -212,7 +212,7 @@ func ParseSingleTweet(apiTweet APITweet) (ret Tweet, err error) {
  * returns: the single Tweet
  */
 func GetTweet(id TweetID) (Tweet, error) {
-	api := API{}
+	api := NewGuestSession()
 	tweet_response, err := api.GetTweet(id, "")
 	if err != nil {
 		return Tweet{}, fmt.Errorf("Error in API call:\n  %w", err)
@@ -240,7 +240,7 @@ func GetTweet(id TweetID) (Tweet, error) {
  * returns: the tweet, list of its replies and context, and users associated with those replies
  */
 func GetTweetFull(id TweetID) (trove TweetTrove, err error) {
-	api := API{}
+	api := NewGuestSession()
 	tweet_response, err := api.GetTweet(id, "")
 	if err != nil {
 		err = fmt.Errorf("Error getting tweet: %d\n  %w", id, err)
diff --git a/scraper/user.go b/scraper/user.go
index 6dd1087..3d4e1dd 100644
--- a/scraper/user.go
+++ b/scraper/user.go
@@ -156,13 +156,13 @@ func ParseSingleUser(apiUser APIUser) (ret User, err error) {
 
 // Calls API#GetUser and returns the parsed result
 func GetUser(handle UserHandle) (User, error) {
-	api := API{}
+	api := NewGuestSession()
 	apiUser, err := api.GetUser(handle)
 	if apiUser.ScreenName == "" {
 		apiUser.ScreenName = string(handle)
 	}
 	if err != nil {
-		return User{}, err
+		return User{}, fmt.Errorf("Error fetching user %q:\n  %w", handle, err)
 	}
 	return ParseSingleUser(apiUser)
 }