From fd73beb56b8a92e8729b9c8f1d90f6b654c79980 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sat, 11 Sep 2021 13:10:44 +0100 Subject: [PATCH] Allow unordered items lists --- posts.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/posts.py b/posts.py index 58b330c32..e4bde174e 100644 --- a/posts.py +++ b/posts.py @@ -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: