Checking for language support

merge-requests/30/head
Bob Mottram 2021-07-20 12:59:29 +01:00
parent aa0a176ebf
commit 251c106696
1 changed files with 3 additions and 7 deletions

View File

@ -108,8 +108,7 @@ def understoodPostLanguage(baseDir: str, nickname: str, domain: str,
understood by this account understood by this account
""" """
msgObject = messageJson msgObject = messageJson
if msgObject.get('object'): if hasObjectDict(messageJson):
if isinstance(msgObject['object'], dict):
msgObject = messageJson['object'] msgObject = messageJson['object']
if not msgObject.get('contentMap'): if not msgObject.get('contentMap'):
return True return True
@ -117,13 +116,10 @@ def understoodPostLanguage(baseDir: str, nickname: str, domain: str,
return True return True
if msgObject['contentMap'].get(systemLanguage): if msgObject['contentMap'].get(systemLanguage):
return True return True
actorFilename = acctDir(baseDir, nickname, domain)
if not os.path.isfile(actorFilename):
return False
personUrl = httpPrefix + '://' + domainFull + '/users/' + nickname personUrl = httpPrefix + '://' + domainFull + '/users/' + nickname
actorJson = getPersonFromCache(baseDir, personUrl, personCache, False) actorJson = getPersonFromCache(baseDir, personUrl, personCache, False)
if not actorJson: if not actorJson:
print('WARN: unable to load actor to check languages ' + actorFilename) print('WARN: unable to load actor to check languages ' + personUrl)
return False return False
languagesUnderstood = _getActorLanguagesList(actorJson) languagesUnderstood = _getActorLanguagesList(actorJson)
if not languagesUnderstood: if not languagesUnderstood: