@@ -46,11 +46,8 @@ def __init__(self, username, password, debug = False, IGDataPath = None):
46
46
def setUser (self , username , password ):
47
47
self .username = username
48
48
self .password = password
49
-
50
49
self .uuid = self .generateUUID (True )
51
50
52
- # TODO save data to file...
53
-
54
51
def login (self , force = False ):
55
52
if (not self .isLoggedIn or force ):
56
53
self .s = requests .Session ()
@@ -111,7 +108,6 @@ def expose(self):
111
108
112
109
def logout (self ):
113
110
logout = self .SendRequest ('accounts/logout/' )
114
- # TODO Instagram.php 180-185
115
111
116
112
def uploadPhoto (self , photo , caption = None , upload_id = None ):
117
113
if upload_id is None :
@@ -283,99 +279,82 @@ def getSelfUsernameInfo(self):
283
279
284
280
def getRecentActivity (self ):
285
281
activity = self .SendRequest ('news/inbox/?' )
286
- # TODO Instagram.php 911-925
287
282
return activity
288
283
289
284
def getFollowingRecentActivity (self ):
290
285
activity = self .SendRequest ('news/?' )
291
- # TODO Instagram.php 935-945
292
286
return activity
293
287
294
288
def getv2Inbox (self ):
295
289
inbox = self .SendRequest ('direct_v2/inbox/?' )
296
- # TODO Instagram.php 950-960
297
290
return inbox
298
291
299
292
def getUserTags (self , usernameId ):
300
293
tags = self .SendRequest ('usertags/' + str (usernameId ) + '/feed/?rank_token=' + str (self .rank_token ) + '&ranked_content=true&' )
301
- # TODO Instagram.php 975-985
302
294
return tags
303
295
304
296
def getSelfUserTags (self ):
305
297
return self .getUserTags (self .username_id )
306
298
307
299
def tagFeed (self , tag ):
308
300
userFeed = self .SendRequest ('feed/tag/' + str (tag ) + '/?rank_token=' + str (self .rank_token ) + '&ranked_content=true&' )
309
- # TODO Instagram.php 1000-1015
310
301
return userFeed
311
302
312
303
def getMediaLikers (self , mediaId ):
313
304
likers = self .SendRequest ('media/' + str (mediaId ) + '/likers/?' )
314
- # TODO Instagram.php 1025-1035
315
305
return likers
316
306
317
307
def getGeoMedia (self , usernameId ):
318
308
locations = self .SendRequest ('maps/user/' + str (usernameId ) + '/' )
319
- # TODO Instagram.php 1050-1060
320
309
return locations
321
310
322
311
def getSelfGeoMedia (self ):
323
312
return self .getGeoMedia (self .username_id )
324
313
325
314
def fbUserSearch (self , query ):
326
315
query = self .SendRequest ('fbsearch/topsearch/?context=blended&query=' + str (query ) + '&rank_token=' + str (self .rank_token ))
327
- # TODO Instagram.php 1080-1090
328
316
return query
329
317
330
318
def searchUsers (self , query ):
331
319
query = self .SendRequest ('users/search/?ig_sig_key_version=' + str (self .SIG_KEY_VERSION )
332
320
+ '&is_typeahead=true&query=' + str (query ) + '&rank_token=' + str (self .rank_token ))
333
- # TODO Instagram.php 1100-1110
334
321
return query
335
322
336
323
def searchUsername (self , usernameName ):
337
324
query = self .SendRequest ('users/' + str (usernameName ) + '/usernameinfo/' )
338
- # TODO Instagram.php 1080-1090
339
325
return query
340
326
341
327
def syncFromAdressBook (self , contacts ):
342
328
return self .SendRequest ('address_book/link/?include=extra_display_name,thumbnails' , json .dumps (contacts ))
343
329
344
330
def searchTags (self , query ):
345
331
query = self .SendRequest ('tags/search/?is_typeahead=true&q=' + str (query ) + '&rank_token=' + str (self .rank_token ))
346
- # TODO Instagram.php 1160-1170
347
332
return query
348
333
349
334
def getTimeline (self ):
350
335
query = self .SendRequest ('feed/timeline/?rank_token=' + str (self .rank_token ) + '&ranked_content=true&' )
351
- # TODO Instagram.php 1180-1190
352
336
return query
353
337
354
338
def getUserFeed (self , usernameId , maxid = '' , minTimestamp = None ):
355
339
query = self .SendRequest ('feed/user/' + str (usernameId ) + '/?max_id=' + str (maxid ) + '&min_timestamp=' + str (minTimestamp )
356
340
+ '&rank_token=' + str (self .rank_token ) + '&ranked_content=true' )
357
- # TODO Instagram.php 1200-1220
358
341
return query
359
342
360
343
def getSelfUserFeed (self , maxid = '' , minTimestamp = None ):
361
344
return self .getUserFeed (self .username_id , maxid , minTimestamp )
362
345
363
346
def getHashtagFeed (self , hashtagString , maxid = '' ):
364
- # TODO Instagram.php 1230-1250
365
347
return self .SendRequest ('feed/tag/' + hashtagString + '/?max_id=' + str (maxid )+ '&rank_token=' + self .rank_token + '&ranked_content=true&' )
366
348
367
349
def searchLocation (self , query ):
368
350
locationFeed = self .SendRequest ('fbsearch/places/?rank_token=' + str (self .rank_token ) + '&query=' + str (query ))
369
- # TODO Instagram.php 1250-1270
370
351
return locationFeed
371
352
372
353
def getLocationFeed (self , locationId , maxid = '' ):
373
- # TODO Instagram.php 1280-1300
374
354
return self .SendRequest ('feed/location/' + str (locationId )+ '/?max_id=' + maxid + '&rank_token=' + self .rank_token + '&ranked_content=true&' )
375
355
376
356
def getPopularFeed (self ):
377
357
popularFeed = self .SendRequest ('feed/popular/?people_teaser_supported=1&rank_token=' + str (self .rank_token ) + '&ranked_content=true&' )
378
- # TODO Instagram.php 1315-1325
379
358
return popularFeed
380
359
381
360
def getUserFollowings (self , usernameId , maxid = '' ):
0 commit comments