aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Sebastiaan Zeeff <[email protected]>2019-09-30 16:49:25 +0200
committerGravatar GitHub <[email protected]>2019-09-30 16:49:25 +0200
commitdb27bafecec3ca2ef23a43d44e71ae1b707db2f8 (patch)
treecb5fc1932c2d15b1cdfd96cdf7c985399f98d07e
parentMerge pull request #231 from Suhail6inkling/date-fix (diff)
parentDisable announcements and add hacktober icon. (diff)
Merge pull request #280 from python-discord/hacktoberfest_prep
Disable halloween announcement and add hacktober icon.
-rw-r--r--bot/seasons/halloween/__init__.py14
-rw-r--r--bot/seasons/season.py2
2 files changed, 11 insertions, 5 deletions
diff --git a/bot/seasons/halloween/__init__.py b/bot/seasons/halloween/__init__.py
index e40e3dc9..c81879d7 100644
--- a/bot/seasons/halloween/__init__.py
+++ b/bot/seasons/halloween/__init__.py
@@ -3,16 +3,22 @@ from bot.seasons import SeasonBase
class Halloween(SeasonBase):
- """Halloween Seasonal event attributes."""
+ """
+ Halloween Seasonal event attributes.
+
+ Announcement for this cog temporarily disabled, since we're doing a custom
+ Hacktoberfest announcement. If you're enabling the announcement again,
+ make sure to update this docstring accordingly.
+ """
name = "halloween"
- bot_name = "Spookybot"
+ bot_name = "NeonBot"
greeting = "Happy Halloween!"
start_date = "01/10"
end_date = "01/11"
- colour = Colours.orange
+ colour = Colours.pink
icon = (
- "/logos/logo_seasonal/halloween/spooky.png",
+ "/logos/logo_seasonal/hacktober/hacktoberfest.png",
)
diff --git a/bot/seasons/season.py b/bot/seasons/season.py
index 8d8179f6..3546fda6 100644
--- a/bot/seasons/season.py
+++ b/bot/seasons/season.py
@@ -271,7 +271,7 @@ class SeasonBase:
It will skip the announcement if the current active season is the "evergreen" default season.
"""
# Don't actually announce if reverting to normal season
- if self.name in ("evergreen", "wildcard"):
+ if self.name in ("evergreen", "wildcard", "halloween"):
log.debug(f"Season Changed: {self.name}")
return