diff --git a/matchy/cogs/matcher.py b/matchy/cogs/matcher.py index f62ee6a..aa911c4 100644 --- a/matchy/cogs/matcher.py +++ b/matchy/cogs/matcher.py @@ -210,28 +210,15 @@ class MatcherCog(commands.Cog): async def run_hourly_tasks(self): """Run any hourly tasks we have""" - # Send a reminder for anything that will be active in 1 day - for (channel, _) in state.State.get_active_match_tasks(datetime.now() + timedelta(days=1)): - logger.info("Reminding about scheduled task in %s", channel) - msg_channel = self.bot.get_channel(int(channel)) - await msg_channel.send(strings.reminder()) - - # Match groups for anything active right now for (channel, min) in state.State.get_active_match_tasks(): logger.info("Scheduled match task triggered in %s", channel) msg_channel = self.bot.get_channel(int(channel)) await match_groups_in_channel(msg_channel, min) - # Send a reminder to threads for a match that happened two days ago - for (channel, _) in state.State.get_active_match_tasks(datetime.now() - timedelta(days=2)): - logger.info("Sending reminders to threads in %s", channel) + for (channel, _) in state.State.get_active_match_tasks(datetime.now() + timedelta(days=1)): + logger.info("Reminding about scheduled task in %s", channel) msg_channel = self.bot.get_channel(int(channel)) - # Find any threads that need - for thread in msg_channel.threads: - # Only regard threads the bot created - # And that have no additional messages - if thread.owner.id == self.bot.user.id and thread.message_count <= 1: - await thread.send(strings.thread_reminder()) + await msg_channel.send(strings.reminder()) # Increment when adjusting the custom_id so we don't confuse old users diff --git a/matchy/cogs/strings.py b/matchy/cogs/strings.py index c31ae06..a617194 100644 --- a/matchy/cogs/strings.py +++ b/matchy/cogs/strings.py @@ -145,16 +145,6 @@ Make sure you're /pause'd if you need to be, or /join in ASAP!""", ] -@randomised -def thread_reminder(): return [ - "Hey friends, just checking in! No worries if you're too busy this week", - "Bork bork, quick reminder in case y'all forgot!", - "Hey matchees, how's your week going?", - "Hey everyone, don't forget to check in with eachother!", - "Quick friendly nudge, how're you all doing?", -] - - @randomised def matching(): return [ "Matchy is matching matchees...",