From e60d9a88f01508668986a81f20a5cbfb230451e1 Mon Sep 17 00:00:00 2001
From: Edwin <60476129+Edwinexd@users.noreply.github.com>
Date: Fri, 19 Feb 2021 11:44:59 +0100
Subject: [PATCH] Revert getchannel changes

---
 bot.py | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/bot.py b/bot.py
index c3731273..bfcfab24 100644
--- a/bot.py
+++ b/bot.py
@@ -111,12 +111,7 @@ async def getchannel(channel_id):
     channel = bot.get_channel(channel_id)
 
     if not channel:
-        try:
-            channel = await bot.fetch_channel(channel_id)
-        except discord.InvalidData:
-            channel = None
-        except discord.HTTPException:
-            channel = None
+        channel = await bot.fetch_channel(channel_id)
 
     return channel
 
@@ -737,9 +732,15 @@ def reaction_check3(payload):
                             "raw_reaction_add", timeout=120, check=reaction_check3
                         )
                         try:
-                            channel = await getchannel(
-                                oldmessage_response_payload.channel_id
-                            )
+                            try:
+                                channel = await getchannel(
+                                    oldmessage_response_payload.channel_id
+                                )
+                            except discord.InvalidData:
+                                channel = None
+                            except discord.HTTPException:
+                                channel = None
+                            
                             if channel is None:
                                 raise discord.NotFound
                             try: