From 01971b6c10c403cfb9d398c553691afe69bc482a Mon Sep 17 00:00:00 2001
From: git-bruh <e817509a-8ee9-4332-b0ad-3a6bdf9ab63f@aleeas.com>
Date: Sat, 14 Nov 2020 20:44:16 +0530
Subject: [PATCH] Don't use global variable for channel

---
 main.py | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/main.py b/main.py
index ebec26b..3530746 100644
--- a/main.py
+++ b/main.py
@@ -39,10 +39,6 @@ logging.basicConfig(level=logging.INFO)
 async def on_ready():
     print(f"Logged in as {discord_client.user}")
 
-    global channel_
-    channel_ = int(config["channel_id"])
-    channel_ = discord_client.get_channel(channel_)
-
     # Start Matrix bot
     await create_matrix_client()
 
@@ -69,6 +65,8 @@ async def on_message(message):
 
 @discord_client.event
 async def on_typing(channel, user, when):
+    channel_ = await get_channel()
+
     # Don't act on bots
     if user.bot:
         return
@@ -78,6 +76,13 @@ async def on_typing(channel, user, when):
         await matrix_client.room_typing(config["room_id"], timeout=0)
 
 
+async def get_channel():
+    channel = int(config["channel_id"])
+    channel = discord_client.get_channel(channel)
+
+    return channel
+
+
 async def process(message, category):
     # Replace emote names with emote IDs (Matrix -> Discord)
     if category == "emote":
@@ -117,12 +122,14 @@ async def process(message, category):
 
 
 async def webhook_send(author, avatar, message):
+    channel = await get_channel()
+
     # Create webhook if it doesn't exist
     hook_name = "matrix_bridge"
-    hooks = await channel_.webhooks()
+    hooks = await channel.webhooks()
     hook = discord.utils.get(hooks, name=hook_name)
     if hook is None:
-        hook = await channel_.create_webhook(name=hook_name)
+        hook = await channel.create_webhook(name=hook_name)
 
     # Replace emote names
     message = await process(message, "emote")
@@ -131,8 +138,10 @@ async def webhook_send(author, avatar, message):
 
 
 async def partial_mention(user):
+    channel = await get_channel()
+
     # Get guild to parse member list
-    guild = channel_.guild
+    guild = channel.guild
 
     # Remove "@"
     user = user[1:]
@@ -233,6 +242,8 @@ async def message_callback(room, event):
 
 
 async def typing_callback(room, event):
+    channel = await get_channel()
+
     # Don't act on activities in other rooms
     if room.room_id != config["room_id"]:
         return
@@ -244,7 +255,7 @@ async def typing_callback(room, event):
             return
 
         # Send typing event
-        async with channel_.typing():
+        async with channel.typing():
             pass