Skip to content

Commit 532d481

Browse files
authored
Merge pull request #21 from mcopley08/master
added user feed functionality; fixed bug with getTotalLikedMedia()
2 parents 4231278 + 83aa18d commit 532d481

1 file changed

Lines changed: 22 additions & 4 deletions

File tree

InstagramAPI.py

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -353,11 +353,13 @@ def getTimeline(self):
353353
return query
354354

355355
def getUserFeed(self, usernameId, maxid = '', minTimestamp = None):
356+
query = self.SendRequest('feed/user/' + str(usernameId) + '/?max_id=' + str(maxid) + '&min_timestamp=' + str(minTimestamp)
357+
+ '&rank_token='+ str(self.rank_token) +'&ranked_content=true')
356358
# TODO Instagram.php 1200-1220
357-
return False
359+
return query
358360

359-
def getSelfUserFeed(self):
360-
return self.getUserFeed(self.username_id)
361+
def getSelfUserFeed(self, maxid = '', minTimestamp = None):
362+
return self.getUserFeed(self.username_id, maxid, minTimestamp)
361363

362364
def getHashtagFeed(self, hashtagString, maxid = ''):
363365
# TODO Instagram.php 1230-1250
@@ -561,7 +563,22 @@ def getTotalFollowings(self,usernameId):
561563

562564
if temp["big_list"] == False:
563565
return followers
564-
next_max_id = temp["next_max_id"]
566+
next_max_id = temp["next_max_id"]
567+
568+
def getTotalUserFeed(self, usernameId, minTimestamp = None):
569+
user_feed = []
570+
next_max_id = ''
571+
while 1:
572+
self.getUserFeed(usernameId, next_max_id, minTimestamp)
573+
temp = self.LastJson
574+
for item in temp["items"]:
575+
user_feed.append(item)
576+
if temp["more_available"] == False:
577+
return user_feed
578+
next_max_id = temp["next_max_id"]
579+
580+
def getTotalSelfUserFeed(self, minTimestamp = None):
581+
return self.getTotalUserFeed(self.username_id, minTimestamp)
565582

566583
def getTotalSelfFollowers(self):
567584
return getTotalFollowers(self.username_id)
@@ -574,6 +591,7 @@ def getTotalLikedMedia(self,scan_rate = 1):
574591
liked_items = []
575592
for x in range(0,scan_rate):
576593
temp = self.getLikedMedia(next_id)
594+
temp = self.LastJson
577595
next_id = temp["next_max_id"]
578596
for item in temp["items"]:
579597
liked_items.append(item)

0 commit comments

Comments
 (0)