diff options
| author |  ChrisJL <[email protected]> | 2021-11-07 15:09:14 +0000 |
|---|---|---|
| committer |  GitHub <[email protected]> | 2021-11-07 15:09:14 +0000 |
| commit | cfd5d2a543dbf9bd69be5aab20ac32ebe4fd6b64 (patch) | |
| tree | 35913fd3a642a75e84929f0d8534c50eab3b659c /bot/exts/holidays/halloween/candy_collection.py | |
| parent | Add a border around the scary bat (diff) | |
| parent | Handle `.wtf` command without query (#939) (diff) | |
Merge branch 'main' into Add-border-around-bat
Diffstat (limited to 'bot/exts/holidays/halloween/candy_collection.py')
| -rw-r--r-- | bot/exts/holidays/halloween/candy_collection.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/bot/exts/holidays/halloween/candy_collection.py b/bot/exts/holidays/halloween/candy_collection.py index 09bd0e59..bb9c93be 100644 --- a/bot/exts/holidays/halloween/candy_collection.py +++ b/bot/exts/holidays/halloween/candy_collection.py @@ -83,6 +83,11 @@ class CandyCollection(commands.Cog): # if its not a candy or skull, and it is one of 10 most recent messages, # proceed to add a skull/candy with higher chance if str(reaction.emoji) not in (EMOJIS["SKULL"], EMOJIS["CANDY"]): + # Ensure the reaction is not for a bot's message so users can't spam + # reaction buttons like in .help to get candies. + if message.author.bot: + return + recent_message_ids = map( lambda m: m.id, await self.hacktober_channel.history(limit=10).flatten() @@ -182,7 +187,7 @@ class CandyCollection(commands.Cog): for index, record in enumerate(top_five) ) if top_five else "No Candies" - e = discord.Embed(colour=discord.Colour.blurple()) + e = discord.Embed(colour=discord.Colour.og_blurple()) e.add_field( name="Top Candy Records", value=generate_leaderboard(), |