diff options
author | 2021-09-04 23:35:00 -0400 | |
---|---|---|
committer | 2021-09-04 23:35:00 -0400 | |
commit | 7ea66723f5f9c09e77e0b063002d4b222e7cc9d0 (patch) | |
tree | b175e14bafcc80ce164eb10ea81ed33f67e78420 /bot | |
parent | Move Halloween to Holidays folder (diff) |
Move Valentines to Holidays folder
Moves the valentine's day features to the holidays folders.
Corrected the paths to reflect the folder moves.
Diffstat (limited to 'bot')
-rw-r--r-- | bot/exts/holidays/valentines/__init__.py (renamed from bot/exts/valentines/__init__.py) | 0 | ||||
-rw-r--r-- | bot/exts/holidays/valentines/be_my_valentine.py (renamed from bot/exts/valentines/be_my_valentine.py) | 2 | ||||
-rw-r--r-- | bot/exts/holidays/valentines/lovecalculator.py (renamed from bot/exts/valentines/lovecalculator.py) | 2 | ||||
-rw-r--r-- | bot/exts/holidays/valentines/movie_generator.py (renamed from bot/exts/valentines/movie_generator.py) | 0 | ||||
-rw-r--r-- | bot/exts/holidays/valentines/myvalenstate.py (renamed from bot/exts/valentines/myvalenstate.py) | 2 | ||||
-rw-r--r-- | bot/exts/holidays/valentines/pickuplines.py (renamed from bot/exts/valentines/pickuplines.py) | 2 | ||||
-rw-r--r-- | bot/exts/holidays/valentines/savethedate.py (renamed from bot/exts/valentines/savethedate.py) | 2 | ||||
-rw-r--r-- | bot/exts/holidays/valentines/valentine_zodiac.py (renamed from bot/exts/valentines/valentine_zodiac.py) | 4 | ||||
-rw-r--r-- | bot/exts/holidays/valentines/whoisvalentine.py (renamed from bot/exts/valentines/whoisvalentine.py) | 2 | ||||
-rw-r--r-- | bot/resources/holidays/valentines/bemyvalentine_valentines.json (renamed from bot/resources/valentines/bemyvalentine_valentines.json) | 0 | ||||
-rw-r--r-- | bot/resources/holidays/valentines/date_ideas.json (renamed from bot/resources/valentines/date_ideas.json) | 0 | ||||
-rw-r--r-- | bot/resources/holidays/valentines/love_matches.json (renamed from bot/resources/valentines/love_matches.json) | 0 | ||||
-rw-r--r-- | bot/resources/holidays/valentines/pickup_lines.json (renamed from bot/resources/valentines/pickup_lines.json) | 0 | ||||
-rw-r--r-- | bot/resources/holidays/valentines/valenstates.json (renamed from bot/resources/valentines/valenstates.json) | 0 | ||||
-rw-r--r-- | bot/resources/holidays/valentines/valentine_facts.json (renamed from bot/resources/valentines/valentine_facts.json) | 0 | ||||
-rw-r--r-- | bot/resources/holidays/valentines/zodiac_compatibility.json (renamed from bot/resources/valentines/zodiac_compatibility.json) | 0 | ||||
-rw-r--r-- | bot/resources/holidays/valentines/zodiac_explanation.json (renamed from bot/resources/valentines/zodiac_explanation.json) | 0 |
17 files changed, 8 insertions, 8 deletions
diff --git a/bot/exts/valentines/__init__.py b/bot/exts/holidays/valentines/__init__.py index e69de29b..e69de29b 100644 --- a/bot/exts/valentines/__init__.py +++ b/bot/exts/holidays/valentines/__init__.py diff --git a/bot/exts/valentines/be_my_valentine.py b/bot/exts/holidays/valentines/be_my_valentine.py index c238027a..4d454c3a 100644 --- a/bot/exts/valentines/be_my_valentine.py +++ b/bot/exts/holidays/valentines/be_my_valentine.py @@ -26,7 +26,7 @@ class BeMyValentine(commands.Cog): @staticmethod def load_json() -> dict: """Load Valentines messages from the static resources.""" - p = Path("bot/resources/valentines/bemyvalentine_valentines.json") + p = Path("bot/resources/holidays/valentines/bemyvalentine_valentines.json") return loads(p.read_text("utf8")) @in_month(Month.FEBRUARY) diff --git a/bot/exts/valentines/lovecalculator.py b/bot/exts/holidays/valentines/lovecalculator.py index 1cb10e64..3999db2b 100644 --- a/bot/exts/valentines/lovecalculator.py +++ b/bot/exts/holidays/valentines/lovecalculator.py @@ -17,7 +17,7 @@ from bot.utils.decorators import in_month log = logging.getLogger(__name__) -LOVE_DATA = json.loads(Path("bot/resources/valentines/love_matches.json").read_text("utf8")) +LOVE_DATA = json.loads(Path("bot/resources/holidays/valentines/love_matches.json").read_text("utf8")) LOVE_DATA = sorted((int(key), value) for key, value in LOVE_DATA.items()) diff --git a/bot/exts/valentines/movie_generator.py b/bot/exts/holidays/valentines/movie_generator.py index d2dc8213..d2dc8213 100644 --- a/bot/exts/valentines/movie_generator.py +++ b/bot/exts/holidays/valentines/movie_generator.py diff --git a/bot/exts/valentines/myvalenstate.py b/bot/exts/holidays/valentines/myvalenstate.py index 52a61011..4b547d9b 100644 --- a/bot/exts/valentines/myvalenstate.py +++ b/bot/exts/holidays/valentines/myvalenstate.py @@ -12,7 +12,7 @@ from bot.constants import Colours log = logging.getLogger(__name__) -STATES = json.loads(Path("bot/resources/valentines/valenstates.json").read_text("utf8")) +STATES = json.loads(Path("bot/resources/holidays/valentines/valenstates.json").read_text("utf8")) class MyValenstate(commands.Cog): diff --git a/bot/exts/valentines/pickuplines.py b/bot/exts/holidays/valentines/pickuplines.py index 00741a72..bc4b88c6 100644 --- a/bot/exts/valentines/pickuplines.py +++ b/bot/exts/holidays/valentines/pickuplines.py @@ -11,7 +11,7 @@ from bot.constants import Colours log = logging.getLogger(__name__) -PICKUP_LINES = loads(Path("bot/resources/valentines/pickup_lines.json").read_text("utf8")) +PICKUP_LINES = loads(Path("bot/resources/holidays/valentines/pickup_lines.json").read_text("utf8")) class PickupLine(commands.Cog): diff --git a/bot/exts/valentines/savethedate.py b/bot/exts/holidays/valentines/savethedate.py index ffe559d6..3638c1ef 100644 --- a/bot/exts/valentines/savethedate.py +++ b/bot/exts/holidays/valentines/savethedate.py @@ -13,7 +13,7 @@ log = logging.getLogger(__name__) HEART_EMOJIS = [":heart:", ":gift_heart:", ":revolving_hearts:", ":sparkling_heart:", ":two_hearts:"] -VALENTINES_DATES = loads(Path("bot/resources/valentines/date_ideas.json").read_text("utf8")) +VALENTINES_DATES = loads(Path("bot/resources/holidays/valentines/date_ideas.json").read_text("utf8")) class SaveTheDate(commands.Cog): diff --git a/bot/exts/valentines/valentine_zodiac.py b/bot/exts/holidays/valentines/valentine_zodiac.py index 243f156e..d1b3a630 100644 --- a/bot/exts/valentines/valentine_zodiac.py +++ b/bot/exts/holidays/valentines/valentine_zodiac.py @@ -27,8 +27,8 @@ class ValentineZodiac(commands.Cog): @staticmethod def load_comp_json() -> tuple[dict, dict]: """Load zodiac compatibility from static JSON resource.""" - explanation_file = Path("bot/resources/valentines/zodiac_explanation.json") - compatibility_file = Path("bot/resources/valentines/zodiac_compatibility.json") + explanation_file = Path("bot/resources/holidays/valentines/zodiac_explanation.json") + compatibility_file = Path("bot/resources/holidays/valentines/zodiac_compatibility.json") zodiac_fact = json.loads(explanation_file.read_text("utf8")) diff --git a/bot/exts/valentines/whoisvalentine.py b/bot/exts/holidays/valentines/whoisvalentine.py index 211b1f27..67e46aa4 100644 --- a/bot/exts/valentines/whoisvalentine.py +++ b/bot/exts/holidays/valentines/whoisvalentine.py @@ -11,7 +11,7 @@ from bot.constants import Colours log = logging.getLogger(__name__) -FACTS = json.loads(Path("bot/resources/valentines/valentine_facts.json").read_text("utf8")) +FACTS = json.loads(Path("bot/resources/holidays/valentines/valentine_facts.json").read_text("utf8")) class ValentineFacts(commands.Cog): diff --git a/bot/resources/valentines/bemyvalentine_valentines.json b/bot/resources/holidays/valentines/bemyvalentine_valentines.json index 7d5d3705..7d5d3705 100644 --- a/bot/resources/valentines/bemyvalentine_valentines.json +++ b/bot/resources/holidays/valentines/bemyvalentine_valentines.json diff --git a/bot/resources/valentines/date_ideas.json b/bot/resources/holidays/valentines/date_ideas.json index 995f14bb..995f14bb 100644 --- a/bot/resources/valentines/date_ideas.json +++ b/bot/resources/holidays/valentines/date_ideas.json diff --git a/bot/resources/valentines/love_matches.json b/bot/resources/holidays/valentines/love_matches.json index 7df2dbda..7df2dbda 100644 --- a/bot/resources/valentines/love_matches.json +++ b/bot/resources/holidays/valentines/love_matches.json diff --git a/bot/resources/valentines/pickup_lines.json b/bot/resources/holidays/valentines/pickup_lines.json index eb01290f..eb01290f 100644 --- a/bot/resources/valentines/pickup_lines.json +++ b/bot/resources/holidays/valentines/pickup_lines.json diff --git a/bot/resources/valentines/valenstates.json b/bot/resources/holidays/valentines/valenstates.json index c58a5b7c..c58a5b7c 100644 --- a/bot/resources/valentines/valenstates.json +++ b/bot/resources/holidays/valentines/valenstates.json diff --git a/bot/resources/valentines/valentine_facts.json b/bot/resources/holidays/valentines/valentine_facts.json index e6f826c3..e6f826c3 100644 --- a/bot/resources/valentines/valentine_facts.json +++ b/bot/resources/holidays/valentines/valentine_facts.json diff --git a/bot/resources/valentines/zodiac_compatibility.json b/bot/resources/holidays/valentines/zodiac_compatibility.json index ea9a7b37..ea9a7b37 100644 --- a/bot/resources/valentines/zodiac_compatibility.json +++ b/bot/resources/holidays/valentines/zodiac_compatibility.json diff --git a/bot/resources/valentines/zodiac_explanation.json b/bot/resources/holidays/valentines/zodiac_explanation.json index 33864ea5..33864ea5 100644 --- a/bot/resources/valentines/zodiac_explanation.json +++ b/bot/resources/holidays/valentines/zodiac_explanation.json |