Checking for muted files

merge-requests/30/head
Bob Mottram 2021-09-27 23:06:37 +01:00
parent 26430b2dfe
commit c1c47ff94c
1 changed files with 18 additions and 12 deletions

View File

@ -4914,24 +4914,30 @@ def postIsMuted(baseDir: str, nickname: str, domain: str,
postJsonObject: {}, messageId: str) -> bool: postJsonObject: {}, messageId: str) -> bool:
""" Returns true if the given post is muted """ Returns true if the given post is muted
""" """
isMuted = postJsonObject.get('muted') isMuted = None
if 'muted' in postJsonObject:
isMuted = postJsonObject['muted']
if isMuted is True or isMuted is False: if isMuted is True or isMuted is False:
return isMuted return isMuted
isMuted = False
postDir = acctDir(baseDir, nickname, domain) postDir = acctDir(baseDir, nickname, domain)
muteFilename = \ muteFilename = \
postDir + '/inbox/' + messageId.replace('/', '#') + '.json.muted' postDir + '/inbox/' + messageId.replace('/', '#') + '.json.muted'
if os.path.isfile(muteFilename): if os.path.isfile(muteFilename):
return True isMuted = True
else:
muteFilename = \ muteFilename = \
postDir + '/outbox/' + messageId.replace('/', '#') + '.json.muted' postDir + '/outbox/' + messageId.replace('/', '#') + '.json.muted'
if os.path.isfile(muteFilename): if os.path.isfile(muteFilename):
return True isMuted = True
else:
muteFilename = \ muteFilename = \
baseDir + '/accounts/cache/announce/' + nickname + \ baseDir + '/accounts/cache/announce/' + nickname + \
'/' + messageId.replace('/', '#') + '.json.muted' '/' + messageId.replace('/', '#') + '.json.muted'
if os.path.isfile(muteFilename): if os.path.isfile(muteFilename):
return True isMuted = True
return False return isMuted
def c2sBoxJson(baseDir: str, session, def c2sBoxJson(baseDir: str, session,