diff --git a/funkwhale_cli.py b/funkwhale_cli.py index ded8951..16b135d 100755 --- a/funkwhale_cli.py +++ b/funkwhale_cli.py @@ -45,8 +45,9 @@ def main(): instance_title = i.get('value') instance_stats = [] for k, v in ins_nodeinfo['metadata']['library'].items(): - if k == 'anonymousCanListen' and v == False: + if k == 'anonymousCanListen' and v == False and not current_instance.s.headers.get('Authorization'): instance_stats.append(f'!!! {k}: {v} !!!') + menu = ['Switch instance', 'About instance'] continue instance_stats.append(f'{k}: {v}') instance_stats.append(ins_nodeinfo['software']['version']) @@ -54,8 +55,8 @@ def main(): main_menu_header = quote(f'''{instance_title}\n{instance_stats}'''.strip()) except Exception as E: - time.sleep(1) - main_menu_header = quote(f'''Connection failed: {E}'''.strip()) + splitted = ':\n'.join(str(E).split(':')) + main_menu_header = quote(f'''Connection failed:\n{splitted}'''.strip()) menu = ['Switch instance'] if not current_instance.s.headers.get('Authorization'): diff --git a/src/fw_api.py b/src/fw_api.py index 163e299..8583c01 100644 --- a/src/fw_api.py +++ b/src/fw_api.py @@ -68,7 +68,6 @@ def get_me(): return resp -@logger.catch def get_instance_settings(): r = current_instance.s.get( f'https://{current_instance.instance}/api/v1/instance/settings')