mj-saunders
/
epicyon
forked from indymedia/epicyon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tidying

main
Bob Mottram 2020-03-31 11:07:58 +00:00
parent acc1361c4d
commit df5effc3c5
1 changed files with 37 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
posts.py
View File

@ -413,7 +413,8 @@ def getPosts(session,outboxUrl: str,maxPosts: int, \
break break
return personPosts return personPosts
def deleteAllPosts(baseDir: str,nickname: str, domain: str,boxname: str) -> None: def deleteAllPosts(baseDir: str, \
nickname: str, domain: str,boxname: str) -> None:
"""Deletes all posts for a person from inbox or outbox """Deletes all posts for a person from inbox or outbox
""" """
if boxname!='inbox' and boxname!='outbox' and boxname!='tlblogs': if boxname!='inbox' and boxname!='outbox' and boxname!='tlblogs':
@ -569,7 +570,8 @@ def createPostBase(baseDir: str,nickname: str,domain: str,port: int, \
if followersOnly: if followersOnly:
postTo=postCC postTo=postCC
postCC='' postCC=''
newPostId=httpPrefix+'://'+domain+'/users/'+nickname+'/statuses/'+statusNumber newPostId= \
httpPrefix+'://'+domain+'/users/'+nickname+'/statuses/'+statusNumber
sensitive=False sensitive=False
summary=None summary=None
@ -803,7 +805,8 @@ def outboxMessageCreateWrap(httpPrefix: str, \
statusNumber,published=getStatusNumber() statusNumber,published=getStatusNumber()
if messageJson.get('published'): if messageJson.get('published'):
published=messageJson['published'] published=messageJson['published']
newPostId=httpPrefix+'://'+domain+'/users/'+nickname+'/statuses/'+statusNumber newPostId= \
httpPrefix+'://'+domain+'/users/'+nickname+'/statuses/'+statusNumber
cc=[] cc=[]
if messageJson.get('cc'): if messageJson.get('cc'):
cc=messageJson['cc'] cc=messageJson['cc']
@ -2809,9 +2812,13 @@ def downloadAnnounce(session,baseDir: str,httpPrefix: str, \
if postJsonObject: if postJsonObject:
return postJsonObject return postJsonObject
else: else:
asHeader={'Accept': 'application/activity+json; profile="https://www.w3.org/ns/activitystreams"'} asHeader={
'Accept': 'application/activity+json; profile="https://www.w3.org/ns/activitystreams"'
}
if '/channel/' in postJsonObject['actor']: if '/channel/' in postJsonObject['actor']:
asHeader={'Accept': 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'} asHeader={
'Accept': 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'
}
actorNickname=getNicknameFromActor(postJsonObject['actor']) actorNickname=getNicknameFromActor(postJsonObject['actor'])
actorDomain,actorPort=getDomainFromActor(postJsonObject['actor']) actorDomain,actorPort=getDomainFromActor(postJsonObject['actor'])
if not actorDomain: if not actorDomain:
@ -2819,7 +2826,8 @@ def downloadAnnounce(session,baseDir: str,httpPrefix: str, \
str(postJsonObject['actor'])) str(postJsonObject['actor']))
return None return None
if isBlocked(baseDir,nickname,domain,actorNickname,actorDomain): if isBlocked(baseDir,nickname,domain,actorNickname,actorDomain):
print('Announce download blocked actor: '+actorNickname+'@'+actorDomain) print('Announce download blocked actor: '+ \
actorNickname+'@'+actorDomain)
return None return None
objectNickname=getNicknameFromActor(postJsonObject['object']) objectNickname=getNicknameFromActor(postJsonObject['object'])
objectDomain,objectPort=getDomainFromActor(postJsonObject['object']) objectDomain,objectPort=getDomainFromActor(postJsonObject['object'])
@ -2829,9 +2837,11 @@ def downloadAnnounce(session,baseDir: str,httpPrefix: str, \
return None return None
if isBlocked(baseDir,nickname,domain,objectNickname,objectDomain): if isBlocked(baseDir,nickname,domain,objectNickname,objectDomain):
if objectNickname and objectDomain: if objectNickname and objectDomain:
print('Announce download blocked object: '+objectNickname+'@'+objectDomain) print('Announce download blocked object: '+ \
objectNickname+'@'+objectDomain)
else: else:
print('Announce download blocked object: '+str(postJsonObject['object'])) print('Announce download blocked object: '+ \
str(postJsonObject['object']))
return None return None
print('Downloading Announce content for '+postJsonObject['object']) print('Downloading Announce content for '+postJsonObject['object'])
announcedJson= \ announcedJson= \
@ -2842,7 +2852,8 @@ def downloadAnnounce(session,baseDir: str,httpPrefix: str, \
return None return None
if not isinstance(announcedJson, dict): if not isinstance(announcedJson, dict):
print('WARN: announce json is not a dict - '+postJsonObject['object']) print('WARN: announce json is not a dict - '+ \
postJsonObject['object'])
rejectAnnounce(announceFilename) rejectAnnounce(announceFilename)
return None return None
if not announcedJson.get('id'): if not announcedJson.get('id'):