Compare commits
9
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
dd4bee73c6 | ||
|
|
d21683fb59 | ||
|
|
44b3d7a80b | ||
|
|
af5017c95d | ||
|
|
3087c6bc39 | ||
|
|
cf0ef96edc | ||
|
|
9ba37c22bb | ||
|
|
8eeda14119 | ||
|
|
82f47ac136 |
@@ -10,7 +10,9 @@ class VerificationView(nextcord.ui.View):
|
|||||||
def __init__(self):
|
def __init__(self):
|
||||||
super().__init__(timeout=None)
|
super().__init__(timeout=None)
|
||||||
|
|
||||||
@nextcord.ui.button(label="Approve", style=nextcord.ButtonStyle.green, custom_id="approve")
|
@nextcord.ui.button(
|
||||||
|
label="Approve", style=nextcord.ButtonStyle.green, custom_id="approve-score-command"
|
||||||
|
)
|
||||||
async def approve_button(
|
async def approve_button(
|
||||||
self, button: nextcord.ui.Button, interaction: nextcord.Interaction
|
self, button: nextcord.ui.Button, interaction: nextcord.Interaction
|
||||||
): # pylint: disable=unused-argument
|
): # pylint: disable=unused-argument
|
||||||
@@ -28,7 +30,9 @@ class VerificationView(nextcord.ui.View):
|
|||||||
files=[await attch.to_file() for attch in interaction.message.attachments],
|
files=[await attch.to_file() for attch in interaction.message.attachments],
|
||||||
)
|
)
|
||||||
|
|
||||||
@nextcord.ui.button(label="Deny", style=nextcord.ButtonStyle.red, custom_id="deny")
|
@nextcord.ui.button(
|
||||||
|
label="Deny", style=nextcord.ButtonStyle.red, custom_id="deny-score-command"
|
||||||
|
)
|
||||||
async def deny_button(
|
async def deny_button(
|
||||||
self, button: nextcord.ui.Button, interaction: nextcord.Interaction
|
self, button: nextcord.ui.Button, interaction: nextcord.Interaction
|
||||||
): # pylint: disable=unused-argument
|
): # pylint: disable=unused-argument
|
||||||
|
|||||||
@@ -10,7 +10,9 @@ class VerificationView(nextcord.ui.View):
|
|||||||
def __init__(self):
|
def __init__(self):
|
||||||
super().__init__(timeout=None)
|
super().__init__(timeout=None)
|
||||||
|
|
||||||
@nextcord.ui.button(label="Approve", style=nextcord.ButtonStyle.green, custom_id="approve")
|
@nextcord.ui.button(
|
||||||
|
label="Approve", style=nextcord.ButtonStyle.green, custom_id="approve-button-submission"
|
||||||
|
)
|
||||||
async def approve_button(
|
async def approve_button(
|
||||||
self, button: nextcord.ui.Button, interaction: nextcord.Interaction
|
self, button: nextcord.ui.Button, interaction: nextcord.Interaction
|
||||||
): # pylint: disable=unused-argument
|
): # pylint: disable=unused-argument
|
||||||
@@ -29,12 +31,14 @@ class VerificationView(nextcord.ui.View):
|
|||||||
|
|
||||||
try:
|
try:
|
||||||
await submit_score(interaction, user, boss_name, category, score)
|
await submit_score(interaction, user, boss_name, category, score)
|
||||||
await interaction.message.edit("Approved.", view=None)
|
await interaction.message.edit(f"Approved by <@{interaction.user.id}>.", view=None)
|
||||||
except UnboundLocalError:
|
except UnboundLocalError:
|
||||||
await interaction.send("Instruct user to submit with all fields.")
|
await interaction.send("Instruct user to submit with all fields.")
|
||||||
await interaction.message.edit(view=None)
|
await interaction.message.edit(view=None)
|
||||||
|
|
||||||
@nextcord.ui.button(label="Deny", style=nextcord.ButtonStyle.red, custom_id="deny")
|
@nextcord.ui.button(
|
||||||
|
label="Deny", style=nextcord.ButtonStyle.red, custom_id="deny-button-submission"
|
||||||
|
)
|
||||||
async def deny_button(
|
async def deny_button(
|
||||||
self, button: nextcord.ui.Button, interaction: nextcord.Interaction
|
self, button: nextcord.ui.Button, interaction: nextcord.Interaction
|
||||||
): # pylint: disable=unused-argument
|
): # pylint: disable=unused-argument
|
||||||
|
|||||||
+30
-4
@@ -83,7 +83,11 @@ async def submit_score(
|
|||||||
config_category = category
|
config_category = category
|
||||||
|
|
||||||
# capping to 12 characters because runescape names are 12 characters long.
|
# capping to 12 characters because runescape names are 12 characters long.
|
||||||
user = user[:12]
|
# 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:")
|
||||||
|
|
||||||
# create score tuple for either time or int
|
# create score tuple for either time or int
|
||||||
# define sort index
|
# define sort index
|
||||||
@@ -101,8 +105,30 @@ async def submit_score(
|
|||||||
score_tuple = (user, int(score))
|
score_tuple = (user, int(score))
|
||||||
sort_index = 1
|
sort_index = 1
|
||||||
|
|
||||||
scores = highscores_data[boss_name]["categories"][category]
|
scores: "list[tuple]" = highscores_data[boss_name]["categories"][category]
|
||||||
scores.append(score_tuple)
|
|
||||||
|
# if user is in an existing tuple, delete it.
|
||||||
|
users_scores: "list[tuple]" = [score_tuple]
|
||||||
|
for tup in scores:
|
||||||
|
if user == tup[0]:
|
||||||
|
# Add tup to users_scores, remove from scores
|
||||||
|
users_scores.append(tup)
|
||||||
|
|
||||||
|
# sort users_scores
|
||||||
|
users_scores.sort(
|
||||||
|
key=lambda x: x[sort_index],
|
||||||
|
reverse=not highscores_config["categories"][config_category]["ascending"],
|
||||||
|
)
|
||||||
|
|
||||||
|
for index, tup in enumerate(users_scores):
|
||||||
|
if index == 0:
|
||||||
|
# first score is the best score.
|
||||||
|
if tup not in scores:
|
||||||
|
scores.append(tup)
|
||||||
|
else:
|
||||||
|
# discard all other scores from scores list.
|
||||||
|
if tup in scores:
|
||||||
|
scores.remove(tup)
|
||||||
|
|
||||||
# sort scores.
|
# sort scores.
|
||||||
scores.sort(
|
scores.sort(
|
||||||
@@ -122,7 +148,7 @@ async def submit_score(
|
|||||||
|
|
||||||
error_response = 'Registered Highscores channel does not exist or was never registered. \
|
error_response = 'Registered Highscores channel does not exist or was never registered. \
|
||||||
Register with "?register" command.'
|
Register with "?register" command.'
|
||||||
assert channel is not None, await interaction.send(error_response)
|
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)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user