nex/college-bot-v1
1
0
Fork 0
mirror of https://github.com/nexy7574/LCC-bot.git synced 2024-09-19 18:16:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Migrate events.py to logging

Browse source
This commit is contained in:
Nexus 2023-12-05 17:26:09 +00:00
parent b38ae29125
commit 6fbcf85da8
Signed by: nex
GPG key ID: 0FA334385D0B689F
2 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
cogs/assignments.py → cogs/.assignments.py.old
View file

27
cogs/events.py
View file

@ -90,6 +90,7 @@ class Events(commands.Cog):
self.bot.bridge_queue = asyncio.Queue() self.bot.bridge_queue = asyncio.Queue()
self.fetch_discord_atom_feed.start() self.fetch_discord_atom_feed.start()
self.bridge_health = False self.bridge_health = False
self.log = logging.getLogger("jimmy.cogs.events")
def cog_unload(self): def cog_unload(self):
self.fetch_discord_atom_feed.cancel() 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: if member.guild is None or member.guild.id not in guilds:
return 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)
if student and student.id: # if student and student.id:
role = discord.utils.find(lambda r: r.name.lower() == "verified", member.guild.roles) # role = discord.utils.find(lambda r: r.name.lower() == "verified", member.guild.roles)
if role and role < member.guild.me.top_role: # if role and role < member.guild.me.top_role:
await member.add_roles(role, reason="Verified") # await member.add_roles(role, reason="Verified")
channel: discord.TextChannel = discord.utils.get(member.guild.text_channels, name="general") channel: discord.TextChannel = discord.utils.get(member.guild.text_channels, name="general")
if channel and channel.can_send(): if channel and channel.can_send():
await channel.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() @commands.Cog.listener()
@ -128,11 +130,12 @@ class Events(commands.Cog):
if member.guild is None or member.guild.id not in guilds: if member.guild is None or member.guild.id not in guilds:
return 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") channel: discord.TextChannel = discord.utils.get(member.guild.text_channels, name="general")
if channel and channel.can_send(): if channel and channel.can_send():
await channel.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): 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 region = message.author.voice.channel.rtc_region
# noinspection PyUnresolvedReferences # noinspection PyUnresolvedReferences
console.log( self.log.warning(
"Timed out connecting to voice channel: {0.name} in {0.guild.name} " "Timed out connecting to voice channel: {0.name} in {0.guild.name} "
"(region {1})".format( "(region {1})".format(
message.author.voice.channel, region.name if region else "auto (unknown)" message.author.voice.channel, region.name if region else "auto (unknown)"
@ -254,7 +257,7 @@ class Events(commands.Cog):
_dc(voice), _dc(voice),
) )
if err is not None: 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}")) self.bot.loop.create_task(message.add_reaction("\N{speaker with cancellation stroke}"))
else: else:
self.bot.loop.create_task( self.bot.loop.create_task(
@ -575,14 +578,14 @@ class Events(commands.Cog):
try: try:
response = await self.http.get("https://discordstatus.com/history.atom", headers=headers) response = await self.http.get("https://discordstatus.com/history.atom", headers=headers)
except httpx.HTTPError as e: 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 return
if response.status_code == 304: if response.status_code == 304:
return return
if response.status_code != 200: 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 return
with file.open("wb") as f: with file.open("wb") as f: