mirror of https://gitlab.com/bashrc2/epicyon
Allow unordered items lists
parent
7ce82bf81a
commit
fd73beb56b
9
posts.py
9
posts.py
|
@ -230,6 +230,7 @@ def parseUserFeed(signingPrivateKeyPem: str,
|
||||||
if debug:
|
if debug:
|
||||||
print('Getting user feed for ' + feedUrl)
|
print('Getting user feed for ' + feedUrl)
|
||||||
print('User feed header ' + str(asHeader))
|
print('User feed header ' + str(asHeader))
|
||||||
|
print('httpPrefix ' + str(httpPrefix))
|
||||||
feedJson = getJson(signingPrivateKeyPem, session, feedUrl, asHeader, None,
|
feedJson = getJson(signingPrivateKeyPem, session, feedUrl, asHeader, None,
|
||||||
debug, projectVersion, httpPrefix, domain)
|
debug, projectVersion, httpPrefix, domain)
|
||||||
if not feedJson:
|
if not feedJson:
|
||||||
|
@ -243,6 +244,8 @@ def parseUserFeed(signingPrivateKeyPem: str,
|
||||||
|
|
||||||
if 'orderedItems' in feedJson:
|
if 'orderedItems' in feedJson:
|
||||||
return feedJson['orderedItems']
|
return feedJson['orderedItems']
|
||||||
|
elif 'items' in feedJson:
|
||||||
|
return feedJson['items']
|
||||||
|
|
||||||
nextUrl = None
|
nextUrl = None
|
||||||
if 'first' in feedJson:
|
if 'first' in feedJson:
|
||||||
|
@ -267,6 +270,8 @@ def parseUserFeed(signingPrivateKeyPem: str,
|
||||||
userFeed = nextUrl
|
userFeed = nextUrl
|
||||||
if userFeed.get('orderedItems'):
|
if userFeed.get('orderedItems'):
|
||||||
return userFeed['orderedItems']
|
return userFeed['orderedItems']
|
||||||
|
elif userFeed.get('items'):
|
||||||
|
return userFeed['items']
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
@ -3959,6 +3964,10 @@ def downloadFollowCollection(signingPrivateKeyPem: str,
|
||||||
for followerActor in followersJson['orderedItems']:
|
for followerActor in followersJson['orderedItems']:
|
||||||
if followerActor not in result:
|
if followerActor not in result:
|
||||||
result.append(followerActor)
|
result.append(followerActor)
|
||||||
|
elif followersJson.get('items'):
|
||||||
|
for followerActor in followersJson['items']:
|
||||||
|
if followerActor not in result:
|
||||||
|
result.append(followerActor)
|
||||||
else:
|
else:
|
||||||
break
|
break
|
||||||
else:
|
else:
|
||||||
|
|
Loading…
Reference in New Issue