merge-requests/30/head
Bob Mottram 2023-10-25 21:11:24 +01:00
parent f94bd588f5
commit aed024f21d
1 changed files with 15 additions and 20 deletions

View File

@ -405,27 +405,22 @@ def get_person_box(signing_priv_key_pem: str, origin_domain: str,
if person_json['icon'].get('url'): if person_json['icon'].get('url'):
avatar_url = remove_html(person_json['icon']['url']) avatar_url = remove_html(person_json['icon']['url'])
display_name = None display_name = None
possible_display_name = None
if person_json.get('name'): if person_json.get('name'):
display_name = person_json['name'] possible_display_name = person_json['name']
if dangerous_markup(person_json['name'], False, []):
display_name = '*ADVERSARY*'
elif is_filtered(base_dir,
nickname, domain,
display_name, 'en'):
display_name = '*FILTERED*'
# have they moved?
if person_json.get('movedTo'):
display_name += ''
if person_json.get('nameMap'): if person_json.get('nameMap'):
if isinstance(person_json['nameMap'], dict): if isinstance(person_json['nameMap'], dict):
if system_language in person_json['nameMap']: if system_language in person_json['nameMap']:
if isinstance(person_json['nameMap'][system_language], str): if isinstance(person_json['nameMap'][system_language], str):
display_name = person_json['nameMap'][system_language] possible_display_name = \
if dangerous_markup(display_name, False, []): person_json['nameMap'][system_language]
if possible_display_name:
display_name = possible_display_name
if dangerous_markup(possible_display_name, False, []):
display_name = '*ADVERSARY*' display_name = '*ADVERSARY*'
elif is_filtered(base_dir, elif is_filtered(base_dir,
nickname, domain, nickname, domain,
display_name, 'en'): possible_display_name, 'en'):
display_name = '*FILTERED*' display_name = '*FILTERED*'
# have they moved? # have they moved?
if person_json.get('movedTo'): if person_json.get('movedTo'):