From 6fbcf85da883fd04f4fc64ad5e34bec5e829e185 Mon Sep 17 00:00:00 2001
From: nex <me@nexy7574.co.uk>
Date: Tue, 5 Dec 2023 17:26:09 +0000
Subject: [PATCH] Migrate events.py to logging

---
 cogs/{assignments.py => .assignments.py.old} |  0
 cogs/events.py                               | 27 +++++++++++---------
 2 files changed, 15 insertions(+), 12 deletions(-)
 rename cogs/{assignments.py => .assignments.py.old} (100%)

diff --git a/cogs/assignments.py b/cogs/.assignments.py.old
similarity index 100%
rename from cogs/assignments.py
rename to cogs/.assignments.py.old
diff --git a/cogs/events.py b/cogs/events.py
index 2ead3d8..61676fc 100644
--- a/cogs/events.py
+++ b/cogs/events.py
@@ -90,6 +90,7 @@ class Events(commands.Cog):
             self.bot.bridge_queue = asyncio.Queue()
         self.fetch_discord_atom_feed.start()
         self.bridge_health = False
+        self.log = logging.getLogger("jimmy.cogs.events")
 
     def cog_unload(self):
         self.fetch_discord_atom_feed.cancel()
@@ -111,16 +112,17 @@ class Events(commands.Cog):
         if member.guild is None or member.guild.id not in guilds:
             return
 
-        student: Optional[Student] = await get_or_none(Student, user_id=member.id)
-        if student and student.id:
-            role = discord.utils.find(lambda r: r.name.lower() == "verified", member.guild.roles)
-            if role and role < member.guild.me.top_role:
-                await member.add_roles(role, reason="Verified")
+        # student: Optional[Student] = await get_or_none(Student, user_id=member.id)
+        # if student and student.id:
+        #     role = discord.utils.find(lambda r: r.name.lower() == "verified", member.guild.roles)
+        #     if role and role < member.guild.me.top_role:
+        #         await member.add_roles(role, reason="Verified")
 
         channel: discord.TextChannel = discord.utils.get(member.guild.text_channels, name="general")
         if channel and channel.can_send():
             await channel.send(
-                f"{LTR} {member.mention} (`{member}`, {f'{student.id}' if student else 'pending verification'})"
+                # f"{LTR} {member.mention} (`{member}`, {f'{student.id}' if student else 'pending verification'})"
+                f"{LTR} {member.mention}"
             )
 
     @commands.Cog.listener()
@@ -128,11 +130,12 @@ class Events(commands.Cog):
         if member.guild is None or member.guild.id not in guilds:
             return
 
-        student: Optional[Student] = await get_or_none(Student, user_id=member.id)
+        # student: Optional[Student] = await get_or_none(Student, user_id=member.id)
         channel: discord.TextChannel = discord.utils.get(member.guild.text_channels, name="general")
         if channel and channel.can_send():
             await channel.send(
-                f"{RTL} {member.mention} (`{member}`, {f'{student.id}' if student else 'pending verification'})"
+                # f"{RTL} {member.mention} (`{member}`, {f'{student.id}' if student else 'pending verification'})"
+                f"{RTL} {member.mention}"
             )
 
     async def process_message_for_github_links(self, message: discord.Message):
@@ -233,7 +236,7 @@ class Events(commands.Cog):
                         )
                         region = message.author.voice.channel.rtc_region
                         # noinspection PyUnresolvedReferences
-                        console.log(
+                        self.log.warning(
                             "Timed out connecting to voice channel: {0.name} in {0.guild.name} "
                             "(region {1})".format(
                                 message.author.voice.channel, region.name if region else "auto (unknown)"
@@ -254,7 +257,7 @@ class Events(commands.Cog):
                                 _dc(voice),
                             )
                             if err is not None:
-                                console.log(f"Error playing audio: {err}")
+                                self.log.error(f"Error playing audio: {err}", exc_info=err)
                                 self.bot.loop.create_task(message.add_reaction("\N{speaker with cancellation stroke}"))
                             else:
                                 self.bot.loop.create_task(
@@ -575,14 +578,14 @@ class Events(commands.Cog):
         try:
             response = await self.http.get("https://discordstatus.com/history.atom", headers=headers)
         except httpx.HTTPError as e:
-            console.log("Failed to fetch discord atom feed:", e)
+            self.log.error("Failed to fetch discord atom feed: %r", e, exc_info=e)
             return
 
         if response.status_code == 304:
             return
 
         if response.status_code != 200:
-            console.log("Failed to fetch discord atom feed:", response.status_code)
+            self.log.error("Failed to fetch discord atom feed: HTTP/%s", response.status_code)
             return
 
         with file.open("wb") as f: