Skip to content

Commit

Permalink
Economy Settings Update
Browse files Browse the repository at this point in the history
  • Loading branch information
@dkoz
dkoz committed Nov 17, 2024
1 parent d365026 commit ee9f15a
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 18 deletions.
18 changes: 11 additions & 7 deletions cogs/economy/manage.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
EconomySettingsModal,
TimerSettingsModal,
EtcEconomySettingsModal,
VoteSettingsModal
VoteSettingsModal,
fetch_economy_settings
)
from utils.translations import t
from utils.errorhandling import restrict_command
Expand Down Expand Up @@ -174,19 +175,20 @@ async def help(self, interaction: nextcord.Interaction):
@restrict_command()
async def economy_settings(self, interaction: nextcord.Interaction):
try:
modal = EconomySettingsModal()
settings = await fetch_economy_settings()
modal = EconomySettingsModal(settings)
await interaction.response.send_modal(modal)
except Exception as e:
await interaction.response.send_message(f"Unexpected error: {e}", ephemeral=True)

# Timer settings

@economyset.subcommand(
name="timers", description=t("EconomyManageCog", "economyset.timers.description")
)
@restrict_command()
async def timer_settings(self, interaction: nextcord.Interaction):
try:
modal = TimerSettingsModal()
settings = await fetch_economy_settings()
modal = TimerSettingsModal(settings)
await interaction.response.send_modal(modal)
except Exception as e:
await interaction.response.send_message(f"Unexpected error: {e}", ephemeral=True)
Expand All @@ -197,7 +199,8 @@ async def timer_settings(self, interaction: nextcord.Interaction):
@restrict_command()
async def etc_settings(self, interaction: nextcord.Interaction):
try:
modal = EtcEconomySettingsModal()
settings = await fetch_economy_settings()
modal = EtcEconomySettingsModal(settings)
await interaction.response.send_modal(modal)
except Exception as e:
await interaction.response.send_message(f"Unexpected error: {e}", ephemeral=True)
Expand All @@ -208,7 +211,8 @@ async def etc_settings(self, interaction: nextcord.Interaction):
@restrict_command()
async def vote_settings(self, interaction: nextcord.Interaction):
try:
modal = VoteSettingsModal()
settings = await fetch_economy_settings()
modal = VoteSettingsModal(settings)
await interaction.response.send_modal(modal)
except Exception as e:
await interaction.response.send_message(f"Unexpected error: {e}", ephemeral=True)
Expand Down
50 changes: 39 additions & 11 deletions utils/modals.py
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,24 @@
import nextcord
from nextcord import ui, Interaction
from utils.database import add_server, update_economy_setting
from utils.database import add_server, update_economy_setting, get_economy_setting
from utils.translations import t

async def fetch_economy_settings():
return {
"currency_name": await get_economy_setting("currency_name") or "",
"invite_reward": await get_economy_setting("invite_reward") or "0",
"work_reward_min": await get_economy_setting("work_reward_min") or "0",
"work_reward_max": await get_economy_setting("work_reward_max") or "0",
"daily_reward": await get_economy_setting("daily_reward") or "0",
"work_timer": await get_economy_setting("work_timer") or "0",
"daily_timer": await get_economy_setting("daily_timer") or "0",
"work_description": await get_economy_setting("work_description") or "",
"role_bonuses": await get_economy_setting("role_bonuses") or "",
"vote_slug": await get_economy_setting("vote_slug") or "",
"vote_apikey": await get_economy_setting("vote_apikey") or "",
"vote_reward": await get_economy_setting("vote_reward") or "0",
}

class AddServerModal(ui.Modal):
def __init__(self):
super().__init__(title=t("Modals", "addserver.title"))
Expand Down Expand Up @@ -52,29 +68,34 @@ async def callback(self, interaction: Interaction):
t("Modals", "addserver.success").format(server_name=self.server_name.value),
ephemeral=True
)

class EconomySettingsModal(ui.Modal):
def __init__(self):
def __init__(self, settings):
super().__init__(title=t("Modals", "economysettings.title"))

self.currency_name = ui.TextInput(
label=t("Modals", "economysettings.currency_name.label"),
default_value=settings["currency_name"],
placeholder=t("Modals", "economysettings.currency_name.placeholder")
)
self.invite_reward = ui.TextInput(
label=t("Modals", "economysettings.invite_reward.label"),
default_value=settings["invite_reward"],
placeholder=t("Modals", "economysettings.invite_reward.placeholder")
)
self.work_reward_min = ui.TextInput(
label=t("Modals", "economysettings.work_reward_min.label"),
default_value=settings["work_reward_min"],
placeholder=t("Modals", "economysettings.work_reward_min.placeholder")
)
self.work_reward_max = ui.TextInput(
label=t("Modals", "economysettings.work_reward_max.label"),
default_value=settings["work_reward_max"],
placeholder=t("Modals", "economysettings.work_reward_max.placeholder")
)
self.daily_reward = ui.TextInput(
label=t("Modals", "economysettings.daily_reward.label"),
default_value=settings["daily_reward"],
placeholder=t("Modals", "economysettings.daily_reward.placeholder")
)

Expand All @@ -100,16 +121,18 @@ async def callback(self, interaction: Interaction):
t("Modals", "economysettings.error").format(error=e),
ephemeral=True
)

class TimerSettingsModal(ui.Modal):
def __init__(self):
def __init__(self, settings):
super().__init__(title=t("Modals", "timersettings.title"))
self.work_timer = ui.TextInput(
label=t("Modals", "timersettings.work_timer.label"),
default_value=settings["work_timer"],
placeholder=t("Modals", "timersettings.work_timer.placeholder")
)
self.daily_timer = ui.TextInput(
label=t("Modals", "timersettings.daily_timer.label"),
default_value=settings["daily_timer"],
placeholder=t("Modals", "timersettings.daily_timer.placeholder")
)

Expand All @@ -131,16 +154,18 @@ async def callback(self, interaction: Interaction):
)

class EtcEconomySettingsModal(ui.Modal):
def __init__(self):
def __init__(self, settings):
super().__init__(title=t("Modals", "etceconomysettings.title"))

self.work_description = ui.TextInput(
label=t("Modals", "etceconomysettings.work_description.label"),
default_value=settings["work_description"],
placeholder=t("Modals", "etceconomysettings.work_description.placeholder"),
style=nextcord.TextInputStyle.paragraph
)
self.role_bonuses = ui.TextInput(
label=t("Modals", "etceconomysettings.role_bonuses.label"),
default_value=settings["role_bonuses"],
placeholder=t("Modals", "etceconomysettings.role_bonuses.placeholder"),
style=nextcord.TextInputStyle.paragraph
)
Expand All @@ -164,21 +189,24 @@ async def callback(self, interaction: Interaction):
)

class VoteSettingsModal(ui.Modal):
def __init__(self):
def __init__(self, settings):
super().__init__(title=t("Modals", "etceconomysettings.title"))

self.vote_slug = ui.TextInput(
label=t("Modals", "etceconomysettings.vote_slug.label"),
default_value=settings["vote_slug"],
placeholder=t("Modals", "etceconomysettings.vote_slug.placeholder"),
required=False
)
self.vote_apikey = ui.TextInput(
label=t("Modals", "etceconomysettings.vote_apikey.label"),
default_value=settings["vote_apikey"],
placeholder=t("Modals", "etceconomysettings.vote_apikey.placeholder"),
required=False
)
self.vote_reward = ui.TextInput(
label=t("Modals", "etceconomysettings.vote_reward.label"),
default_value=settings["vote_reward"],
placeholder=t("Modals", "etceconomysettings.vote_reward.placeholder"),
required=False
)
Expand All @@ -200,4 +228,4 @@ async def callback(self, interaction: Interaction):
await interaction.response.send_message(
t("Modals", "etceconomysettings.error").format(error=e),
ephemeral=True
)
)

0 comments on commit ee9f15a

Please sign in to comment.