diff options
| author |  TizzySaurus <[email protected]> | 2021-11-01 21:32:37 +0000 |
|---|---|---|
| committer |  GitHub <[email protected]> | 2021-11-01 21:32:37 +0000 |
| commit | 872185c7ad1597c54c748feaf8cd2d1772100c69 (patch) | |
| tree | f1d102f4b35083eb0b1a707980530fd82c828a95 /bot/exts/holidays | |
| parent | Address Reviews V2 (diff) | |
| parent | Merge pull request #931 from hedyhli/candy (diff) | |
Merge branch 'main' into reorder-hacktoberfest-commandsreorder-hacktoberfest-commands
Diffstat (limited to 'bot/exts/holidays')
| -rw-r--r-- | bot/exts/holidays/easter/earth_photos.py | 3 | ||||
| -rw-r--r-- | bot/exts/holidays/halloween/candy_collection.py | 7 | ||||
| -rw-r--r-- | bot/exts/holidays/halloween/scarymovie.py | 1 |
3 files changed, 8 insertions, 3 deletions
diff --git a/bot/exts/holidays/easter/earth_photos.py b/bot/exts/holidays/easter/earth_photos.py index f65790af..27442f1c 100644 --- a/bot/exts/holidays/easter/earth_photos.py +++ b/bot/exts/holidays/easter/earth_photos.py @@ -4,8 +4,7 @@ import discord from discord.ext import commands from bot.bot import Bot -from bot.constants import Colours -from bot.constants import Tokens +from bot.constants import Colours, Tokens log = logging.getLogger(__name__) 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(), diff --git a/bot/exts/holidays/halloween/scarymovie.py b/bot/exts/holidays/halloween/scarymovie.py index 33659fd8..89310b97 100644 --- a/bot/exts/holidays/halloween/scarymovie.py +++ b/bot/exts/holidays/halloween/scarymovie.py @@ -6,6 +6,7 @@ from discord.ext import commands from bot.bot import Bot from bot.constants import Tokens + log = logging.getLogger(__name__) |