diff options
| author | 2020-03-24 23:10:18 +0100 | |
|---|---|---|
| committer | 2020-03-24 23:10:18 +0100 | |
| commit | d9dfaf343a591eb910e94b59a7d7e2c10272925e (patch) | |
| tree | ab54e2f8dda24c32b49758c4d90964cd0db38c0f | |
| parent | Deseasonify: add generic `in_month` decorator (diff) | |
Deseasonify: re-lock seasonal listeners with new `in_month`
| -rw-r--r-- | bot/seasons/halloween/candy_collection.py | 6 | ||||
| -rw-r--r-- | bot/seasons/halloween/spookyreact.py | 4 | 
2 files changed, 5 insertions, 5 deletions
| diff --git a/bot/seasons/halloween/candy_collection.py b/bot/seasons/halloween/candy_collection.py index 3c65a745..8f2ed6f3 100644 --- a/bot/seasons/halloween/candy_collection.py +++ b/bot/seasons/halloween/candy_collection.py @@ -9,7 +9,7 @@ import discord  from discord.ext import commands  from bot.constants import Channels, Month -from bot.decorators import in_month_listener +from bot.decorators import in_month  log = logging.getLogger(__name__) @@ -35,8 +35,8 @@ class CandyCollection(commands.Cog):              userid = userinfo['userid']              self.get_candyinfo[userid] = userinfo +    @in_month(Month.october)      @commands.Cog.listener() -    @in_month_listener(Month.october)      async def on_message(self, message: discord.Message) -> None:          """Randomly adds candy or skull reaction to non-bot messages in the Event channel."""          # make sure its a human message @@ -57,8 +57,8 @@ class CandyCollection(commands.Cog):              self.msg_reacted.append(d)              return await message.add_reaction('\N{CANDY}') +    @in_month(Month.october)      @commands.Cog.listener() -    @in_month_listener(Month.october)      async def on_reaction_add(self, reaction: discord.Reaction, user: discord.Member) -> None:          """Add/remove candies from a person if the reaction satisfies criteria."""          message = reaction.message diff --git a/bot/seasons/halloween/spookyreact.py b/bot/seasons/halloween/spookyreact.py index c6127298..37f42a86 100644 --- a/bot/seasons/halloween/spookyreact.py +++ b/bot/seasons/halloween/spookyreact.py @@ -5,7 +5,7 @@ import discord  from discord.ext.commands import Bot, Cog  from bot.constants import Month -from bot.decorators import in_month_listener +from bot.decorators import in_month  log = logging.getLogger(__name__) @@ -26,8 +26,8 @@ class SpookyReact(Cog):      def __init__(self, bot: Bot):          self.bot = bot +    @in_month(Month.october)      @Cog.listener() -    @in_month_listener(Month.october)      async def on_message(self, ctx: discord.Message) -> None:          """          A command to send the seasonalbot github project. | 
