diff options
| author |  Rohan <[email protected]> | 2019-02-23 09:36:33 +0530 |
|---|---|---|
| committer | Rohan <[email protected]> | 2019-02-23 09:36:33 +0530 |
| commit | d0809c31687b96e22b1f16371159aa961e116a81 (patch) | |
| tree | c97113fa40005555b3e90a39989055112f6ed99e | |
| parent | Made the try catch block narrow and only catching KeyErrors (diff) | |
loaded json file in the init method
| -rw-r--r-- | bot/seasons/valentines/valentine_zodiac.py | 48 |
1 files changed, 26 insertions, 22 deletions
diff --git a/bot/seasons/valentines/valentine_zodiac.py b/bot/seasons/valentines/valentine_zodiac.py index cdb4221f..52df1f7f 100644 --- a/bot/seasons/valentines/valentine_zodiac.py +++ b/bot/seasons/valentines/valentine_zodiac.py @@ -20,34 +20,38 @@ class ValentineZodiac: """ def __init__(self, bot): self.bot = bot + self.zodiacs = self.load_json() + + @staticmethod + def load_json(): + p = Path('bot', 'resources', 'valentines', 'zodiac_compatibility.json') + with p.open() as json_data: + zodiacs = load(json_data) + return zodiacs @commands.command(name="partnerzodiac") async def counter_zodiac(self, ctx, zodiac_sign): """ Provides a counter compatible zodiac sign to the given user's zodiac sign. """ - - with open(Path('bot', 'resources', 'valentines', 'zodiac_compatibility.json'), 'r', encoding="utf8") as f: - zodiacs = load(f) - - try: - compatible_zodiac = random.choice(zodiacs[zodiac_sign.lower()]) - except KeyError: - return await ctx.send(zodiac_sign.capitalize() + " zodiac sign does not exist.") - - emoji1 = random.choice(HEART_EMOJIS) - emoji2 = random.choice(HEART_EMOJIS) - embed = discord.Embed( - title="Zodic Compatibility", - description=f'{zodiac_sign.capitalize()}{emoji1}{compatible_zodiac["Zodiac"]}\n' - f'{emoji2}Compatibility meter : {compatible_zodiac["compatibility_score"]}{emoji2}', - color=Colours.pink - ) - embed.add_field( - name=f'A letter from Dr.Zodiac {LETTER_EMOJI}', - value=compatible_zodiac['description'] - ) - await ctx.send(embed=embed) + try: + compatible_zodiac = random.choice(self.zodiacs[zodiac_sign.lower()]) + except KeyError: + return await ctx.send(zodiac_sign.capitalize() + " zodiac sign does not exist.") + + emoji1 = random.choice(HEART_EMOJIS) + emoji2 = random.choice(HEART_EMOJIS) + embed = discord.Embed( + title="Zodic Compatibility", + description=f'{zodiac_sign.capitalize()}{emoji1}{compatible_zodiac["Zodiac"]}\n' + f'{emoji2}Compatibility meter : {compatible_zodiac["compatibility_score"]}{emoji2}', + color=Colours.pink + ) + embed.add_field( + name=f'A letter from Dr.Zodiac {LETTER_EMOJI}', + value=compatible_zodiac['description'] + ) + await ctx.send(embed=embed) def setup(bot): |