From 6b5dedb29f246e0fb5cd73743481718fe720cae4 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Wed, 22 Apr 2020 23:31:37 +0300 Subject: [PATCH] Add better error message for registration target server not found --- maubot/cli/commands/auth.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/maubot/cli/commands/auth.py b/maubot/cli/commands/auth.py index a3fd8b3..eab3584 100644 --- a/maubot/cli/commands/auth.py +++ b/maubot/cli/commands/auth.py @@ -30,6 +30,14 @@ history_count: int = 10 enc = functools.partial(quote, safe="") +friendly_errors = { + "server_not_found": "Registration target server not found.\n\n" + "To log in or register through maubot, you must add the server to the\n" + "registration_secrets section in the config. If you only want to log in,\n" + "leave the `secret` field empty." +} + + @cliq.command(help="Log into a Matrix account via the Maubot server") @cliq.option("-h", "--homeserver", help="The homeserver to log into", required=True) @cliq.option("-u", "--username", help="The username to log in with", required=True) @@ -62,8 +70,9 @@ def auth(homeserver: str, username: str, password: str, server: str, register: b print(f"{Fore.GREEN}Access token: {Fore.CYAN}{resp['access_token']}{Fore.RESET}") except HTTPError as e: try: - err = json.load(e) - except json.JSONDecodeError: - err = {} + err_data = json.load(e) + error = friendly_errors.get(err_data["errcode"], err_data["error"]) + except (json.JSONDecodeError, KeyError): + error = str(e) action = "register" if register else "log in" - print(f"{Fore.RED}Failed to {action}: {err.get('error', str(e))}{Fore.RESET}") + print(f"{Fore.RED}Failed to {action}: {error}{Fore.RESET}")