Skip to content

more consistent command #189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Cufee merged 1 commit into from
Mar 21, 2026
Merged

more consistent command #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
129 changes: 69 additions & 60 deletions cmd/discord/commands/public/theme.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,57 +31,90 @@ func init() {
Ephemeral().
Params(builder.SetNameKey("command_theme_name"), builder.SetDescKey("command_theme_description")).
Options(
builder.NewOption("select", discordgo.ApplicationCommandOptionString).
builder.NewOption("select", discordgo.ApplicationCommandOptionSubCommand).
Params(builder.SetNameKey("command_theme_option_select_name"), builder.SetDescKey("command_theme_option_select_description")).
Choices(buildThemeChoices()...),
builder.NewOption("clear", discordgo.ApplicationCommandOptionBoolean).
Options(
builder.NewOption("theme", discordgo.ApplicationCommandOptionString).
Choices(buildThemeChoices()...),
),
builder.NewOption("clear", discordgo.ApplicationCommandOptionSubCommand).
Params(builder.SetNameKey("command_theme_option_clear_name"), builder.SetDescKey("command_theme_option_clear_description")),
).
Handler(func(ctx common.Context) error {
if clear, ok := common.GetOption[bool](ctx.Options(), "clear"); ok && clear {
existing, err := ctx.Core().Database().GetUserContentFromRef(ctx.Ctx(), ctx.User().ID, models.UserContentTypeThemePreference)
if err != nil && !database.IsNotFound(err) {
return ctx.Err(err, common.ApplicationError)
subcommand, subOptions, _ := ctx.Options().Subcommand()
switch subcommand {
default:
return ctx.Reply().Send("command_theme_current_fmt")

case "select":
selected, hasSelection := common.GetOption[string](subOptions, "theme")
if !hasSelection {
currentTheme, hasTheme := ctx.User().Content(models.UserContentTypeThemePreference)
var currentID string
if hasTheme {
currentID = string(currentTheme.Value)
} else {
currentID = "default"
}

ids := themes.AvailableThemes()
sort.Strings(ids)

var lines []string
for _, id := range ids {
name := ctx.Localize(fmt.Sprintf("command_theme_select_option_theme_choice_%s_name", id))
if name == "" {
name = id
}
if id == currentID {
lines = append(lines, "⬢ "+name)
} else {
lines = append(lines, "⬡ "+name)
}
}

return ctx.Reply().Format("command_theme_current_fmt", strings.Join(lines, "\n")).Send()
}
if !database.IsNotFound(err) {
err = ctx.Core().Database().DeleteUserContent(ctx.Ctx(), existing.ID)
if err != nil {

if selected == "default" {
existing, err := ctx.Core().Database().GetUserContentFromRef(ctx.Ctx(), ctx.User().ID, models.UserContentTypeThemePreference)
if err != nil && !database.IsNotFound(err) {
return ctx.Err(err, common.ApplicationError)
}
if !database.IsNotFound(err) {
err = ctx.Core().Database().DeleteUserContent(ctx.Ctx(), existing.ID)
if err != nil {
return ctx.Err(err, common.ApplicationError)
}
}
return ctx.Reply().Send("command_theme_reset_success")
}
return ctx.Reply().Send("command_theme_reset_success")
}

selected, hasSelection := common.GetOption[string](ctx.Options(), "select")
if !hasSelection {
currentTheme, hasTheme := ctx.User().Content(models.UserContentTypeThemePreference)
var currentID string
if hasTheme {
currentID = string(currentTheme.Value)
} else {
currentID = "default"
if _, ok := themes.GetTheme(selected); !ok {
return ctx.Reply().IsError(common.UserError).Send("command_theme_not_found")
}

ids := themes.AvailableThemes()
sort.Strings(ids)

var lines []string
for _, id := range ids {
name := ctx.Localize(fmt.Sprintf("command_theme_option_select_choice_%s_name", id))
if name == "" {
name = id
}
if id == currentID {
lines = append(lines, "⬢ "+name)
} else {
lines = append(lines, "⬡ "+name)
existing, err := ctx.Core().Database().GetUserContentFromRef(ctx.Ctx(), ctx.User().ID, models.UserContentTypeThemePreference)
if err != nil && !database.IsNotFound(err) {
return ctx.Err(err, common.ApplicationError)
}
if database.IsNotFound(err) {
existing = models.UserContent{
UserID: ctx.User().ID,
ReferenceID: ctx.User().ID,
}
}

return ctx.Reply().Format("command_theme_current_fmt", strings.Join(lines, "\n")).Send()
}
existing.Type = models.UserContentTypeThemePreference
existing.Value = []byte(selected)
_, err = ctx.Core().Database().UpsertUserContent(ctx.Ctx(), existing)
if err != nil {
return ctx.Err(err, common.ApplicationError)
}

return ctx.Reply().Format("command_theme_set_success_fmt", selected).Send()

if selected == "default" {
case "clear":
existing, err := ctx.Core().Database().GetUserContentFromRef(ctx.Ctx(), ctx.User().ID, models.UserContentTypeThemePreference)
if err != nil && !database.IsNotFound(err) {
return ctx.Err(err, common.ApplicationError)
Expand All @@ -94,30 +127,6 @@ func init() {
}
return ctx.Reply().Send("command_theme_reset_success")
}

if _, ok := themes.GetTheme(selected); !ok {
return ctx.Reply().IsError(common.UserError).Send("command_theme_not_found")
}

existing, err := ctx.Core().Database().GetUserContentFromRef(ctx.Ctx(), ctx.User().ID, models.UserContentTypeThemePreference)
if err != nil && !database.IsNotFound(err) {
return ctx.Err(err, common.ApplicationError)
}
if database.IsNotFound(err) {
existing = models.UserContent{
UserID: ctx.User().ID,
ReferenceID: ctx.User().ID,
}
}

existing.Type = models.UserContentTypeThemePreference
existing.Value = []byte(selected)
_, err = ctx.Core().Database().UpsertUserContent(ctx.Ctx(), existing)
if err != nil {
return ctx.Err(err, common.ApplicationError)
}

return ctx.Reply().Format("command_theme_set_success_fmt", selected).Send()
}),
)
}
8 changes: 5 additions & 3 deletions static/localization/en/discord.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,9 +242,11 @@ wargaming_error_private_account: "This account is marked private by Wargaming an
command_theme_name: "theme"
command_theme_description: "Change the visual theme of your stats images"
command_theme_option_select_name: "select"
command_theme_option_select_description: "Pick a theme to apply to your stats"
command_theme_option_select_choice_default_name: "Default"
command_theme_option_select_choice_spring2026_name: "Sakura Flutter"
command_theme_option_select_description: "Select a theme for your stats images"
command_theme_select_option_theme_name: "theme"
command_theme_select_option_theme_description: "Pick a theme to apply to your stats"
command_theme_select_option_theme_choice_default_name: "Default"
command_theme_select_option_theme_choice_spring2026_name: "Sakura Flutter"
command_theme_option_clear_name: "clear"
command_theme_option_clear_description: "Remove your current theme and go back to default"
command_theme_set_success_fmt: "Your theme has been updated to **%s**! It will be applied to your next stats image."
Expand Down
6 changes: 4 additions & 2 deletions static/localization/pl/discord.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,8 +243,10 @@ command_theme_name: "motyw"
command_theme_description: "Zmień motyw wizualny swoich obrazów statystyk"
command_theme_option_select_name: "wybierz"
command_theme_option_select_description: "Wybierz motyw do zastosowania w statystykach"
command_theme_option_select_choice_default_name: "Domyślny"
command_theme_option_select_choice_spring2026_name: "Sakura Flutter"
command_theme_select_option_theme_name: "motyw"
command_theme_select_option_theme_description: "Wybierz motyw do zastosowania w statystykach"
command_theme_select_option_theme_choice_default_name: "Domyślny"
command_theme_select_option_theme_choice_spring2026_name: "Sakura Flutter"
command_theme_option_clear_name: "wyczyść"
command_theme_option_clear_description: "Usuń aktualny motyw i wróć do domyślnego"
command_theme_set_success_fmt: "Twój motyw został zmieniony na **%s**! Zostanie zastosowany do następnego obrazu statystyk."
Expand Down
6 changes: 4 additions & 2 deletions static/localization/pt-BR/discord.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,8 +243,10 @@ command_theme_name: "tema"
command_theme_description: "Altere o tema visual das suas imagens de estatísticas"
command_theme_option_select_name: "selecionar"
command_theme_option_select_description: "Escolha um tema para aplicar às suas estatísticas"
command_theme_option_select_choice_default_name: "Padrão"
command_theme_option_select_choice_spring2026_name: "Sakura Flutter"
command_theme_select_option_theme_name: "tema"
command_theme_select_option_theme_description: "Escolha um tema para aplicar às suas estatísticas"
command_theme_select_option_theme_choice_default_name: "Padrão"
command_theme_select_option_theme_choice_spring2026_name: "Sakura Flutter"
command_theme_option_clear_name: "limpar"
command_theme_option_clear_description: "Remova seu tema atual e volte ao padrão"
command_theme_set_success_fmt: "Seu tema foi atualizado para **%s**! Ele será aplicado na sua próxima imagem de estatísticas."
Expand Down
Loading