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-05-07 17:56:21 +01:00
parent 019f885c01
commit afedb302b0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
announce.py
View File

@ -40,7 +40,7 @@ def outboxAnnounce(recentPostsCache: {},
return False return False
nickname = getNicknameFromActor(messageJson['actor']) nickname = getNicknameFromActor(messageJson['actor'])
if not nickname: if not nickname:
print('WARN: no nickname found in '+messageJson['actor']) print('WARN: no nickname found in ' + messageJson['actor'])
return False return False
domain, port = getDomainFromActor(messageJson['actor']) domain, port = getDomainFromActor(messageJson['actor'])
postFilename = locatePost(baseDir, nickname, domain, postFilename = locatePost(baseDir, nickname, domain,
@ -49,7 +49,7 @@ def outboxAnnounce(recentPostsCache: {},
updateAnnounceCollection(recentPostsCache, baseDir, postFilename, updateAnnounceCollection(recentPostsCache, baseDir, postFilename,
messageJson['actor'], domain, debug) messageJson['actor'], domain, debug)
return True return True
if messageJson['type'] == 'Undo': elif messageJson['type'] == 'Undo':
if not isinstance(messageJson['object'], dict): if not isinstance(messageJson['object'], dict):
return False return False
if not messageJson['object'].get('type'): if not messageJson['object'].get('type'):
@ -132,7 +132,7 @@ def createAnnounce(session, baseDir: str, federationList: [],
'/statuses/' + statusNumber '/statuses/' + statusNumber
newAnnounce = { newAnnounce = {
"@context": "https://www.w3.org/ns/activitystreams", "@context": "https://www.w3.org/ns/activitystreams",
'actor': httpPrefix+'://'+fullDomain+'/users/'+nickname, 'actor': httpPrefix + '://' + fullDomain + '/users/' + nickname,
'atomUri': atomUriStr, 'atomUri': atomUriStr,
'cc': [], 'cc': [],
'id': newAnnounceId + '/activity', 'id': newAnnounceId + '/activity',