diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py index f09c0fe..366e6ab 100644 --- a/tests/integration/conftest.py +++ b/tests/integration/conftest.py @@ -41,7 +41,7 @@ ASSETS_DIR = str(Path(__file__).parent.parent / "assets") def create_app(base_url): - instance = api.get_instance(base_url) + instance = api.get_instance(base_url).json() response = api.create_app(base_url) return App(instance["uri"], base_url, response["client_id"], response["client_secret"]) diff --git a/toot/api.py b/toot/api.py index a3f228c..cb05c85 100644 --- a/toot/api.py +++ b/toot/api.py @@ -558,9 +558,9 @@ def clear_notifications(app, user): http.post(app, user, '/api/v1/notifications/clear') -def get_instance(base_url): +def get_instance(base_url: str) -> Response: url = f"{base_url}/api/v1/instance" - return http.anon_get(url).json() + return http.anon_get(url) def get_lists(app, user): diff --git a/toot/commands.py b/toot/commands.py index e16d8f1..0cdaaa6 100644 --- a/toot/commands.py +++ b/toot/commands.py @@ -542,7 +542,7 @@ def instance(app, user, args): raise ConsoleError("Please specify an instance.") try: - instance = api.get_instance(base_url) + instance = api.get_instance(base_url).json() instance = from_dict(Instance, instance) print_instance(instance) except ApiError: diff --git a/toot/tui/app.py b/toot/tui/app.py index 349322c..b17a444 100644 --- a/toot/tui/app.py +++ b/toot/tui/app.py @@ -306,7 +306,7 @@ class TUI(urwid.Frame): See: https://github.com/mastodon/mastodon/issues/19328 """ def _load_instance(): - return api.get_instance(self.app.base_url) + return api.get_instance(self.app.base_url).json() def _done(instance): self.max_toot_chars = get_max_toot_chars(instance, DEFAULT_MAX_TOOT_CHARS)