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

Enforce Period.states for on_raw_reaction_add

Browse Source 
New submissions are also properly enforced via Period.states, in-case
one makes it passed message permissions. Added helper reject method
This commit is contained in:
Xevion
2021-02-17 22:55:31 -06:00
parent 7427763b57
commit 39b0dc9a96
2 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
bot/bot.py
View File

@@ -114,3 +114,12 @@ class ContestBot(commands.Bot):
async def fetch_message(self, channel_id: int, message_id: int) -> discord.Message: async def fetch_message(self, channel_id: int, message_id: int) -> discord.Message:
channel: discord.TextChannel = self.get_channel(channel_id) channel: discord.TextChannel = self.get_channel(channel_id)
return await channel.fetch_message(message_id) return await channel.fetch_message(message_id)
@staticmethod
async def reject(message: discord.Message, warning: str, delete_delay: int = 1, warning_duration: int = 5) -> None:
"""Send a warning message and delete the message, then the warning"""
if delete_delay < 0:
await message.delete(delay=delete_delay)
warning = await message.channel.send(warning)
if warning_duration < 0:
await warning.delete(delay=warning_duration)

34
bot/cogs/contest.py
View File

@@ -184,30 +184,25 @@ class ContestCog(commands.Cog):
# Ensure that the submission contains at least one attachment # Ensure that the submission contains at least one attachment
if len(attachments) == 0: if len(attachments) == 0:
await message.delete(delay=1) await self.bot.reject(message, f':no_entry_sign: {message.author.mention} Each submission must contain exactly one image.')
warning = await channel.send(
f':no_entry_sign: {message.author.mention} Each submission must contain exactly one image.')
await warning.delete(delay=5)
# Ensure the image contains no more than one attachment # Ensure the image contains no more than one attachment
elif len(attachments) > 1: elif len(attachments) > 1:
await message.delete(delay=1) await self.bot.reject(message, f':no_entry_sign: {message.author.mention} Each submission must contain exactly one image.')
warning = await channel.send( elif guild.current_period is None:
f':no_entry_sign: {message.author.mention} Each submission must contain exactly one image.') await self.bot.reject(message, f':no_entry_sign: {message.author.mention} A period has not been started. '
await warning.delete(delay=5) f'Submissions should not be allowed at this moment.')
elif guild.current_period != PeriodStates.SUBMISSIONS:
logger.warning(f'Valid submission was sent outside of Submissions in {channel.id}/{message.id}. Permissions error? Removing.')
await message.delete()
else: else:
attachment = attachments[0] attachment = attachments[0]
# TODO: Add helper for displaying error/warning messages # TODO: Add helper for displaying error/warning messages
if attachment.is_spoiler(): if attachment.is_spoiler():
await message.delete(delay=1) await self.bot.reject(message, ':no_entry_sign: Attachment must not make use of a spoiler.')
warning = await channel.send(':no_entry_sign: Attachment must not make use of a spoiler.')
await warning.delete(delay=5)
elif attachment.width is None: elif attachment.width is None:
await message.delete(delay=1) await self.bot.reject(message, ':no_entry_sign: Attachment must be a image or video.')
warning = await channel.send(':no_entry_sign: Attachment must be a image or video.')
await warning.delete(delay=5)
else: else:
last_submission: Submission = session.query(Submission).filter_by(period=guild.current_period, last_submission: Submission = session.query(Submission).filter_by(period=guild.current_period, user=message.author.id).first()
user=message.author.id).first()
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.id) submission_msg = await channel.fetch_message(last_submission.id)
@@ -279,13 +274,18 @@ class ContestCog(commands.Cog):
if submission is None: if submission is None:
logger.warning(f'Upvote reaction added to message {payload.message_id}, but no Submission found in database.') logger.warning(f'Upvote reaction added to message {payload.message_id}, but no Submission found in database.')
else: else:
period: Period = submission.period
if period.active and period.state == PeriodStates.VOTING:
await submission.update(self.bot, message=await message.fetch()) await submission.update(self.bot, message=await message.fetch())
else:
logger.warning(f'User attempted to add a reaction to a Submission outside '
f'of it\'s Period activity ({period.active}/{period.state}).')
await message.remove_reaction(payload.emoji, payload.member)
else: else:
# Remove the emoji since it's not supposed to be there anyways. # Remove the emoji since it's not supposed to be there anyways.
# If permissions were setup correctly, only moderators or admins should be able to trigger this. # If permissions were setup correctly, only moderators or admins should be able to trigger this.
await message.remove_reaction(payload.emoji, payload.member) await message.remove_reaction(payload.emoji, payload.member)
@commands.Cog.listener() @commands.Cog.listener()
async def on_raw_reaction_remove(self, payload: discord.RawReactionActionEvent) -> None: async def on_raw_reaction_remove(self, payload: discord.RawReactionActionEvent) -> None:
"""Deal with reactions we remove or removed manually by users.""" """Deal with reactions we remove or removed manually by users."""