diff --git a/cogs/post_highscores/__init__.py b/cogs/post_highscores/__init__.py index 6852297..a0c16f2 100644 --- a/cogs/post_highscores/__init__.py +++ b/cogs/post_highscores/__init__.py @@ -16,7 +16,8 @@ class PostHighscores(commands.Cog, name="Post Highscores"): @commands.command(name="post-scores") async def post_highscores(self, ctx: commands.Context): - """A command which posts the highscore in the designated channel. Sends warning if no channel has been registered. + """ + A command which posts the highscore in the designated channel. Sends warning if no channel has been registered. Usage: ``` ?post-scores @@ -24,24 +25,20 @@ class PostHighscores(commands.Cog, name="Post Highscores"): """ # temporarily sending config data... channel_id = highscores.highscores_data["channel_id"] - if (channel_id != -1): - print( - f"Printing out highscores information in channel {channel_id}") + if "channel_id" in highscores.highscores_data: + channel_id = highscores.highscores_data["channel_id"] + print(f"Printing out highscores information in channel {channel_id}") channel = self.bot.get_channel(channel_id) + if channel is None: + response = 'Registered Highscores channel does not exist. Register again with "?register" command.' + await ctx.send(response) + return for boss in highscores.highscores_config["bosses"]: - highscore_string = highscore_message.format_highscore_message( - boss) - message = await channel.send(highscore_string) - message_id = message.id + await highscore_message.send_highscore_message(channel, boss) + break - # check if there is a dict for the boss in the highscores data - if not boss["boss"] in highscores.highscores_data: - highscores.highscores_data[boss["boss"]] = {} - - highscores.highscores_data[boss["boss"] - ]["message_id"] = message_id else: - response = "Highscores channel is not registered. Register with \"?register\" command." + response = 'Highscores channel is not registered. Register with "?register" command.' await ctx.send(response) data_storage.save_highscores_data(highscores.highscores_data) diff --git a/highscores.py b/highscores.py index fdeedef..962211e 100644 --- a/highscores.py +++ b/highscores.py @@ -2,7 +2,6 @@ main file for pvm-highscores bot """ -import json import logging import os @@ -12,12 +11,10 @@ from nextcord.ext import commands import config from utils import data_storage -logger = logging.getLogger('nextcord') +logger = logging.getLogger("nextcord") logger.setLevel(logging.DEBUG) -handler = logging.FileHandler( - filename='nextcord.log', encoding='utf-8', mode='w') -handler.setFormatter(logging.Formatter( - '%(asctime)s:%(levelname)s:%(name)s: %(message)s')) +handler = logging.FileHandler(filename="nextcord.log", encoding="utf-8", mode="w") +handler.setFormatter(logging.Formatter("%(asctime)s:%(levelname)s:%(name)s: %(message)s")) logger.addHandler(handler) diff --git a/utils/data_storage.py b/utils/data_storage.py index c244157..e492a35 100644 --- a/utils/data_storage.py +++ b/utils/data_storage.py @@ -37,7 +37,7 @@ def open_highscores_config(): def save_highscores_data(data): """ Saves the highscores data dict into a json file. - @param: dict of highscores data. + @param data: dict of highscores data. """ with open(HIGHSCORES_DATA_FILE, encoding='utf-8', mode='w') as file: file.write(json.dumps(data, indent=4)) diff --git a/utils/highscore_message.py b/utils/highscore_message.py index 055e2b7..3387664 100644 --- a/utils/highscore_message.py +++ b/utils/highscore_message.py @@ -2,13 +2,15 @@ Contains various functions for sending/editing the highscore messages. """ +import nextcord +from nextcord.ext import commands import highscores # pylint: disable=import-error def format_highscore_message(boss): """ returns a formattedd string for a boss's highscore - @param the dictionary object for the boss + @param boss: the dictionary object for the boss @return the formatted string """ boss_name = boss["boss"] @@ -17,7 +19,7 @@ def format_highscore_message(boss): # Gather all categories and add to string for category in highscores.highscores_config["categories"]: category_name = category["category"] - ret_string += f"{category_name}".ljust(30, ' ') + ret_string += f"{category_name}".ljust(30, " ") ret_string += "\n" highscore_size = highscores.highscores_config["highscore_size"] @@ -25,7 +27,7 @@ def format_highscore_message(boss): # list rankings for i in range(highscore_size): for category in highscores.highscores_config["categories"]: - ret_string += f"{i+1}: (name here)".ljust(30, ' ') + ret_string += f"{i+1}: submit your score".ljust(30, " ") ret_string += "\n" # if boss is hardmode, repeat above for hardmode applicable categories @@ -33,13 +35,48 @@ def format_highscore_message(boss): for category in highscores.highscores_config["categories"]: if category["hardmode"]: category_name = category["category"] - ret_string += f"{category_name}".ljust(30, ' ') + ret_string += f"{category_name}".ljust(30, " ") ret_string += "\n" for i in range(highscore_size): for category in highscores.highscores_config["categories"]: if category["hardmode"]: - ret_string += f"{i+1}: (name here)".ljust(30, ' ') + ret_string += f"{i+1}: (name here)".ljust(30, " ") ret_string += "\n" return ret_string + + +async def send_highscore_message(channel, boss): + """ + Function takes care of checking if a message exists for a boss, then creating and sending/editing the message + @param channel: the channel to send the message in/search for message id + @param boss: the boss to send the message about + """ + highscore_string = format_highscore_message(boss) + + if (boss["boss"] in highscores.highscores_data) and ( + "message_id" in highscores.highscores_data[boss["boss"]] + ): + message_id = highscores.highscores_data[boss["boss"]]["message_id"] + try: + message = await channel.fetch_message(message_id) + await message.edit(highscore_string) + except nextcord.NotFound: + # message doesn't exist. + message = await channel.send(highscore_string) + message_id = message.id + # check if there is a dict for the boss in the highscores data + if not boss["boss"] in highscores.highscores_data: + highscores.highscores_data[boss["boss"]] = {} + + highscores.highscores_data[boss["boss"]]["message_id"] = message_id + else: + # make a new message + message = await channel.send(highscore_string) + message_id = message.id + # check if there is a dict for the boss in the highscores data + if not boss["boss"] in highscores.highscores_data: + highscores.highscores_data[boss["boss"]] = {} + + highscores.highscores_data[boss["boss"]]["message_id"] = message_id