prehistoric-systems/removeddit
1
0
Fork 0
mirror of https://github.com/gurnec/removeddit.git synced 2026-03-11 08:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Server now sends less data when serving removed comments

Browse source
This commit is contained in:
Jesper Wrang 2017-09-08 18:07:53 +02:00
parent 8e9f5b00e3
commit d0d29310ac
1 changed files with 34 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
server.go
View file

@ -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) {