From 4e76cc37308539eed3c6d2853b147b93ecd58fc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Sch=C3=A4fer?= <felix@thegcat.net> Date: Sun, 18 Jun 2023 21:57:28 +0200 Subject: [PATCH] Gracefully handle non-json responses #15 --- pretix_matrix_inviter/helpers.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pretix_matrix_inviter/helpers.py b/pretix_matrix_inviter/helpers.py index 49bd1ff..59989ad 100644 --- a/pretix_matrix_inviter/helpers.py +++ b/pretix_matrix_inviter/helpers.py @@ -1,4 +1,5 @@ import requests +from json import JSONDecodeError from urllib.parse import quote as url_quote @@ -55,7 +56,10 @@ def matrix_room_id_from_alias(server, alias): ), ) - return r.json().get("room_id") + try: + return r.json().get("room_id") + except JSONDecodeError: + return "" def matrix_room_canonical_alias_from_id(server, token, room_id): @@ -72,7 +76,10 @@ def matrix_room_canonical_alias_from_id(server, token, room_id): }, ) - return r.json().get("alias") + try: + return r.json().get("alias") + except JSONDecodeError: + return "" def matrix_room_name_from_id(server, token, room_id): @@ -89,4 +96,7 @@ def matrix_room_name_from_id(server, token, room_id): }, ) - return r.json().get("name") + try: + return r.json().get("name") + except JSONDecodeError: + return "" -- GitLab