xevion/contest-assistant
1
0
Fork 0
mirror of https://github.com/Xevion/contest-assistant.git synced 2025-12-13 18:11:19 -06:00
Code Issues Packages Projects Releases Wiki Activity

fixed bot not clearing old submission rows, fixed bot trying to use database before initialization, forgot to commit in deleted submission handling

Browse Source
This commit is contained in:
Xevion
2021-02-08 01:13:39 -06:00
parent 573d8aa06a
commit 294b34abe0
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
contest/cogs/contest.py
View File

@@ -65,7 +65,6 @@ class ContestCog(commands.Cog):
await warning.delete(delay=5) await warning.delete(delay=5)
else: else:
last_submission = await self.bot.db.get_submission(message.guild.id, message.author.id) last_submission = await self.bot.db.get_submission(message.guild.id, message.author.id)
if last_submission is not None: if last_submission is not None:
# delete last submission # delete last submission
submission_msg = await channel.fetch_message(last_submission) submission_msg = await channel.fetch_message(last_submission)
@@ -75,12 +74,19 @@ class ContestCog(commands.Cog):
await submission_msg.delete() await submission_msg.delete()
logger.info(f'Old submission deleted. {last_submission} (Old) -> {message.id} (New)') logger.info(f'Old submission deleted. {last_submission} (Old) -> {message.id} (New)')
# Delete the old submission row
await self.bot.db.conn.execute('''DELETE FROM submission WHERE id = ?''', [last_submission])
await self.bot.db.conn.commit()
# Add the new submission row
await self.bot.db.add_submission(message.id, channel.guild.id, message.author.id, message.created_at) await self.bot.db.add_submission(message.id, channel.guild.id, message.author.id, message.created_at)
logger.info(f'New submission created ({message.id}).') logger.info(f'New submission created ({message.id}).')
@commands.Cog.listener() @commands.Cog.listener()
async def on_raw_message_delete(self, payload: discord.RawMessageDeleteEvent) -> None: async def on_raw_message_delete(self, payload: discord.RawMessageDeleteEvent) -> None:
"""Handles submission deletions by the users, moderators or other bots for any reason.""" """Handles submission deletions by the users, moderators or other bots for any reason."""
await self.bot.wait_until_ready()
# Ignore messages we delete # Ignore messages we delete
if payload.message_id in expected_deletions: if payload.message_id in expected_deletions:
expected_deletions.remove(payload.message_id) expected_deletions.remove(payload.message_id)
@@ -99,6 +105,7 @@ class ContestCog(commands.Cog):
if cur.rowcount > 0: if cur.rowcount > 0:
author = payload.cached_message.author.display_name if payload.cached_message is not None else 'Unknown' author = payload.cached_message.author.display_name if payload.cached_message is not None else 'Unknown'
logger.info(f'Submission {payload.message_id} by {author} deleted by outside source.') logger.info(f'Submission {payload.message_id} by {author} deleted by outside source.')
await self.bot.db.conn.commit()
finally: finally:
await cur.close() await cur.close()