Skip to content

Add tag alias resync workflow and status API #142

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

Open
biast12 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add tag alias resync workflow and status API #142

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
28 changes: 4 additions & 24 deletions backend/app/http/endpoints/api/admin/utilities/recreatemain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package utilities

import (
"context"
"fmt"
"net/http"
"strings"

Expand All @@ -14,6 +13,7 @@ import (
"github.com/ticketsbot-cloud/dashboard/backend/botcontext"
"github.com/ticketsbot-cloud/dashboard/backend/config"
"github.com/ticketsbot-cloud/dashboard/backend/database"
"github.com/ticketsbot-cloud/dashboard/backend/internal/tagalias"
"github.com/ticketsbot-cloud/dashboard/backend/utils"
)

Expand Down Expand Up @@ -66,7 +66,7 @@ func RecreateMainCommands() func(*gin.Context) {
return
}

adminCommands = append(adminCommands, tagAliasCommands(tags)...)
adminCommands = append(adminCommands, tagalias.Commands(tags)...)

existing, err := rest.GetGuildCommands(context.Background(), config.Conf.Bot.Token, botCtx.RateLimiter, config.Conf.Bot.Id, adminGuildId)
if err != nil {
Expand Down Expand Up @@ -101,25 +101,6 @@ func RecreateMainCommands() func(*gin.Context) {
}
}

// Must match what CreateTag registers when an alias is first enabled.
func tagAliasCommands(tags map[string]dbmodel.Tag) []rest.CreateCommandData {
commands := make([]rest.CreateCommandData, 0, len(tags))
for _, tag := range tags {
if tag.ApplicationCommandId == nil {
continue
}

commands = append(commands, rest.CreateCommandData{
Name: tag.Id,
Description: fmt.Sprintf("Alias for /tag %s", tag.Id),
Options: nil,
Type: interaction.ApplicationCommandTypeChatInput,
})
}

return commands
}

// Carries over commands this endpoint did not build, which the overwrite would otherwise delete.
func mergeExisting(existing []interaction.ApplicationCommand, target []rest.CreateCommandData) []rest.CreateCommandData {
for _, cmd := range existing {
Expand Down Expand Up @@ -158,15 +139,14 @@ func reconcileTagAliasIds(
tags map[string]dbmodel.Tag,
registered []interaction.ApplicationCommand,
) error {
query := `UPDATE tags SET "application_command_id" = $1 WHERE "guild_id" = $2 AND LOWER("tag_id") = LOWER($3);`

for _, cmd := range registered {
tag, ok := tags[strings.ToLower(cmd.Name)]
if !ok || tag.ApplicationCommandId == nil || *tag.ApplicationCommandId == cmd.Id {
continue
}

if _, err := database.Client.Tag.Exec(ctx, query, cmd.Id, guildId, tag.Id); err != nil {
commandId := cmd.Id
if _, err := tagalias.SetCommandId(ctx, guildId, tag.Id, &commandId); err != nil {
return err
}
}
Expand Down
Loading
Loading