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

Tidying

merge-requests/30/head
Bob Mottram 2021-08-01 17:23:32 +01:00
parent 6863d3bf62
commit 9ad912aec5
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
posts.py
View File

@ -205,8 +205,6 @@ def parseUserFeed(session, feedUrl: str, asHeader: {},
pprint(feedJson) pprint(feedJson)
if 'orderedItems' in feedJson: if 'orderedItems' in feedJson:
#for item in feedJson['orderedItems']:
# yield item
return feedJson['orderedItems'] return feedJson['orderedItems']
nextUrl = None nextUrl = None
@ -226,14 +224,10 @@ def parseUserFeed(session, feedUrl: str, asHeader: {},
projectVersion, httpPrefix, projectVersion, httpPrefix,
domain, debug, depth + 1) domain, debug, depth + 1)
if userFeed: if userFeed:
#for item in userFeed:
# yield item
return userFeed return userFeed
elif isinstance(nextUrl, dict): elif isinstance(nextUrl, dict):
userFeed = nextUrl userFeed = nextUrl
if userFeed.get('orderedItems'): if userFeed.get('orderedItems'):
#for item in userFeed['orderedItems']:
# yield item
return userFeed['orderedItems'] return userFeed['orderedItems']
return None return None
@ -546,8 +540,7 @@ def _getPosts(session, outboxUrl: str, maxPosts: int,
"plaintext": _cleanHtml(content), "plaintext": _cleanHtml(content),
"attachment": attachment, "attachment": attachment,
"mentions": mentions, "mentions": mentions,
"emoji": emoji, "emoji": emoji
"conversation": conversation
} }
i += 1 i += 1

7
tests.py
View File

@ -1475,7 +1475,8 @@ def testGroupFollow():
assert validInboxFilenames(testgroupDir, 'testgroup', testgroupDomain, assert validInboxFilenames(testgroupDir, 'testgroup', testgroupDomain,
aliceDomain, alicePort) aliceDomain, alicePort)
assert 'alice@' + aliceDomain in open(testgroupFollowersFilename).read() assert 'alice@' + aliceDomain in open(testgroupFollowersFilename).read()
assert '!alice@' + aliceDomain not in open(testgroupFollowersFilename).read() assert '!alice@' + aliceDomain not in \
open(testgroupFollowersFilename).read()
testgroupWebfingerFilename = \ testgroupWebfingerFilename = \
testgroupDir + '/wfendpoints/testgroup@' + \ testgroupDir + '/wfendpoints/testgroup@' + \
@ -1620,7 +1621,7 @@ def testGroupFollow():
print('\n\n*********************************************************') print('\n\n*********************************************************')
print('Check that post was relayed from test group to bob') print('Check that post was relayed from test group to bob')
# bobMessageArrived = False # bobMessageArrived = False
for i in range(20): for i in range(20):
time.sleep(1) time.sleep(1)
if os.path.isdir(inboxPathBob): if os.path.isdir(inboxPathBob):
@ -1628,7 +1629,7 @@ def testGroupFollow():
len([name for name in os.listdir(inboxPathBob) len([name for name in os.listdir(inboxPathBob)
if os.path.isfile(os.path.join(inboxPathBob, name))]) if os.path.isfile(os.path.join(inboxPathBob, name))])
if currPostsBob > startPostsBob: if currPostsBob > startPostsBob:
# bobMessageArrived = True # bobMessageArrived = True
print('Bob received relayed group post!') print('Bob received relayed group post!')
break break