indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Handle potential none values returned for actor nickname

main
Bob Mottram 2024-05-19 10:57:49 +01:00
parent 6f610a438d
commit 155224fe4d
1 changed files with 220 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
desktop_client.py
View File

@ -171,7 +171,11 @@ def _mark_post_as_read(actor: str, post_id: str, post_category: str) -> None:
home_dir = str(Path.home()) home_dir = str(Path.home())
_create_desktop_config(actor) _create_desktop_config(actor)
nickname = get_nickname_from_actor(actor) nickname = get_nickname_from_actor(actor)
if not nickname:
return
domain, port = get_domain_from_actor(actor) domain, port = get_domain_from_actor(actor)
if not domain:
return
handle = nickname + '@' + domain handle = nickname + '@' + domain
if port not in (443, 80): if port not in (443, 80):
handle += '_' + str(port) handle += '_' + str(port)
@ -206,7 +210,11 @@ def _has_read_post(actor: str, post_id: str, post_category: str) -> bool:
home_dir = str(Path.home()) home_dir = str(Path.home())
_create_desktop_config(actor) _create_desktop_config(actor)
nickname = get_nickname_from_actor(actor) nickname = get_nickname_from_actor(actor)
if not nickname:
return True
domain, port = get_domain_from_actor(actor) domain, port = get_domain_from_actor(actor)
if not domain:
return True
handle = nickname + '@' + domain handle = nickname + '@' + domain
if port not in (443, 80): if port not in (443, 80):
handle += '_' + str(port) handle += '_' + str(port)
@ -515,7 +523,11 @@ def _desktop_reply_to_post(session, post_id: str,
if '://' not in post_id: if '://' not in post_id:
return return
to_nickname = get_nickname_from_actor(post_id) to_nickname = get_nickname_from_actor(post_id)
if not to_nickname:
return
to_domain, to_port = get_domain_from_actor(post_id) to_domain, to_port = get_domain_from_actor(post_id)
if not to_domain:
return
say_str = 'Replying to ' + to_nickname + '@' + to_domain say_str = 'Replying to ' + to_nickname + '@' + to_domain
_say_command(say_str, say_str, _say_command(say_str, say_str,
screenreader, system_language, espeak) screenreader, system_language, espeak)
@ -810,6 +822,8 @@ def _read_local_box_post(session, nickname: str, domain: str,
if post_json_object['type'] == 'Announce': if post_json_object['type'] == 'Announce':
actor = get_actor_from_post(post_json_object) actor = get_actor_from_post(post_json_object)
name_str = get_nickname_from_actor(actor) name_str = get_nickname_from_actor(actor)
if not name_str:
return {}
recent_posts_cache = {} recent_posts_cache = {}
allow_local_network_access = False allow_local_network_access = False
yt_replace_domain = None yt_replace_domain = None
@ -848,8 +862,11 @@ def _read_local_box_post(session, nickname: str, domain: str,
system_language) system_language)
if attributed_to and content: if attributed_to and content:
actor = attributed_to actor = attributed_to
name_str1 = get_nickname_from_actor(actor)
if not name_str1:
return {}
name_str += ' ' + translate['announces'] + ' ' + \ name_str += ' ' + translate['announces'] + ' ' + \
get_nickname_from_actor(actor) name_str1
say_str = name_str say_str = name_str
_say_command(say_str, say_str, screenreader, _say_command(say_str, say_str, screenreader,
system_language, espeak) system_language, espeak)
@ -879,6 +896,8 @@ def _read_local_box_post(session, nickname: str, domain: str,
return {} return {}
actor = attributed_to actor = attributed_to
name_str = get_nickname_from_actor(actor) name_str = get_nickname_from_actor(actor)
if not name_str:
return {}
content = _text_only_content(content) content = _text_only_content(content)
content += _get_image_description(post_json_object) content += _get_image_description(post_json_object)
@ -938,6 +957,8 @@ def _desktop_show_actor(http_prefix: str,
""" """
actor = actor_json['id'] actor = actor_json['id']
actor_nickname = get_nickname_from_actor(actor) actor_nickname = get_nickname_from_actor(actor)
if not actor_nickname:
return
actor_domain, actor_port = get_domain_from_actor(actor) actor_domain, actor_port = get_domain_from_actor(actor)
actor_domain_full = get_full_domain(actor_domain, actor_port) actor_domain_full = get_full_domain(actor_domain, actor_port)
handle = '@' + actor_nickname + '@' + actor_domain_full handle = '@' + actor_nickname + '@' + actor_domain_full
@ -1151,7 +1172,10 @@ def _desktop_show_box(indent: str,
if isinstance(post_json_object['object'], str): if isinstance(post_json_object['object'], str):
author_actor = \ author_actor = \
get_actor_from_post(post_json_object) get_actor_from_post(post_json_object)
name = get_nickname_from_actor(author_actor) + ' ⮌' name1 = get_nickname_from_actor(author_actor)
if not name1:
continue
name = name1 + ' ⮌'
name = _pad_to_width(name, name_width) name = _pad_to_width(name, name_width)
ctr_str = str(ctr) ctr_str = str(ctr)
pos_str = _pad_to_width(ctr_str, number_width) pos_str = _pad_to_width(ctr_str, number_width)
@ -1192,6 +1216,8 @@ def _desktop_show_box(indent: str,
_pad_to_width(post_json_object['object']['summary'], _pad_to_width(post_json_object['object']['summary'],
content_width) content_width)
name = get_nickname_from_actor(author_actor) name = get_nickname_from_actor(author_actor)
if not name:
continue
# append icons to the end of the name # append icons to the end of the name
space_added = False space_added = False
@ -1331,13 +1357,21 @@ def _desktop_new_dm_base(session, to_handle: str,
to_port = port to_port = port
if '://' in to_handle: if '://' in to_handle:
to_nickname = get_nickname_from_actor(to_handle) to_nickname = get_nickname_from_actor(to_handle)
if not to_nickname:
return
to_domain, to_port = get_domain_from_actor(to_handle) to_domain, to_port = get_domain_from_actor(to_handle)
if not to_domain:
return
to_handle = to_nickname + '@' + to_domain to_handle = to_nickname + '@' + to_domain
else: else:
if to_handle.startswith('@'): if to_handle.startswith('@'):
to_handle = to_handle[1:] to_handle = to_handle[1:]
to_nickname = to_handle.split('@')[0] to_nickname = to_handle.split('@')[0]
if not to_nickname:
return
to_domain = to_handle.split('@')[1] to_domain = to_handle.split('@')[1]
if not to_domain:
return
say_str = 'Create new direct message to ' + to_handle say_str = 'Create new direct message to ' + to_handle
_say_command(say_str, say_str, screenreader, system_language, espeak) _say_command(say_str, say_str, screenreader, system_language, espeak)
@ -1999,8 +2033,9 @@ def run_desktop_client(base_dir: str, proxy_type: str, http_prefix: str,
attrib_field = \ attrib_field = \
post_json_object['object']['attributedTo'] post_json_object['object']['attributedTo']
like_actor = get_attributed_to(attrib_field) like_actor = get_attributed_to(attrib_field)
say_str = 'Liking post by ' + \ say_str1 = get_nickname_from_actor(like_actor)
get_nickname_from_actor(like_actor) if say_str1:
say_str = 'Liking post by ' + say_str1
_say_command(say_str, say_str, _say_command(say_str, say_str,
screenreader, screenreader,
system_language, espeak) system_language, espeak)
@ -2009,7 +2044,8 @@ def run_desktop_client(base_dir: str, proxy_type: str, http_prefix: str,
nickname, password, nickname, password,
domain, port, http_prefix, domain, port, http_prefix,
post_json_object['id'], post_json_object['id'],
cached_webfingers, person_cache, cached_webfingers,
person_cache,
False, __version__, False, __version__,
signing_priv_key_pem, signing_priv_key_pem,
system_language) system_language)
@ -2043,8 +2079,9 @@ def run_desktop_client(base_dir: str, proxy_type: str, http_prefix: str,
attrib_field = \ attrib_field = \
post_json_object['object']['attributedTo'] post_json_object['object']['attributedTo']
mute_actor = get_attributed_to(attrib_field) mute_actor = get_attributed_to(attrib_field)
say_str = 'Unmuting post by ' + \ say_str1 = get_nickname_from_actor(mute_actor)
get_nickname_from_actor(mute_actor) if say_str1:
say_str = 'Unmuting post by ' + say_str1
_say_command(say_str, say_str, _say_command(say_str, say_str,
screenreader, screenreader,
system_language, espeak) system_language, espeak)
@ -2080,8 +2117,9 @@ def run_desktop_client(base_dir: str, proxy_type: str, http_prefix: str,
attrib_field = \ attrib_field = \
post_json_object['object']['attributedTo'] post_json_object['object']['attributedTo']
mute_actor = get_attributed_to(attrib_field) mute_actor = get_attributed_to(attrib_field)
say_str = 'Muting post by ' + \ say_str1 = get_nickname_from_actor(mute_actor)
get_nickname_from_actor(mute_actor) say_str = 'Muting post by ' + say_str1
if say_str1:
_say_command(say_str, say_str, _say_command(say_str, say_str,
screenreader, screenreader,
system_language, espeak) system_language, espeak)
@ -2091,7 +2129,8 @@ def run_desktop_client(base_dir: str, proxy_type: str, http_prefix: str,
domain, port, domain, port,
http_prefix, http_prefix,
post_json_object['id'], post_json_object['id'],
cached_webfingers, person_cache, cached_webfingers,
person_cache,
False, __version__, False, __version__,
signing_priv_key_pem, signing_priv_key_pem,
system_language) system_language)
@ -2127,17 +2166,19 @@ def run_desktop_client(base_dir: str, proxy_type: str, http_prefix: str,
attrib_field = \ attrib_field = \
post_json_object['object']['attributedTo'] post_json_object['object']['attributedTo']
bm_actor = get_attributed_to(attrib_field) bm_actor = get_attributed_to(attrib_field)
say_str = 'Unbookmarking post by ' + \ say_str1 = get_nickname_from_actor(bm_actor)
get_nickname_from_actor(bm_actor) if say_str1:
say_str = 'Unbookmarking post by ' + say_str1
_say_command(say_str, say_str, _say_command(say_str, say_str,
screenreader, screenreader,
system_language, espeak) system_language, espeak)
sessionbm = create_session(proxy_type) sessionbm = create_session(proxy_type)
id_str = post_json_object['id']
send_undo_bookmark_via_server(base_dir, sessionbm, send_undo_bookmark_via_server(base_dir, sessionbm,
nickname, password, nickname, password,
domain, port, domain, port,
http_prefix, http_prefix,
post_json_object['id'], id_str,
cached_webfingers, cached_webfingers,
person_cache, person_cache,
False, __version__, False, __version__,
@ -2164,8 +2205,9 @@ def run_desktop_client(base_dir: str, proxy_type: str, http_prefix: str,
attrib_field = \ attrib_field = \
post_json_object['object']['attributedTo'] post_json_object['object']['attributedTo']
bm_actor = get_attributed_to(attrib_field) bm_actor = get_attributed_to(attrib_field)
say_str = 'Bookmarking post by ' + \ say_str1 = get_nickname_from_actor(bm_actor)
get_nickname_from_actor(bm_actor) if say_str1:
say_str = 'Bookmarking post by ' + say_str1
_say_command(say_str, say_str, _say_command(say_str, say_str,
screenreader, screenreader,
system_language, espeak) system_language, espeak)
@ -2203,23 +2245,27 @@ def run_desktop_client(base_dir: str, proxy_type: str, http_prefix: str,
attrib_field = \ attrib_field = \
post_json_object['object']['attributedTo'] post_json_object['object']['attributedTo']
block_actor = get_attributed_to(attrib_field) block_actor = get_attributed_to(attrib_field)
say_str = 'Unblocking ' + \ say_str1 = get_nickname_from_actor(block_actor)
get_nickname_from_actor(block_actor) if say_str1:
say_str = 'Unblocking ' + say_str1
_say_command(say_str, say_str, _say_command(say_str, say_str,
screenreader, screenreader,
system_language, espeak) system_language, espeak)
session_block = create_session(proxy_type) session_block = create_session(proxy_type)
sign_priv_key_pem = signing_priv_key_pem sign_key_pem = signing_priv_key_pem
cached_wf = cached_webfingers
send_undo_block_via_server(base_dir, send_undo_block_via_server(base_dir,
session_block, session_block,
nickname, password, nickname,
password,
domain, port, domain, port,
http_prefix, http_prefix,
block_actor, block_actor,
cached_webfingers, cached_wf,
person_cache, person_cache,
False, __version__, False,
sign_priv_key_pem, __version__,
sign_key_pem,
system_language) system_language)
refresh_timeline = True refresh_timeline = True
print('') print('')
@ -2256,8 +2302,9 @@ def run_desktop_client(base_dir: str, proxy_type: str, http_prefix: str,
post_json_object['object']['attributedTo'] post_json_object['object']['attributedTo']
block_actor = get_attributed_to(attrib_field) block_actor = get_attributed_to(attrib_field)
if block_actor: if block_actor:
say_str = 'Blocking ' + \ say_str1 = get_nickname_from_actor(block_actor)
get_nickname_from_actor(block_actor) if say_str1:
say_str = 'Blocking ' + say_str1
_say_command(say_str, say_str, _say_command(say_str, say_str,
screenreader, screenreader,
system_language, espeak) system_language, espeak)
@ -2290,16 +2337,19 @@ def run_desktop_client(base_dir: str, proxy_type: str, http_prefix: str,
attrib_field = \ attrib_field = \
post_json_object['object']['attributedTo'] post_json_object['object']['attributedTo']
unlike_actor = get_attributed_to(attrib_field) unlike_actor = get_attributed_to(attrib_field)
say_str1 = get_nickname_from_actor(unlike_actor)
if say_str1:
say_str = \ say_str = \
'Undoing like of post by ' + \ 'Undoing like of post by ' + \
get_nickname_from_actor(unlike_actor) say_str1
_say_command(say_str, say_str, _say_command(say_str, say_str,
screenreader, screenreader,
system_language, espeak) system_language, espeak)
session_unlike = create_session(proxy_type) session_unlike = create_session(proxy_type)
send_undo_like_via_server(base_dir, session_unlike, send_undo_like_via_server(base_dir, session_unlike,
nickname, password, nickname, password,
domain, port, http_prefix, domain, port,
http_prefix,
post_json_object['id'], post_json_object['id'],
cached_webfingers, cached_webfingers,
person_cache, person_cache,
@ -2341,8 +2391,9 @@ def run_desktop_client(base_dir: str, proxy_type: str, http_prefix: str,
attrib_field = \ attrib_field = \
post_json_object['object']['attributedTo'] post_json_object['object']['attributedTo']
announce_actor = get_attributed_to(attrib_field) announce_actor = get_attributed_to(attrib_field)
say_str = 'Announcing post by ' + \ say_str1 = get_nickname_from_actor(announce_actor)
get_nickname_from_actor(announce_actor) if say_str1:
say_str = 'Announcing post by ' + say_str1
_say_command(say_str, say_str, _say_command(say_str, say_str,
screenreader, screenreader,
system_language, espeak) system_language, espeak)
@ -2380,8 +2431,9 @@ def run_desktop_client(base_dir: str, proxy_type: str, http_prefix: str,
attrib_field = \ attrib_field = \
post_json_object['object']['attributedTo'] post_json_object['object']['attributedTo']
announce_actor = get_attributed_to(attrib_field) announce_actor = get_attributed_to(attrib_field)
say_str = 'Undoing announce post by ' + \ say_str1 = get_nickname_from_actor(announce_actor)
get_nickname_from_actor(announce_actor) if say_str1:
say_str = 'Undoing announce post by ' + say_str1
_say_command(say_str, say_str, _say_command(say_str, say_str,
screenreader, screenreader,
system_language, espeak) system_language, espeak)