indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Allow unordered items lists

merge-requests/30/head
Bob Mottram 2021-09-11 13:10:44 +01:00
parent 7ce82bf81a
commit fd73beb56b
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
posts.py
View File

@ -230,6 +230,7 @@ def parseUserFeed(signingPrivateKeyPem: str,
if debug:
print('Getting user feed for ' + feedUrl)
print('User feed header ' + str(asHeader))
print('httpPrefix ' + str(httpPrefix))
feedJson = getJson(signingPrivateKeyPem, session, feedUrl, asHeader, None,
debug, projectVersion, httpPrefix, domain)
if not feedJson:
@ -243,6 +244,8 @@ def parseUserFeed(signingPrivateKeyPem: str,
if 'orderedItems' in feedJson:
return feedJson['orderedItems']
elif 'items' in feedJson:
return feedJson['items']
nextUrl = None
if 'first' in feedJson:
@ -267,6 +270,8 @@ def parseUserFeed(signingPrivateKeyPem: str,
userFeed = nextUrl
if userFeed.get('orderedItems'):
return userFeed['orderedItems']
elif userFeed.get('items'):
return userFeed['items']
return None
@ -3959,6 +3964,10 @@ def downloadFollowCollection(signingPrivateKeyPem: str,
for followerActor in followersJson['orderedItems']:
if followerActor not in result:
result.append(followerActor)
elif followersJson.get('items'):
for followerActor in followersJson['items']:
if followerActor not in result:
result.append(followerActor)
else:
break
else: