Compare commits
49
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1ae6a4a223 | ||
|
|
e1a429c42a | ||
|
|
790e8ca50f | ||
|
|
7ba43ea4f4 | ||
|
|
39c858af64 | ||
|
|
093861b2e6 | ||
|
|
4ef487a8c4 | ||
|
|
849ebb966a | ||
|
|
f1b0e34194 | ||
|
|
7cdc7d2cef | ||
|
|
db4672dcda | ||
|
|
fc2b601687 | ||
|
|
493d44fa19 | ||
|
|
5d3a1568a2 | ||
|
|
be29194a57 | ||
|
|
d067da2300 | ||
|
|
6d0c10e1cc | ||
|
|
609bfa1277 | ||
|
|
158e53e799 | ||
|
|
3cc67a4e9e | ||
|
|
df80eb2952 | ||
|
|
b78eb7b9bf | ||
|
|
65ce143cfc | ||
|
|
8dbb2a6895 | ||
|
|
a24fe52182 | ||
|
|
d0131b1044 | ||
|
|
307ef86493 | ||
|
|
a1a9fae9fa | ||
|
|
56984b3df0 | ||
|
|
7a261d56fc | ||
|
|
4ee2280565 | ||
|
|
a24900a957 | ||
|
|
ef17d3dc3e | ||
|
|
d711763c80 | ||
|
|
8318bf741a | ||
|
|
17c1915810 | ||
|
|
674ea94588 | ||
|
|
090184c1e9 | ||
|
|
31fa0b50a3 | ||
|
|
374632bbc6 | ||
|
|
8a36c9dac9 | ||
|
|
1900e21f72 | ||
|
|
2c85483db5 | ||
|
|
63db9fb7d4 | ||
|
|
5155744ec5 | ||
|
|
fedc8be778 | ||
|
|
125939e5b3 | ||
|
|
3b410b5f90 | ||
|
|
d7bac2048f |
@@ -134,3 +134,4 @@ nextcord.log
|
||||
highscores_data.json
|
||||
highscores_message_map.json
|
||||
highscores_config.json
|
||||
deleted_backups/
|
||||
@@ -0,0 +1,49 @@
|
||||
"""
|
||||
Bot command for deleting the guild's scores.
|
||||
"""
|
||||
|
||||
from nextcord import Embed
|
||||
from nextcord.ext import commands
|
||||
|
||||
from highscores import highscores_data # pylint: disable=import-error
|
||||
from utilities.data_storage import save_highscores_data # pylint: disable=import-error
|
||||
from utilities.data_storage import create_highscore_skeleton # pylint: disable=import-error
|
||||
|
||||
|
||||
class DeleteScores(commands.Cog, name="Delete Scores"):
|
||||
"""
|
||||
Warning: This command only works for developers.
|
||||
Deletes this guild's scores.
|
||||
"""
|
||||
|
||||
def __init__(self, bot: commands.Bot):
|
||||
self.bot = bot
|
||||
|
||||
@commands.command(name="delete-scores")
|
||||
@commands.has_permissions(administrator=True)
|
||||
async def delete_scores(self, ctx: commands.Context):
|
||||
"""A command which registers current channel as for various uses.
|
||||
Usage:
|
||||
```
|
||||
?delete_scores
|
||||
```
|
||||
"""
|
||||
# only allow AlwaysCompiling to use.
|
||||
# If you are a developer and want to use command, can add name to list
|
||||
if ctx.author.id == 206602713511886849:
|
||||
guild_data: dict = highscores_data[str(ctx.guild.id)]
|
||||
|
||||
for boss, boss_data in guild_data["tables"].items():
|
||||
for category, category_data in boss_data["categories"].items():
|
||||
category_data = []
|
||||
boss_data["categories"][category] = category_data
|
||||
guild_data["tables"][boss] = boss_data
|
||||
|
||||
save_highscores_data(highscores_data)
|
||||
|
||||
|
||||
# This function will be called when this extension is loaded.
|
||||
# It is necessary to add these functions to the bot.
|
||||
def setup(bot: commands.Bot):
|
||||
"""Adds function to bot"""
|
||||
bot.add_cog(DeleteScores(bot))
|
||||
@@ -0,0 +1,54 @@
|
||||
"""
|
||||
Defines cog for guild listeners. Contains functions for various guild events.
|
||||
"""
|
||||
|
||||
import os
|
||||
import json
|
||||
|
||||
from nextcord.ext import commands
|
||||
import nextcord
|
||||
|
||||
from highscores import highscores_data # pylint: disable=import-error
|
||||
from utilities.data_storage import create_highscore_skeleton # pylint: disable=import-error
|
||||
from utilities.data_storage import save_highscores_data # pylint: disable=import-error
|
||||
|
||||
|
||||
class GuildListener(commands.Cog, name="Guild Listener"):
|
||||
"""Sets up message listener."""
|
||||
|
||||
def __init__(self, bot: commands.Bot):
|
||||
self.bot = bot
|
||||
|
||||
@commands.Cog.listener()
|
||||
async def on_guild_join(self, guild: nextcord.Guild):
|
||||
"""Listener for Guild Join. Creates skeleton for new guild joined and saves it."""
|
||||
# turning guild id into string because json doesn't support ints as object keys.
|
||||
highscores_data[str(guild.id)] = create_highscore_skeleton()
|
||||
save_highscores_data(highscores_data)
|
||||
|
||||
welcome_message: str = "Hello, I keep track of Highscores for you!"
|
||||
welcome_message += " Currently only supporting RuneScape boss highscores,"
|
||||
welcome_message += " but will be more dynamic support in future."
|
||||
welcome_message += ' For assistance on getting started, use "?register help".'
|
||||
|
||||
await guild.system_channel.send(content=welcome_message)
|
||||
|
||||
@commands.Cog.listener()
|
||||
async def on_guild_remove(self, guild: nextcord.Guild):
|
||||
"""Listener for Guild Remove. Removes data from highscores_data."""
|
||||
print(f"Removing data for guild {guild.name} (id {guild.id}).")
|
||||
old_data = highscores_data.pop(str(guild.id))
|
||||
save_highscores_data(highscores_data)
|
||||
|
||||
if not os.path.exists("deleted_backups"):
|
||||
os.mkdir("deleted_backups")
|
||||
|
||||
with open(f"deleted_backups/{guild.name}_backup.json", encoding="utf-8", mode="w") as file:
|
||||
file.write(json.dumps(old_data, indent=4))
|
||||
|
||||
|
||||
# This function will be called when this extension is loaded.
|
||||
# It is necessary to add these functions to the bot.
|
||||
def setup(bot: commands.Bot):
|
||||
"""Adds function to bot"""
|
||||
bot.add_cog(GuildListener(bot))
|
||||
@@ -2,11 +2,16 @@
|
||||
Defines cog for on message listener.
|
||||
"""
|
||||
|
||||
import re
|
||||
|
||||
from nextcord.ext import commands
|
||||
import nextcord
|
||||
|
||||
from highscores import submission_messages # pylint: disable=import-error
|
||||
from cogs.submission.submission_views import SubmissionState # pylint: disable=import-error
|
||||
from cogs.submission.submission_views import get_submission_embed # pylint: disable=import-error
|
||||
from highscores import highscores_config # pylint: disable=import-error
|
||||
from highscores import highscores_data # pylint: disable=import-error
|
||||
from highscores import submission_objects # pylint: disable=import-error
|
||||
|
||||
|
||||
class SubmissionListener(commands.Cog, name="Message Listener"):
|
||||
@@ -16,24 +21,71 @@ class SubmissionListener(commands.Cog, name="Message Listener"):
|
||||
self.bot = bot
|
||||
|
||||
@commands.Cog.listener()
|
||||
async def on_message(self, proof_message: nextcord.Message):
|
||||
async def on_message(self, message: nextcord.Message):
|
||||
"""Listener for message creation. Adds score and attachments to submission."""
|
||||
if proof_message.author.id in submission_messages:
|
||||
message_id = submission_messages[proof_message.author.id]
|
||||
submission_message: nextcord.Message = await self.bot.get_channel(
|
||||
highscores_data["submission_channel_id"]
|
||||
).fetch_message(message_id)
|
||||
guild_id = message.guild.id
|
||||
guild_data = highscores_data[str(guild_id)]
|
||||
if message.author.id in submission_objects:
|
||||
message_id = submission_objects[message.author.id]["message_id"]
|
||||
submission_message: nextcord.Message = (
|
||||
await self.bot.get_guild(guild_id)
|
||||
.get_channel(guild_data["submission_channel_id"])
|
||||
.fetch_message(message_id)
|
||||
)
|
||||
|
||||
# need check if correct user and correct channel
|
||||
if proof_message.channel.id == highscores_data["submission_channel_id"]:
|
||||
if message.channel.id == guild_data["submission_channel_id"]:
|
||||
state = submission_objects[message.author.id]["submission_state"]
|
||||
if state == SubmissionState.SCORE and message.content:
|
||||
|
||||
# check with regex if score matches correctly
|
||||
is_time_record = highscores_config["categories"][
|
||||
submission_objects[message.author.id]["category"]
|
||||
]["is_time_record"]
|
||||
|
||||
time_regex = re.search(
|
||||
"^([0-9]{1,2}:)?[0-9]{2}(\.[0-9])?$", # pylint: disable=anomalous-backslash-in-string
|
||||
message.content,
|
||||
)
|
||||
int_regex = re.search("^[0-9]+$", message.content)
|
||||
if time_regex is None and is_time_record:
|
||||
embed = submission_message.embeds[0]
|
||||
embed.add_field(name="Score", value=proof_message.content, inline=False)
|
||||
embed.add_field(
|
||||
name="Error",
|
||||
value="Time record must follow format MM:SS.ms or SS.ms or SS.",
|
||||
)
|
||||
elif int_regex is None and not is_time_record:
|
||||
embed = submission_message.embeds[0]
|
||||
embed.add_field(name="Error", value="Number record must only be number.")
|
||||
else:
|
||||
score = message.content
|
||||
if is_time_record:
|
||||
# standardize time score format.
|
||||
# strip leading 0s and colon
|
||||
# then add colon if its not there
|
||||
score = score.lstrip("0:")
|
||||
if score.find(":") == -1:
|
||||
score = "0:" + score
|
||||
submission_objects[message.author.id]["score"] = score
|
||||
embed = get_submission_embed(message.author.id)
|
||||
|
||||
await submission_message.edit(
|
||||
files=[await attch.to_file() for attch in proof_message.attachments],
|
||||
embed=embed,
|
||||
)
|
||||
await proof_message.delete()
|
||||
elif state == SubmissionState.PROOF and len(message.attachments) > 0:
|
||||
await submission_message.edit(
|
||||
files=[await attch.to_file() for attch in message.attachments],
|
||||
)
|
||||
elif state == SubmissionState.NAME and message.content:
|
||||
submission_objects[message.author.id]["username"] = message.content[
|
||||
: guild_data["username_length"]
|
||||
]
|
||||
embed = get_submission_embed(message.author.id)
|
||||
await submission_message.edit(
|
||||
embed=embed,
|
||||
)
|
||||
|
||||
await message.delete()
|
||||
|
||||
|
||||
# This function will be called when this extension is loaded.
|
||||
|
||||
@@ -5,7 +5,7 @@ Bot command to post the highscores
|
||||
from nextcord.ext import commands
|
||||
import nextcord
|
||||
|
||||
from cogs.submission.submission_views import SubmissionButton # pylint: disable=import-error
|
||||
from cogs.submission.submission_views import SubmissionCreateButton # pylint: disable=import-error
|
||||
from highscores import highscores_config # pylint: disable=import-error
|
||||
from highscores import highscores_data # pylint: disable=import-error
|
||||
from utilities.data_storage import save_highscores_data # pylint: disable=import-error
|
||||
@@ -29,18 +29,22 @@ class PostHighscores(commands.Cog, name="Post Highscores"):
|
||||
?post-scores
|
||||
```
|
||||
"""
|
||||
highscore_channel_id = highscores_data["highscore_channel_id"]
|
||||
guild_data = highscores_data[str(ctx.guild.id)]
|
||||
highscore_channel_id = guild_data["highscore_channel_id"]
|
||||
print(f"Printing out highscores information in channel {highscore_channel_id}")
|
||||
channel = self.bot.get_channel(highscore_channel_id)
|
||||
channel = ctx.guild.get_channel(highscore_channel_id)
|
||||
|
||||
error_response = 'Registered Highscores channel does not exist or was never registered. \n\
|
||||
Register with "?register" command.'
|
||||
assert channel is not None, await ctx.send(error_response)
|
||||
|
||||
for boss in highscores_config["bosses"]:
|
||||
message: nextcord.Message = await send_highscore_message(channel, boss["boss"])
|
||||
await message.edit(view=SubmissionButton(self.bot))
|
||||
for boss, categories in highscores_config[ # pylint: disable=unused-variable
|
||||
"tables"
|
||||
].items():
|
||||
message: nextcord.Message = await send_highscore_message(channel, boss, guild_data)
|
||||
await message.edit(view=SubmissionCreateButton(self.bot))
|
||||
|
||||
# Saving in case new message was sent.
|
||||
save_highscores_data(highscores_data)
|
||||
|
||||
|
||||
|
||||
@@ -29,16 +29,17 @@ class RegisterVerificationChannel(commands.Cog, name="Register"):
|
||||
"""
|
||||
# respond to the message
|
||||
channel_id = ctx.channel.id
|
||||
guild_data = highscores_data[str(ctx.guild.id)]
|
||||
|
||||
if registration_type == "verify":
|
||||
await ctx.send(f"Registered <#{channel_id}> as channel to post verifications in.")
|
||||
highscores_data["verification_channel_id"] = channel_id
|
||||
guild_data["verification_channel_id"] = channel_id
|
||||
elif registration_type == "highscore":
|
||||
await ctx.send(f"Registered <#{channel_id}> as channel to post highscores in.")
|
||||
highscores_data["highscore_channel_id"] = channel_id
|
||||
guild_data["highscore_channel_id"] = channel_id
|
||||
elif registration_type == "submission":
|
||||
await ctx.send(f"Registered <#{channel_id}> as channel to post submissions in.")
|
||||
highscores_data["submission_channel_id"] = channel_id
|
||||
guild_data["submission_channel_id"] = channel_id
|
||||
else:
|
||||
embed = Embed(
|
||||
title="Register command help", description="How to use the register command."
|
||||
|
||||
@@ -5,7 +5,6 @@ Bot command to submit a score
|
||||
from nextcord.ext import commands
|
||||
|
||||
from highscores import highscores_data # pylint: disable=import-error
|
||||
from utilities.utils import submit_score # pylint: disable=import-error
|
||||
from .verification_view import VerificationView
|
||||
|
||||
|
||||
@@ -30,11 +29,12 @@ class Score(commands.Cog, name="Score"):
|
||||
This command still works if you prefer to use it over the ui.
|
||||
```
|
||||
"""
|
||||
verification_channel_id = highscores_data["verification_channel_id"]
|
||||
channel = self.bot.get_channel(verification_channel_id)
|
||||
guild_data = highscores_data[str(ctx.guild.id)]
|
||||
verification_channel_id = guild_data["verification_channel_id"]
|
||||
channel = ctx.guild.get_channel(verification_channel_id)
|
||||
|
||||
error_response = "Registered Verification channel does not exist or was never registered. \
|
||||
Contact server admins."
|
||||
error_response = "Registered Verification channel does not exist or was never registered."
|
||||
error_response += "Contact server admins."
|
||||
assert channel is not None, await ctx.send(error_response)
|
||||
|
||||
verification_string = f"{ctx.author.display_name}:{boss_name}:{category}:{score}"
|
||||
|
||||
@@ -4,7 +4,8 @@ Cog for creating submission process.
|
||||
|
||||
from nextcord.ext import commands
|
||||
|
||||
from .submission_views import SubmissionButton
|
||||
from .submission_views import SubmissionCreateButton
|
||||
from .verification_view import VerificationView
|
||||
|
||||
|
||||
class SubmissionCog(commands.Cog, name="Submission Cog"):
|
||||
@@ -16,7 +17,8 @@ class SubmissionCog(commands.Cog, name="Submission Cog"):
|
||||
@commands.Cog.listener()
|
||||
async def on_ready(self):
|
||||
"""Called when cog is loaded"""
|
||||
self.bot.add_view(SubmissionButton(self.bot))
|
||||
self.bot.add_view(SubmissionCreateButton(self.bot))
|
||||
self.bot.add_view(VerificationView())
|
||||
|
||||
|
||||
# This function will be called when this extension is loaded.
|
||||
|
||||
@@ -1,54 +1,71 @@
|
||||
"""Views used for submission process."""
|
||||
|
||||
from typing import Optional
|
||||
from enum import Enum
|
||||
|
||||
import nextcord
|
||||
from nextcord import Embed
|
||||
from nextcord.ext import commands
|
||||
|
||||
from utilities.data_storage import open_message_map # pylint: disable=import-error
|
||||
from highscores import highscores_config # pylint: disable=import-error
|
||||
from highscores import highscores_data # pylint: disable=import-error
|
||||
from highscores import submission_messages # pylint: disable=import-error
|
||||
from highscores import highscores_message_map # pylint: disable=import-error
|
||||
from highscores import submission_objects # pylint: disable=import-error
|
||||
from .verification_view import VerificationView
|
||||
|
||||
|
||||
class SubmissionButton(nextcord.ui.View):
|
||||
"""Defines view for score submission button."""
|
||||
class SubmissionState(Enum):
|
||||
"""Enum for which state a submission is in"""
|
||||
|
||||
def __init__(self, bot: commands.Bot):
|
||||
super().__init__(timeout=None)
|
||||
self._bot = bot
|
||||
CATEGORY = 1
|
||||
SCORE = 2
|
||||
PROOF = 3
|
||||
NAME = 4
|
||||
SUBMIT = 5
|
||||
VERIFY = 6
|
||||
|
||||
@nextcord.ui.button(label="Submit", style=nextcord.ButtonStyle.primary, custom_id="submit")
|
||||
async def submit_button(
|
||||
self, button: nextcord.ui.Button, interaction: nextcord.Interaction
|
||||
): # pylint: disable=unused-argument
|
||||
"""Button for score submission."""
|
||||
highscores_message_map = open_message_map()
|
||||
boss_name = highscores_message_map[str(interaction.message.id)]
|
||||
embed = nextcord.Embed(title="Highscores Submission")
|
||||
embed.add_field(name="Boss", value=boss_name, inline=False)
|
||||
embed.add_field(name="User", value=interaction.user.display_name, inline=False)
|
||||
channel = self._bot.get_channel(highscores_data["submission_channel_id"])
|
||||
submission_message = await channel.send(
|
||||
f"<@{interaction.user.id}>",
|
||||
view=SubmissionDropdownView(
|
||||
self._bot, interaction, await self._category_select_options(boss_name)
|
||||
),
|
||||
embed=embed,
|
||||
)
|
||||
|
||||
# a user should only have 1 submission active at once.
|
||||
submission_messages[interaction.user.id] = submission_message.id
|
||||
def get_submission_embed(userid: int) -> nextcord.Embed:
|
||||
"""Creates an embed based off of the submission state and fields filled out."""
|
||||
usersubmission: dict = submission_objects[userid]
|
||||
state: SubmissionState = usersubmission["submission_state"]
|
||||
|
||||
async def _category_select_options(self, boss_name: str) -> "list[nextcord.SelectOption]":
|
||||
options: list[nextcord.SelectOption] = [] # pylint: disable=unsubscriptable-object
|
||||
boss_dict = highscores_data[boss_name]
|
||||
for category in boss_dict["categories"].items():
|
||||
options.append(nextcord.SelectOption(label=category[0]))
|
||||
if state is SubmissionState.CATEGORY:
|
||||
description = "Step 1: Choose your category!"
|
||||
elif state is SubmissionState.SCORE:
|
||||
description = "Step 2: Input your score!"
|
||||
elif state is SubmissionState.PROOF:
|
||||
description = "Step 3: Submit your proof!"
|
||||
elif state is SubmissionState.NAME:
|
||||
description = "Step 4 (Optional): Change name on submission! (proceed to next if skipping)"
|
||||
elif state is SubmissionState.SUBMIT:
|
||||
description = "Step 5: Submit if everything looks correct!"
|
||||
elif state is SubmissionState.VERIFY:
|
||||
description = "Review fields and accept."
|
||||
|
||||
embed = Embed(title="Highscores Submission", description=description)
|
||||
embed.add_field(name="User Name", value=usersubmission["username"], inline=False)
|
||||
embed.add_field(name="Boss", value=usersubmission["boss_name"], inline=False)
|
||||
if usersubmission["category"]:
|
||||
embed.add_field(name="Category", value=usersubmission["category"], inline=False)
|
||||
if usersubmission["score"]:
|
||||
embed.add_field(name="Score", value=usersubmission["score"], inline=False)
|
||||
return embed
|
||||
|
||||
|
||||
def category_select_options(boss_name: str) -> "list[nextcord.SelectOption]":
|
||||
"""Returns list of categories for a given boss."""
|
||||
options: "list[nextcord.SelectOption]" = []
|
||||
category_list = highscores_config["tables"][boss_name]
|
||||
for category in category_list:
|
||||
options.append(nextcord.SelectOption(label=category))
|
||||
|
||||
return options
|
||||
|
||||
|
||||
############ Items used in submission process ############
|
||||
|
||||
|
||||
class SubmissionDropdown(nextcord.ui.Select):
|
||||
"""Defines dropdown menu for submission"""
|
||||
|
||||
@@ -63,60 +80,181 @@ class SubmissionDropdown(nextcord.ui.Select):
|
||||
self._bot = bot
|
||||
|
||||
async def callback(self, interaction: nextcord.Interaction):
|
||||
embed = interaction.message.embeds[0]
|
||||
embed.add_field(name="Category", value=self.values[0], inline=False)
|
||||
submission_objects[interaction.user.id]["category"] = self.values[0]
|
||||
embed = get_submission_embed(interaction.user.id)
|
||||
await interaction.message.edit(
|
||||
embed=embed,
|
||||
)
|
||||
|
||||
|
||||
class SubmissionDropdownView(nextcord.ui.View):
|
||||
"""Defines submission dropdown process view"""
|
||||
class BackButton(nextcord.ui.Button):
|
||||
"""Defines view for back button."""
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
bot: commands.Bot,
|
||||
prev_interaction: nextcord.Interaction,
|
||||
options: "list[nextcord.SelectOption]",
|
||||
*,
|
||||
timeout: Optional[float] = 180,
|
||||
def __init__(self, bot: commands.Bot):
|
||||
super().__init__(label="Back", style=nextcord.ButtonStyle.primary, custom_id="back")
|
||||
self._bot = bot
|
||||
|
||||
async def callback(self, interaction: nextcord.Interaction):
|
||||
state: SubmissionState = submission_objects[interaction.user.id]["submission_state"]
|
||||
state = SubmissionState(state.value - 1)
|
||||
submission_objects[interaction.user.id]["submission_state"] = state
|
||||
embed = get_submission_embed(interaction.user.id)
|
||||
await interaction.edit(embed=embed, view=SubmissionView(self._bot, interaction.user.id))
|
||||
|
||||
|
||||
class CancelButton(nextcord.ui.Button):
|
||||
"""Deletes message to cancel interaction.."""
|
||||
|
||||
def __init__(self):
|
||||
super().__init__(label="Cancel", style=nextcord.ButtonStyle.red, custom_id="cancel")
|
||||
|
||||
async def callback(self, interaction: nextcord.Interaction):
|
||||
submission_objects.pop(interaction.user.id)
|
||||
await interaction.message.delete()
|
||||
|
||||
|
||||
class NextButton(nextcord.ui.Button):
|
||||
"""Defines view for next button."""
|
||||
|
||||
def __init__(self, bot: commands.Bot):
|
||||
super().__init__(label="Next", style=nextcord.ButtonStyle.primary, custom_id="next")
|
||||
self._bot = bot
|
||||
|
||||
async def callback(self, interaction: nextcord.Interaction):
|
||||
# check if fields have been filled out for each state
|
||||
state: SubmissionState = submission_objects[interaction.user.id]["submission_state"]
|
||||
if (
|
||||
state == SubmissionState.CATEGORY
|
||||
and not submission_objects[interaction.user.id]["category"]
|
||||
):
|
||||
super().__init__(timeout=timeout)
|
||||
self.add_item(SubmissionDropdown(bot, options))
|
||||
self._prev_interaction = prev_interaction
|
||||
self.bot = bot
|
||||
await interaction.send("Please choose a category.", ephemeral=True)
|
||||
elif (
|
||||
state == SubmissionState.SCORE and not submission_objects[interaction.user.id]["score"]
|
||||
):
|
||||
await interaction.send("Please send a score.", ephemeral=True)
|
||||
elif state == SubmissionState.PROOF and not len(interaction.message.attachments) > 0:
|
||||
await interaction.send("Please attach picture for proof.", ephemeral=True)
|
||||
else:
|
||||
state = SubmissionState(state.value + 1)
|
||||
submission_objects[interaction.user.id]["submission_state"] = state
|
||||
embed = get_submission_embed(interaction.user.id)
|
||||
await interaction.edit(embed=embed, view=SubmissionView(self._bot, interaction.user.id))
|
||||
|
||||
async def interaction_check(self, interaction: nextcord.Interaction) -> bool:
|
||||
return self._prev_interaction.user == interaction.user
|
||||
|
||||
@nextcord.ui.button(
|
||||
label="Submit Score", style=nextcord.ButtonStyle.green, custom_id="submit-score"
|
||||
)
|
||||
async def submit_button(
|
||||
self, button: nextcord.ui.Button, interaction: nextcord.Interaction
|
||||
): # pylint: disable=unused-argument
|
||||
class SubmitButton(nextcord.ui.Button):
|
||||
"""Defines button to submit a user's score."""
|
||||
verification_channel_id = highscores_data["verification_channel_id"]
|
||||
channel = self.bot.get_channel(verification_channel_id)
|
||||
|
||||
def __init__(self, bot: commands.Bot):
|
||||
super().__init__(label="Submit", style=nextcord.ButtonStyle.green, custom_id="submit")
|
||||
self._bot = bot
|
||||
|
||||
async def callback(self, interaction: nextcord.Interaction):
|
||||
verification_channel_id = highscores_data[str(interaction.guild.id)][
|
||||
"verification_channel_id"
|
||||
]
|
||||
channel = interaction.guild.get_channel(verification_channel_id)
|
||||
|
||||
error_response = "Registered Verification channel does not exist or was never registered. \
|
||||
Contact server admins."
|
||||
assert channel is not None, await channel.send(error_response)
|
||||
|
||||
submission_objects[interaction.user.id]["submission_state"] = SubmissionState.VERIFY
|
||||
|
||||
embed = get_submission_embed(interaction.user.id)
|
||||
|
||||
await channel.send(
|
||||
files=[await attch.to_file() for attch in interaction.message.attachments],
|
||||
view=VerificationView(),
|
||||
embed=interaction.message.embeds[0],
|
||||
embed=embed,
|
||||
content=f"Submission from {interaction.user.display_name}",
|
||||
)
|
||||
await interaction.message.edit(content=f"<@{interaction.user.id}> Submitted!", view=None)
|
||||
submission_messages.pop(interaction.user.id)
|
||||
submission_objects.pop(interaction.user.id)
|
||||
|
||||
|
||||
############ Submission Views ############
|
||||
|
||||
|
||||
class SubmissionCreateButton(nextcord.ui.View):
|
||||
"""Defines view for score submission button."""
|
||||
|
||||
def __init__(self, bot: commands.Bot):
|
||||
super().__init__(timeout=None)
|
||||
self._bot = bot
|
||||
|
||||
@nextcord.ui.button(
|
||||
label="Cancel", style=nextcord.ButtonStyle.red, custom_id="cancel-submission"
|
||||
label="Submit", style=nextcord.ButtonStyle.primary, custom_id="submitcreate"
|
||||
)
|
||||
async def cancel_button(
|
||||
async def submitcreate_button(
|
||||
self, button: nextcord.ui.Button, interaction: nextcord.Interaction
|
||||
): # pylint: disable=unused-argument
|
||||
"""Deletes message to cancel interaction."""
|
||||
submission_messages.pop(interaction.user.id)
|
||||
await interaction.message.delete()
|
||||
"""Button for score submission."""
|
||||
guild_id_str = str(interaction.guild.id)
|
||||
guild_data = highscores_data[guild_id_str]
|
||||
|
||||
boss_name = highscores_message_map[guild_id_str][interaction.message.id]
|
||||
channel = interaction.guild.get_channel(guild_data["submission_channel_id"])
|
||||
|
||||
# a user should only have 1 submission active at once.
|
||||
# submitting with dummy message_id until message created
|
||||
# split username on pipe.
|
||||
submission_objects[interaction.user.id] = {
|
||||
"message_id": 0,
|
||||
"submission_state": SubmissionState.CATEGORY,
|
||||
"boss_name": boss_name,
|
||||
"score": "",
|
||||
"category": "",
|
||||
"username": interaction.user.display_name.split("|")[0][
|
||||
: guild_data["username_length"]
|
||||
],
|
||||
}
|
||||
|
||||
embed = get_submission_embed(interaction.user.id)
|
||||
|
||||
submission_message = await channel.send(
|
||||
f"<@{interaction.user.id}>",
|
||||
view=SubmissionView(
|
||||
self._bot,
|
||||
interaction.user.id,
|
||||
),
|
||||
embed=embed,
|
||||
)
|
||||
|
||||
# update the message_id once its created
|
||||
submission_objects[interaction.user.id]["message_id"] = submission_message.id
|
||||
|
||||
|
||||
class SubmissionView(nextcord.ui.View):
|
||||
"""Defines view submitting. Adjusts to all states."""
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
bot: commands.Bot,
|
||||
submission_user: int,
|
||||
*,
|
||||
timeout: Optional[float] = 180,
|
||||
):
|
||||
super().__init__(timeout=timeout)
|
||||
self._submission_user = submission_user
|
||||
self._bot = bot
|
||||
self._state = submission_objects[self._submission_user]["submission_state"]
|
||||
self._boss_name = submission_objects[self._submission_user]["boss_name"]
|
||||
|
||||
# add items depending on given state
|
||||
if self._state is SubmissionState.CATEGORY:
|
||||
self.add_item(SubmissionDropdown(bot, category_select_options(self._boss_name)))
|
||||
self.add_item(CancelButton())
|
||||
self.add_item(NextButton(self._bot))
|
||||
elif (
|
||||
self._state is SubmissionState.SCORE
|
||||
or self._state is SubmissionState.PROOF
|
||||
or self._state is SubmissionState.NAME
|
||||
):
|
||||
self.add_item(BackButton(self._bot))
|
||||
self.add_item(NextButton(self._bot))
|
||||
elif self._state is SubmissionState.SUBMIT:
|
||||
self.add_item(BackButton(self._bot))
|
||||
self.add_item(SubmitButton(self._bot))
|
||||
|
||||
async def interaction_check(self, interaction: nextcord.Interaction) -> bool:
|
||||
return self._submission_user == interaction.user.id
|
||||
|
||||
@@ -10,6 +10,15 @@ class VerificationView(nextcord.ui.View):
|
||||
def __init__(self):
|
||||
super().__init__(timeout=None)
|
||||
|
||||
@nextcord.ui.button(
|
||||
label="Deny", style=nextcord.ButtonStyle.red, custom_id="deny-button-submission"
|
||||
)
|
||||
async def deny_button(
|
||||
self, button: nextcord.ui.Button, interaction: nextcord.Interaction
|
||||
): # pylint: disable=unused-argument
|
||||
"""Button for denying score submission."""
|
||||
await interaction.message.delete()
|
||||
|
||||
@nextcord.ui.button(
|
||||
label="Approve", style=nextcord.ButtonStyle.green, custom_id="approve-button-submission"
|
||||
)
|
||||
@@ -26,7 +35,7 @@ class VerificationView(nextcord.ui.View):
|
||||
category = field["value"]
|
||||
elif field["name"] == "Score":
|
||||
score = field["value"]
|
||||
elif field["name"] == "User":
|
||||
elif field["name"] == "User Name":
|
||||
user = field["value"]
|
||||
|
||||
try:
|
||||
@@ -35,12 +44,3 @@ class VerificationView(nextcord.ui.View):
|
||||
except UnboundLocalError:
|
||||
await interaction.send("Instruct user to submit with all fields.")
|
||||
await interaction.message.edit(view=None)
|
||||
|
||||
@nextcord.ui.button(
|
||||
label="Deny", style=nextcord.ButtonStyle.red, custom_id="deny-button-submission"
|
||||
)
|
||||
async def deny_button(
|
||||
self, button: nextcord.ui.Button, interaction: nextcord.Interaction
|
||||
): # pylint: disable=unused-argument
|
||||
"""Button for denying score submission."""
|
||||
await interaction.message.delete()
|
||||
|
||||
@@ -1,203 +1,332 @@
|
||||
{
|
||||
"bosses": [
|
||||
{
|
||||
"boss": "The Ambassador",
|
||||
"hardmode": true
|
||||
},
|
||||
{
|
||||
"boss": "Araxxi",
|
||||
"hardmode": false
|
||||
},
|
||||
{
|
||||
"boss": "Arch-Glacor",
|
||||
"hardmode": true
|
||||
},
|
||||
{
|
||||
"boss": "Astellarn",
|
||||
"hardmode": true
|
||||
},
|
||||
{
|
||||
"boss": "The Barrows Brothers",
|
||||
"hardmode": false
|
||||
},
|
||||
{
|
||||
"boss": "The Barrows: Rise of the Six",
|
||||
"hardmode": false
|
||||
},
|
||||
{
|
||||
"boss": "Beastmaster Durzag",
|
||||
"hardmode": false
|
||||
},
|
||||
{
|
||||
"boss": "Black Stone Dragon",
|
||||
"hardmode": true
|
||||
},
|
||||
{
|
||||
"boss": "Chaos Elemental",
|
||||
"hardmode": false
|
||||
},
|
||||
{
|
||||
"boss": "Commander Zilyana",
|
||||
"hardmode": true
|
||||
},
|
||||
{
|
||||
"boss": "Corporeal Beast",
|
||||
"hardmode": false
|
||||
},
|
||||
{
|
||||
"boss": "Crassian Leviathan",
|
||||
"hardmode": true
|
||||
},
|
||||
{
|
||||
"boss": "Croesus",
|
||||
"hardmode": false
|
||||
},
|
||||
{
|
||||
"boss": "Dagannoth Kings",
|
||||
"hardmode": false
|
||||
},
|
||||
{
|
||||
"boss": "General Graardor",
|
||||
"hardmode": true
|
||||
},
|
||||
{
|
||||
"boss": "Giant Mole",
|
||||
"hardmode": true
|
||||
},
|
||||
{
|
||||
"boss": "Gregorovic",
|
||||
"hardmode": true
|
||||
},
|
||||
{
|
||||
"boss": "Har-Aken",
|
||||
"hardmode": false
|
||||
},
|
||||
{
|
||||
"boss": "Helwyr",
|
||||
"hardmode": true
|
||||
},
|
||||
{
|
||||
"boss": "Kalphite King",
|
||||
"hardmode": false
|
||||
},
|
||||
{
|
||||
"boss": "Kalphite Queen",
|
||||
"hardmode": false
|
||||
},
|
||||
{
|
||||
"boss": "Kerapac",
|
||||
"hardmode": true
|
||||
},
|
||||
{
|
||||
"boss": "King Black Dragon",
|
||||
"hardmode": false
|
||||
},
|
||||
{
|
||||
"boss": "Kree'arra",
|
||||
"hardmode": true
|
||||
},
|
||||
{
|
||||
"boss": "K'ril Tsutsaroth",
|
||||
"hardmode": true
|
||||
},
|
||||
{
|
||||
"boss": "Legiones",
|
||||
"hardmode": false
|
||||
},
|
||||
{
|
||||
"boss": "The Magister",
|
||||
"hardmode": false
|
||||
},
|
||||
{
|
||||
"boss": "Masuta the Ascended",
|
||||
"hardmode": true
|
||||
},
|
||||
{
|
||||
"boss": "Nex",
|
||||
"hardmode": false
|
||||
},
|
||||
{
|
||||
"boss": "Nex - Angel of Death",
|
||||
"hardmode": false
|
||||
},
|
||||
{
|
||||
"boss": "Queen Black Dragon",
|
||||
"hardmode": false
|
||||
},
|
||||
{
|
||||
"boss": "Raksha",
|
||||
"hardmode": true
|
||||
},
|
||||
{
|
||||
"boss": "Rex Matriarchs",
|
||||
"hardmode": false
|
||||
},
|
||||
{
|
||||
"boss": "The Sanctum Guardian",
|
||||
"hardmode": true
|
||||
},
|
||||
{
|
||||
"boss": "Seiryu the Azure Serpent",
|
||||
"hardmode": true
|
||||
},
|
||||
{
|
||||
"boss": "Solak",
|
||||
"hardmode": false
|
||||
},
|
||||
{
|
||||
"boss": "Taraket the Necromancer",
|
||||
"hardmode": true
|
||||
},
|
||||
{
|
||||
"boss": "Telos",
|
||||
"hardmode": false
|
||||
},
|
||||
{
|
||||
"boss": "The Twin Furies",
|
||||
"hardmode": true
|
||||
},
|
||||
{
|
||||
"boss": "TzKal-Zuk",
|
||||
"hardmode": true
|
||||
},
|
||||
{
|
||||
"boss": "TzTok-Jad",
|
||||
"hardmode": false
|
||||
},
|
||||
{
|
||||
"boss": "Verak Lith",
|
||||
"hardmode": true
|
||||
},
|
||||
{
|
||||
"boss": "Vindicta & Gorvek",
|
||||
"hardmode": true
|
||||
},
|
||||
{
|
||||
"boss": "Vorago",
|
||||
"hardmode": true
|
||||
},
|
||||
{
|
||||
"boss": "Yakamaru",
|
||||
"hardmode": false
|
||||
},
|
||||
{
|
||||
"boss": "Zamorak, Lord of Chaos",
|
||||
"hardmode": true
|
||||
}
|
||||
"tables": {
|
||||
"The Ambassador": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Group Kill Count",
|
||||
"Group Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Araxxi": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Arch-Glacor": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Hardmode Kill Count",
|
||||
"Hardmode Kill Time",
|
||||
"Enrage",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Astellarn": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Group Kill Count",
|
||||
"Group Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"The Barrows Brothers": [
|
||||
"Kill Count",
|
||||
"Spooned Log"
|
||||
],
|
||||
"The Barrows: Rise of the Six": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Beastmaster Durzag": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Black Stone Dragon": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Group Kill Count",
|
||||
"Group Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Chaos Elemental": [
|
||||
"Kill Count",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Commander Zilyana": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Hardmode Kill Count",
|
||||
"Hardmode Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Corporeal Beast": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Crassian Leviathan": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Group Kill Count",
|
||||
"Group Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Croesus": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Dagannoth Kings": [
|
||||
"Kill Count",
|
||||
"Spooned Log"
|
||||
],
|
||||
"General Graardor": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Hardmode Kill Count",
|
||||
"Hardmode Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Giant Mole": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Hardmode Kill Count",
|
||||
"Hardmode Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Gregorovic": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Hardmode Kill Count",
|
||||
"Hardmode Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Har-Aken": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Helwyr": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Hardmode Kill Count",
|
||||
"Hardmode Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Kalphite King": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Kalphite Queen": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Kerapac": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Hardmode Kill Count",
|
||||
"Hardmode Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"King Black Dragon": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Kree'arra": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Hardmode Kill Count",
|
||||
"Hardmode Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"K'ril Tsutsaroth": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Hardmode Kill Count",
|
||||
"Hardmode Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Legiones": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"The Magister": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Masuta the Ascended": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Group Kill Count",
|
||||
"Group Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Nex": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Nex - Angel of Death": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Queen Black Dragon": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Raksha": [
|
||||
"Solo Kill Count",
|
||||
"Solo Kill Time",
|
||||
"Duo Kill Count",
|
||||
"Duo Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Rex Matriarchs": [
|
||||
"Kill Count",
|
||||
"Spooned Log"
|
||||
],
|
||||
"The Sanctum Guardian": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Group Kill Count",
|
||||
"Group Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Seiryu the Azure Serpent": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Group Kill Count",
|
||||
"Group Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Solak": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Taraket the Necromancer": [
|
||||
"Solo Kill Count",
|
||||
"Solo Kill Time",
|
||||
"Group Kill Count",
|
||||
"Group Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Telos": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Enrage",
|
||||
"Spooned Log"
|
||||
],
|
||||
"The Twin Furies": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Hardmode Kill Count",
|
||||
"Hardmode Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"TzKal-Zuk": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Hardmode Kill Count",
|
||||
"Hardmode Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"TzTok-Jad": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Verak Lith": [
|
||||
"Solo Kill Count",
|
||||
"Solo Kill Time",
|
||||
"Group Kill Count",
|
||||
"Group Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Vindicta & Gorvek": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Hardmode Kill Count",
|
||||
"Hardmode Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Vorago": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Hardmode Kill Count",
|
||||
"Hardmode Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Yakamaru": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Zamorak, Lord of Chaos (solo)": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Enrage",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Zamorak, Lord of Chaos (group)": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Enrage"
|
||||
]
|
||||
},
|
||||
"categories": {
|
||||
"Duo Kill Count": {
|
||||
"ascending": false,
|
||||
"is_time_record": false
|
||||
},
|
||||
"Duo Kill Time": {
|
||||
"ascending": true,
|
||||
"is_time_record": true
|
||||
},
|
||||
"Enrage": {
|
||||
"ascending": false,
|
||||
"is_time_record": false
|
||||
},
|
||||
"Group Kill Count": {
|
||||
"ascending": false,
|
||||
"is_time_record": false
|
||||
},
|
||||
"Group Kill Time": {
|
||||
"ascending": true,
|
||||
"is_time_record": true
|
||||
},
|
||||
"Hardmode Kill Count": {
|
||||
"ascending": false,
|
||||
"is_time_record": false
|
||||
},
|
||||
"Hardmode Kill Time": {
|
||||
"ascending": true,
|
||||
"is_time_record": true
|
||||
},
|
||||
"Kill Count": {
|
||||
"hardmode": true,
|
||||
"ascending": false,
|
||||
"is_time_record": false
|
||||
},
|
||||
"Kill Time": {
|
||||
"hardmode": true,
|
||||
"ascending": true,
|
||||
"is_time_record": true
|
||||
},
|
||||
"Solo Kill Count": {
|
||||
"ascending": false,
|
||||
"is_time_record": false
|
||||
},
|
||||
"Solo Kill Time": {
|
||||
"ascending": true,
|
||||
"is_time_record": true
|
||||
},
|
||||
"Spooned Log": {
|
||||
"hardmode": false,
|
||||
"ascending": true,
|
||||
"is_time_record": false
|
||||
}
|
||||
|
||||
+3
-4
@@ -11,7 +11,7 @@ from nextcord.ext import commands
|
||||
import config
|
||||
from utilities.data_storage import open_highscores_config
|
||||
from utilities.data_storage import open_highscores_data
|
||||
from utilities.data_storage import open_message_map
|
||||
from utilities.data_storage import create_message_map
|
||||
|
||||
logger = logging.getLogger("nextcord")
|
||||
logger.setLevel(logging.DEBUG)
|
||||
@@ -22,9 +22,9 @@ logger.addHandler(handler)
|
||||
|
||||
highscores_config = open_highscores_config()
|
||||
highscores_data = open_highscores_data()
|
||||
highscores_message_map = open_message_map()
|
||||
highscores_message_map = create_message_map(highscores_data)
|
||||
|
||||
submission_messages: dict = {}
|
||||
submission_objects: dict = {}
|
||||
|
||||
|
||||
def main():
|
||||
@@ -35,7 +35,6 @@ def main():
|
||||
|
||||
# Required in order to read messages (eg. prefix commands)
|
||||
intents.message_content = True # pylint: disable=assigning-non-slot
|
||||
intents.messages = True # pylint: disable=assigning-non-slot
|
||||
|
||||
# To enable the guilds priveleged intent:
|
||||
# intents.guilds = True
|
||||
|
||||
+43
-39
@@ -5,7 +5,46 @@ import json
|
||||
|
||||
HIGHSCORES_CONFIG_FILE = "highscores_config.json"
|
||||
HIGHSCORES_DATA_FILE = "highscores_data.json"
|
||||
HIGHSCORES_MESSAGE_MAP_FILE = "highscores_message_map.json"
|
||||
|
||||
|
||||
def create_highscore_skeleton() -> dict:
|
||||
"""
|
||||
Creates a skeleton entry for new highscores data
|
||||
|
||||
@return: dict skeleton entry
|
||||
"""
|
||||
# create the dict
|
||||
skeleton = {"highscore_channel_id": -1, "verification_channel_id": -1, "username_length": 12}
|
||||
config: dict = open_highscores_config()
|
||||
skeleton["tables"] = {}
|
||||
for boss, categories in config["tables"].items():
|
||||
skeleton["tables"][boss] = {"message_id": 0}
|
||||
boss_categories = {}
|
||||
for category in categories:
|
||||
rank_list = []
|
||||
boss_categories[category] = rank_list
|
||||
skeleton["tables"][boss]["categories"] = boss_categories
|
||||
|
||||
return skeleton
|
||||
|
||||
|
||||
def create_message_map(data: dict):
|
||||
"""
|
||||
Creates a message map from input highscores data.
|
||||
|
||||
@param data: highscores_data dict to create map from.
|
||||
@return: dict message_map of message to boss.
|
||||
"""
|
||||
|
||||
message_map = {}
|
||||
|
||||
# guild id will be a string. Json object keys are strings.
|
||||
for guild, guild_scores in data.items():
|
||||
message_map[guild] = {}
|
||||
for boss, info in guild_scores["tables"].items():
|
||||
message_map[guild][info["message_id"]] = boss
|
||||
|
||||
return message_map
|
||||
|
||||
|
||||
def open_highscores_config():
|
||||
@@ -20,56 +59,21 @@ def open_highscores_config():
|
||||
|
||||
def open_highscores_data():
|
||||
"""
|
||||
Opens a highscores_data.json file if one exists, otherwise creates a skeleton of the data.
|
||||
Opens a highscores_data.json file if one exists, otherwise returns empty dict.
|
||||
@return: dict of highscores data.
|
||||
"""
|
||||
if os.path.exists(HIGHSCORES_DATA_FILE):
|
||||
with open(HIGHSCORES_DATA_FILE, encoding="utf-8", mode="r") as file:
|
||||
data = json.load(file)
|
||||
else:
|
||||
# create the json object
|
||||
data = {"highscore_channel_id": -1, "verification_channel_id": -1}
|
||||
config = open_highscores_config()
|
||||
for boss in config["bosses"]:
|
||||
data[boss["boss"]] = {"message_id": 0}
|
||||
boss_categories = {}
|
||||
for key, value in config["categories"].items():
|
||||
rank_list = []
|
||||
boss_categories[key] = rank_list
|
||||
if boss["hardmode"] and value["hardmode"]:
|
||||
rank_list = []
|
||||
boss_categories["Hardmode " + key] = rank_list
|
||||
data[boss["boss"]]["categories"] = boss_categories
|
||||
data = {}
|
||||
return data
|
||||
|
||||
|
||||
def open_message_map():
|
||||
"""
|
||||
Opens a highscore_message_map.json file if one exists. Otherwise returns empty dict.
|
||||
@return: dict message_map of message to boss.
|
||||
"""
|
||||
if os.path.exists(HIGHSCORES_MESSAGE_MAP_FILE):
|
||||
with open(HIGHSCORES_MESSAGE_MAP_FILE, encoding="utf-8", mode="r") as file:
|
||||
message_map = json.load(file)
|
||||
else:
|
||||
# create the json object
|
||||
message_map = {}
|
||||
return message_map
|
||||
|
||||
|
||||
def save_highscores_data(data):
|
||||
def save_highscores_data(data: dict):
|
||||
"""
|
||||
Saves the highscores data dict into a json file.
|
||||
@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))
|
||||
|
||||
|
||||
def save_message_map(message_map):
|
||||
"""
|
||||
Saves the highscores message mao data dict into a json file.
|
||||
@param map: dict map of message to boss.
|
||||
"""
|
||||
with open(HIGHSCORES_MESSAGE_MAP_FILE, encoding="utf-8", mode="w") as file:
|
||||
file.write(json.dumps(message_map, indent=4))
|
||||
|
||||
+47
-35
@@ -7,21 +7,21 @@ from highscores import highscores_config # pylint: disable=import-error
|
||||
from highscores import highscores_data # pylint: disable=import-error
|
||||
from highscores import highscores_message_map # pylint: disable=import-error
|
||||
from utilities.data_storage import save_highscores_data # pylint: disable=import-error
|
||||
from utilities.data_storage import save_message_map # pylint: disable=import-error
|
||||
|
||||
|
||||
def format_highscore_message(boss_name: str):
|
||||
def format_highscore_message(boss_name: str, guild_data: dict):
|
||||
"""
|
||||
returns a formatted string for a boss's highscore
|
||||
@param boss: the dictionary object for the boss
|
||||
@param guild_data: the guild's highscore data
|
||||
@return the formatted string
|
||||
"""
|
||||
ret_string = f"**{boss_name}**\n```"
|
||||
boss_data = highscores_data[boss_name]
|
||||
boss_data = guild_data["tables"][boss_name]
|
||||
|
||||
# Gather all categories and add to string
|
||||
for key, value in boss_data["categories"].items():
|
||||
ret_string += f"{key}".ljust(25, " ")
|
||||
ret_string += f"{key}".ljust(26, " ")
|
||||
ret_string += "\n"
|
||||
|
||||
highscore_size = highscores_config["highscore_size"]
|
||||
@@ -30,25 +30,43 @@ def format_highscore_message(boss_name: str):
|
||||
for i in range(highscore_size):
|
||||
for key, value in boss_data["categories"].items():
|
||||
if len(value) > i:
|
||||
score = value[i]
|
||||
ret_string += f"{i+1}: {score[0]} - {score[1]}".ljust(25, " ")
|
||||
score_pair = value[i]
|
||||
|
||||
# pad username to max length.
|
||||
username: str = score_pair[0].ljust(guild_data["username_length"], " ")
|
||||
score: str = str(score_pair[1])
|
||||
|
||||
# pad score to correct length
|
||||
# MM:SS.ms is 7 characters long
|
||||
if highscores_config["categories"][key]["is_time_record"]:
|
||||
# if there are single digit minutes, add a space for formatting.
|
||||
if score.find(":") and len(score.split(":", maxsplit=1)[0]) < 2:
|
||||
score = " " + score
|
||||
else:
|
||||
ret_string += f"{i+1}: submit your score".ljust(25, " ")
|
||||
score = score.rjust(7, " ")
|
||||
|
||||
ret_string += f"{i+1}: {username} - {score}".ljust(26, " ")
|
||||
else:
|
||||
ret_string += f"{i+1}: submit your score".ljust(26, " ")
|
||||
ret_string += "\n"
|
||||
|
||||
return ret_string + "```"
|
||||
|
||||
|
||||
async def send_highscore_message(channel, boss_name: str) -> nextcord.Message:
|
||||
async def send_highscore_message(
|
||||
channel: nextcord.TextChannel, boss_name: str, guild_data: dict
|
||||
) -> nextcord.Message:
|
||||
"""
|
||||
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
|
||||
@param guild_data: the guild's highscore data
|
||||
@return: The nextcord message
|
||||
"""
|
||||
highscore_string = format_highscore_message(boss_name)
|
||||
highscore_string = format_highscore_message(boss_name, guild_data)
|
||||
|
||||
message_id = highscores_data[boss_name]["message_id"]
|
||||
message_id = guild_data["tables"][boss_name]["message_id"]
|
||||
try:
|
||||
message: nextcord.Message = await channel.fetch_message(message_id)
|
||||
await message.edit(content=highscore_string)
|
||||
@@ -56,10 +74,14 @@ async def send_highscore_message(channel, boss_name: str) -> nextcord.Message:
|
||||
# message doesn't exist.
|
||||
message: nextcord.Message = await channel.send(highscore_string)
|
||||
message_id = message.id
|
||||
highscores_data[boss_name]["message_id"] = message_id
|
||||
guild_data["tables"][boss_name]["message_id"] = message_id
|
||||
# save message -> boss_name in message_map
|
||||
highscores_message_map[str(message_id)] = boss_name
|
||||
save_message_map(highscores_message_map)
|
||||
# get guild id from channel
|
||||
# channel should come from the guild that is requesting this highscores message anyways.
|
||||
# check if guild is in message map already
|
||||
if not str(channel.guild.id) in highscores_message_map:
|
||||
highscores_message_map[str(channel.guild.id)] = {}
|
||||
highscores_message_map[str(channel.guild.id)][message_id] = boss_name
|
||||
|
||||
return message
|
||||
|
||||
@@ -74,24 +96,13 @@ async def submit_score(
|
||||
@param user: user who submitted score
|
||||
@param score: score to add
|
||||
"""
|
||||
# TODO update user submission to not have dupe users
|
||||
|
||||
# hardmode category, must have different category variable for config access.
|
||||
if category.find("Hardmode ") != -1:
|
||||
config_category = category.replace("Hardmode ", "")
|
||||
else:
|
||||
config_category = category
|
||||
|
||||
# capping to 12 characters because runescape names are 12 characters long.
|
||||
# Splitting on pipe. My discord has multiple names on account split by pipe.
|
||||
user = user.split("|")[0][:12]
|
||||
|
||||
# strip leading zeros and colon from score
|
||||
score = score.lstrip("0:")
|
||||
boss_category_config = highscores_config["categories"][category]
|
||||
guild_data = highscores_data[str(interaction.guild.id)]
|
||||
|
||||
# create score tuple for either time or int
|
||||
# define sort index
|
||||
if highscores_config["categories"][config_category]["is_time_record"]:
|
||||
if boss_category_config["is_time_record"]:
|
||||
if score.find(":") == -1:
|
||||
score_seconds = float(score)
|
||||
else:
|
||||
@@ -105,7 +116,7 @@ async def submit_score(
|
||||
score_tuple = (user, int(score))
|
||||
sort_index = 1
|
||||
|
||||
scores: "list[tuple]" = highscores_data[boss_name]["categories"][category]
|
||||
scores: "list[tuple]" = guild_data["tables"][boss_name]["categories"][category]
|
||||
|
||||
# if user is in an existing tuple, delete it.
|
||||
users_scores: "list[tuple]" = [score_tuple]
|
||||
@@ -117,7 +128,7 @@ async def submit_score(
|
||||
# sort users_scores
|
||||
users_scores.sort(
|
||||
key=lambda x: x[sort_index],
|
||||
reverse=not highscores_config["categories"][config_category]["ascending"],
|
||||
reverse=not boss_category_config["ascending"],
|
||||
)
|
||||
|
||||
for index, tup in enumerate(users_scores):
|
||||
@@ -133,24 +144,25 @@ async def submit_score(
|
||||
# sort scores.
|
||||
scores.sort(
|
||||
key=lambda x: x[sort_index],
|
||||
reverse=not highscores_config["categories"][config_category]["ascending"],
|
||||
reverse=not boss_category_config["ascending"],
|
||||
)
|
||||
|
||||
# enforce highscore size
|
||||
while len(scores) > highscores_config["highscore_size"]:
|
||||
scores.pop()
|
||||
highscores_data[boss_name]["categories"][category] = scores
|
||||
guild_data["tables"][boss_name]["categories"][category] = scores
|
||||
|
||||
# edit message
|
||||
highscore_channel_id = highscores_data["highscore_channel_id"]
|
||||
highscore_channel_id = guild_data["highscore_channel_id"]
|
||||
print(f"Editting message {highscore_channel_id}")
|
||||
channel = interaction.guild.get_channel(highscore_channel_id)
|
||||
|
||||
error_response = 'Registered Highscores channel does not exist or was never registered. \
|
||||
Register with "?register" command.'
|
||||
error_response = "Registered Highscores channel does not exist or was never registered."
|
||||
error_response += 'Register with "?register" command.'
|
||||
assert channel is not None, await interaction.send(error_response, ephemeral=True)
|
||||
|
||||
await send_highscore_message(channel, boss_name)
|
||||
await send_highscore_message(channel, boss_name, guild_data)
|
||||
|
||||
# save data
|
||||
highscores_data[str(interaction.guild.id)] = guild_data
|
||||
save_highscores_data(highscores_data)
|
||||
|
||||
Reference in New Issue
Block a user