Check for announces of blocked accounts

master
Bob Mottram 2019-09-09 16:16:29 +01:00
parent ff884132ce
commit 27498d8fad
1 changed files with 9 additions and 0 deletions

View File

@ -1493,6 +1493,15 @@ def individualPostAsHtml(translate: {}, \
# set the id to the original status # set the id to the original status
announcedJson['id']=postJsonObject['object'] announcedJson['id']=postJsonObject['object']
announcedJson['object']['id']=postJsonObject['object'] announcedJson['object']['id']=postJsonObject['object']
# check that the repeat isn't for a blocked account
attributedNickname=getNicknameFromActor(announcedJson['object']['id'])
attributedDomain,attributedPort=getDomainFromActor(announcedJson['object']['id'])
if attributedNickname and attributedDomain:
if attributedPort:
if attributedPort!=80 and attributedPort!=443:
attributedDomain=attributedDomain+':'+str(attributedPort)
if isBlocked(baseDir,nickname,domain,attributedNickname,attributedDomain):
return ''
postJsonObject=announcedJson postJsonObject=announcedJson
with open(announceFilename, 'w') as fp: with open(announceFilename, 'w') as fp:
commentjson.dump(postJsonObject, fp, indent=4, sort_keys=False) commentjson.dump(postJsonObject, fp, indent=4, sort_keys=False)