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

Tidying

main2
Bob Mottram 2019-10-21 13:52:22 +01:00
parent 15e2805d69
commit 6da5c21edb
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
inbox.py
View File

@ -246,7 +246,8 @@ def savePostToInboxQueue(baseDir: str,httpPrefix: str, \
replyNickname=getNicknameFromActor(postJsonObject['object']['inReplyTo']) replyNickname=getNicknameFromActor(postJsonObject['object']['inReplyTo'])
if replyNickname and replyDomain: if replyNickname and replyDomain:
if isBlocked(baseDir,nickname,domain,replyNickname,replyDomain): if isBlocked(baseDir,nickname,domain,replyNickname,replyDomain):
print('WARN: post contains reply from '+str(actor)+' to a blocked account: '+replyNickname+'@'+replyDomain) print('WARN: post contains reply from '+str(actor)+ \
' to a blocked account: '+replyNickname+'@'+replyDomain)
return None return None
#else: #else:
# print('WARN: post is a reply to an unidentified account: '+postJsonObject['object']['inReplyTo']) # print('WARN: post is a reply to an unidentified account: '+postJsonObject['object']['inReplyTo'])
@ -458,7 +459,9 @@ def inboxPostRecipientsAdd(baseDir :str,httpPrefix :str,toList :[], \
followerRecipients=True followerRecipients=True
return followerRecipients,recipientsDict return followerRecipients,recipientsDict
def inboxPostRecipients(baseDir :str,postJsonObject :{},httpPrefix :str,domain : str,port :int, debug :bool) -> ([],[]): def inboxPostRecipients(baseDir :str,postJsonObject :{}, \
httpPrefix :str,domain : str,port :int, \
debug :bool) -> ([],[]):
"""Returns dictionaries containing the recipients of the given post """Returns dictionaries containing the recipients of the given post
The shared dictionary contains followers The shared dictionary contains followers
""" """
@ -1273,7 +1276,9 @@ def validPostContent(messageJson: {},maxMentions: int) -> bool:
print('ACCEPT: post content is valid') print('ACCEPT: post content is valid')
return True return True
def obtainAvatarForReplyPost(session,baseDir: str,httpPrefix: str,domain: str,personCache: {},postJsonObject: {},debug: bool) -> None: def obtainAvatarForReplyPost(session,baseDir: str,httpPrefix: str, \
domain: str,personCache: {}, \
postJsonObject: {},debug: bool) -> None:
"""Tries to obtain the actor for the person being replied to """Tries to obtain the actor for the person being replied to
so that their avatar can later be shown so that their avatar can later be shown
""" """