From 28acad188469ecf94ada0757b768be06102589a2 Mon Sep 17 00:00:00 2001
From: 0xDEADCADE <69792955+0xDEADCADE@users.noreply.github.com>
Date: Sat, 9 Apr 2022 13:36:58 +0000
Subject: [PATCH] Don't catch errors on xkcd if debug is enabled
---
main.py | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/main.py b/main.py
index dc8f0cf..23e6542 100644
--- a/main.py
+++ b/main.py
@@ -232,15 +232,18 @@ async def xkcd(args, room, event):
user_title = filter_xkcd_title(" ".join(args))
if user_title in lookup.keys():
comic = lookup[user_title] + "/"
- try:
- r = requests.get(f"https://xkcd.com/{comic}info.0.json")
+ r = requests.get(f"https://xkcd.com/{comic}info.0.json")
+ if settings["debug"]:
rj = json.loads(r.text)
- filename = download_file(rj["img"], settings["cache_path"] + "/" + str(rj["num"]) + "." + rj["img"].split(".")[-1])
- image = await send_file(filename)
- await send_text(room.room_id, f"{rj['year']}/{rj['month']}/{rj['day']}, {str(rj['num'])}: {rj['safe_title']}")
- return await send_image(room.room_id, image, rj['alt'])
- except Exception:
- return await send_text(room.room_id, "Failed to get XKCD!")
+ else:
+ try:
+ rj = json.loads(r.text)
+ except Exception:
+ return await send_text(room.room_id, "Failed to get XKCD!")
+ filename = download_file(rj["img"], settings["cache_path"] + "/" + str(rj["num"]) + "." + rj["img"].split(".")[-1])
+ image = await send_file(filename)
+ await send_text(room.room_id, f"{rj['year']}/{rj['month']}/{rj['day']}, {str(rj['num'])}: {rj['safe_title']}")
+ return await send_image(room.room_id, image, rj['alt'])
async def message_callback(room: nio.MatrixRoom, event: nio.RoomMessageText) -> None:
global client, settings, emojis