From d0d29310acea4533581683b891a1ac9806076599 Mon Sep 17 00:00:00 2001
From: Jesper Wrang <jesperwrang96@gmail.com>
Date: Fri, 8 Sep 2017 18:07:53 +0200
Subject: [PATCH] Server now sends less data when serving removed comments

---
 server.go | 38 ++++++++++++++++++++++++++++++++++----
 1 file changed, 34 insertions(+), 4 deletions(-)

diff --git a/server.go b/server.go
index 0ef67b3..9fca51b 100644
--- a/server.go
+++ b/server.go
@@ -49,10 +49,25 @@ type tokenResponse struct {
 	Scope       string `json:"scope"`
 }
 
-type pushshiftAPI struct {
+type pushshiftIDsAPI struct {
 	Data []string `json:"data"`
 }
 
+type pushshiftCommentsAPI struct {
+	Data []pushshiftComment `json:"data"`
+}
+
+type pushshiftComment struct {
+	Author          string `json:"author"`
+	AuthorFlairText string `json:"author_flair_text"`
+	Body            string `json:"body"`
+	CreatedUTC      int32  `json:"created_utc"`
+	ID              string `json:"id"`
+	IsSubmitter     bool   `json:"is_submitter"`
+	ParentID        string `json:"parent_id"`
+	Score           int32  `json:"score"`
+}
+
 type threadPageData struct {
 	Token      string
 	Subreddit  string
@@ -171,7 +186,7 @@ func threadHandler(w http.ResponseWriter, r *http.Request) {
 	}
 
 	body, err := ioutil.ReadAll(resp.Body)
-	var dataStructure pushshiftAPI
+	var dataStructure pushshiftIDsAPI
 	json.Unmarshal(body, &dataStructure)
 
 	data := &threadPageData{
@@ -194,12 +209,27 @@ func commentHandler(w http.ResponseWriter, r *http.Request) {
 	resp, err := client.Get(commentsURL + commentIDs)
 
 	if err != nil {
-		handleError(w, "Trouble getting removed comments from pushshift")
+		handleError(w, "Trouble getting removed comments from pushshift1")
 		return
 	}
 
 	body, _ := ioutil.ReadAll(resp.Body)
-	fmt.Fprintf(w, string(body))
+	var c pushshiftCommentsAPI
+	err = json.Unmarshal(body, &c)
+
+	if err != nil {
+		handleError(w, "Trouble parsing removed comments from pushshift2")
+		return
+	}
+
+	jsonString, err := json.Marshal(c)
+
+	if err != nil {
+		handleError(w, "Trouble parsing removed comments from pushshift3")
+		return
+	}
+
+	fmt.Fprintf(w, string(jsonString))
 }
 
 func getAPIToken() (string, error) {