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

Added better checks for updating votes outside of the voting period

Browse Source 
To be honest, the checks are sort of randomly placed how I wanted them.
There is no true rhyme or reason to the logic implemented here, but it
really shouldn't matter anyways - it will do the job.
This commit is contained in:
Xevion
2021-02-18 07:46:41 -06:00
parent 1dc9c7d435
commit fdc64012b0
2 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
bot/cogs/contest_events.py
View File

@@ -150,8 +150,6 @@ class ContestEventsCog(commands.Cog):
except ValueError:
pass
# TODO: Only update the votecount during the VOTING period!
with self.bot.get_session() as session:
guild: Guild = session.query(Guild).get(payload.guild_id)
if payload.channel_id == guild.submission_channel and helpers.is_upvote(payload.emoji):
@@ -172,9 +170,12 @@ class ContestEventsCog(commands.Cog):
if submission is None:
logger.warning(f'Witnessed reactions removed from message {payload.message_id}, but no Submission found in database.')
else:
submission.votes = []
message = self.bot.get_message(payload.channel_id, payload.message_id)
await message.add_reaction(self.bot.get_emoji(constants.Emoji.UPVOTE))
if submission.period.voting:
submission.votes = []
message = self.bot.get_message(payload.channel_id, payload.message_id)
await message.add_reaction(self.bot.get_emoji(constants.Emoji.UPVOTE))
else:
logger.debug(f'All reactions cleared on Submission ({submission.id}) outside of it\'s voting period.')
@commands.Cog.listener()
async def on_raw_reaction_clear_emoji(self, payload: discord.RawReactionClearEmojiEvent) -> None:
@@ -188,9 +189,12 @@ class ContestEventsCog(commands.Cog):
logger.warning(f'Witnessed all upvote reactions removed from message {payload.message_id},'
f' but no Submission found in database.')
else:
submission.votes = []
message = self.bot.get_message(payload.channel_id, payload.message_id)
await message.add_reaction(self.bot.get_emoji(constants.Emoji.UPVOTE))
if submission.period.voting:
submission.votes = []
message = self.bot.get_message(payload.channel_id, payload.message_id)
await message.add_reaction(self.bot.get_emoji(constants.Emoji.UPVOTE))
else:
logger.debug(f'Upvote reactions cleared on Submission ({submission.id}) outside of it\'s voting period.')
def setup(bot) -> None:

15
bot/models.py
View File

@@ -160,8 +160,14 @@ class Submission(Base):
return found
async def update(self, bot: 'ContestBot', message: discord.Message = None) -> None:
"""Updates the number of votes in the database by thoroughly evaluating the message."""
async def update(self, bot: 'ContestBot', message: discord.Message = None, force: bool = True) -> None:
"""
Updates the number of votes in the database by thoroughly evaluating the message.
:param bot: A instance of the bot to use to query and act on messages.
:param message: The message correlating to this Submission
:param force: If True, update the submission even outside of it's relevant voting period.
"""
saw_self, current, old = False, set(), set(self.votes) # Votes currently on the message and votes only on the submission
for reaction in message.reactions:
@@ -199,7 +205,8 @@ class Submission(Base):
)
# Update the current list of votes
self.votes = list(current)
if self.period.voting:
self.votes = list(current)
if len(to_remove) > 0:
if report: report += ' '
@@ -207,7 +214,7 @@ class Submission(Base):
if report: logger.debug(report)
# If we never saw ourselves in the reaction, add the Upvote emoji
if not saw_self:
if not saw_self and self.period.voting:
await message.add_reaction(constants.Emoji.UPVOTE)