From 992f79b26e412e21ae56121f44298c41c6e9d6ab Mon Sep 17 00:00:00 2001 From: Sean Liao Date: Wed, 21 Feb 2018 01:33:18 +0800 Subject: [PATCH 1/3] change UserTaggedFeed return to new type with int64 next_max_id and extra fields --- goinsta.go | 10 +++++++--- goinsta_test.go | 4 ++-- response/types.go | 13 +++++++++++++ 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/goinsta.go b/goinsta.go index ef6fb555..a606d11c 100644 --- a/goinsta.go +++ b/goinsta.go @@ -273,13 +273,17 @@ func (insta *Instagram) UserFeed(userID int64, maxID, minTimestamp string) (resp } // UserTaggedFeed - Returns the feed for medua a given user is tagged in -func (insta *Instagram) UserTaggedFeed(userID int64, maxID, minTimestamp string) (response.UserFeedResponse, error) { - resp := response.UserFeedResponse{} +func (insta *Instagram) UserTaggedFeed(userID, maxID int64, minTimestamp string) (response.UserTaggedFeedResponse, error) { + resp := response.UserTaggedFeedResponse{} + maxid := "" + if maxID != 0 { + maxid = string(maxID) + } body, err := insta.sendRequest(&reqOptions{ Endpoint: fmt.Sprintf("usertags/%d/feed/", userID), Query: map[string]string{ - "max_id": maxID, + "max_id": maxid, "rank_token": insta.Informations.RankToken, "min_timestamp": minTimestamp, "ranked_content": "true", diff --git a/goinsta_test.go b/goinsta_test.go index 62b3d13b..6493f8bd 100644 --- a/goinsta_test.go +++ b/goinsta_test.go @@ -505,7 +505,7 @@ func TestUserTaggedFeed(t *testing.T) { t.Skip("Empty username or password , Skipping ...") } - _, err := insta.UserTaggedFeed(17644112, "", "") // ID from elonmusk + _, err := insta.UserTaggedFeed(17644112, 0, "") // ID from elonmusk if err != nil { t.Fatal(err) return @@ -519,7 +519,7 @@ func TestUserTaggedFeedWithMaxIDAndTimestamp(t *testing.T) { t.Skip("Empty username or password , Skipping ...") } - _, err := insta.UserTaggedFeed(17644112, "25025320", "25025320") // ID from elonmusk + _, err := insta.UserTaggedFeed(17644112, 0, "25025320") // ID from elonmusk if err != nil { t.Fatal(err) return diff --git a/response/types.go b/response/types.go index 98ec6835..1e6a628d 100644 --- a/response/types.go +++ b/response/types.go @@ -431,6 +431,19 @@ type DirectThread struct { } `json:"thread"` } +type UserTaggedFeedResponse struct { + Status string `json:"status"` + NumResults int `json:"num_results"` + AutoLoadMoreEnabled bool `json:"auto_load_more_enabled"` + Items []Item `json:"items"` + MoreAvailable bool `json:"more_available"` + NextMaxID int `json:"next_max_id"` + TotalCount int `json:"total_count"` + RequiresReview bool `json:"requires_review"` + // maybe this is photos waiting for review? + // NewPhotos []interface{} `json:"new_photos"` +} + // UserFeedResponse contains user feeds type UserFeedResponse struct { Status string `json:"status"` From 4284ca050323296b87c78e4ebab0466b62cb80f1 Mon Sep 17 00:00:00 2001 From: Sean Liao Date: Wed, 21 Feb 2018 01:38:27 +0800 Subject: [PATCH 2/3] change test case --- goinsta_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/goinsta_test.go b/goinsta_test.go index 6493f8bd..61b7f4ad 100644 --- a/goinsta_test.go +++ b/goinsta_test.go @@ -519,7 +519,7 @@ func TestUserTaggedFeedWithMaxIDAndTimestamp(t *testing.T) { t.Skip("Empty username or password , Skipping ...") } - _, err := insta.UserTaggedFeed(17644112, 0, "25025320") // ID from elonmusk + _, err := insta.UserTaggedFeed(17644112, 25035320, "25025320") // ID from elonmusk if err != nil { t.Fatal(err) return From 31180169f854d1cb2d41383f89a6e4bbf73650ea Mon Sep 17 00:00:00 2001 From: Sean Liao Date: Wed, 21 Feb 2018 01:54:07 +0800 Subject: [PATCH 3/3] change int -> int64 for next_max_id --- response/types.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/response/types.go b/response/types.go index 1e6a628d..466da912 100644 --- a/response/types.go +++ b/response/types.go @@ -437,7 +437,7 @@ type UserTaggedFeedResponse struct { AutoLoadMoreEnabled bool `json:"auto_load_more_enabled"` Items []Item `json:"items"` MoreAvailable bool `json:"more_available"` - NextMaxID int `json:"next_max_id"` + NextMaxID int64 `json:"next_max_id"` TotalCount int `json:"total_count"` RequiresReview bool `json:"requires_review"` // maybe this is photos waiting for review?