diff --git a/handlers.go b/handlers.go index 5723d1f..e0c2823 100644 --- a/handlers.go +++ b/handlers.go @@ -1,7 +1,6 @@ package main import ( - "os" "slices" "strings" @@ -28,28 +27,30 @@ var commands []Command = []Command{cmd_tag, cmd_tag_short, context_tag /*, cmd_f func ready(e *events.Ready) { logrus.Info("Starting up...") - findAndDeleteUnusedMessages() + //findAndDeleteUnusedMessages() removeOldCommandFromAllGuilds() - var existingCommandNames []string - existingCommands, err := client.Rest().GetGlobalCommands(app.Bot.ID, false) - if err != nil { - logrus.Errorf("error fetching existing global commands: %v", err) - } else { - for _, existingCommand := range existingCommands { - existingCommandNames = append(existingCommandNames, existingCommand.Name()) - } - } - for _, command := range commands { - if !slices.Contains(existingCommandNames, command.Definition.Name) || slices.Contains(os.Args, "--update="+command.Definition.Name) || slices.Contains(os.Args, "--update=all") || slices.Contains(os.Args, "--clean") { - cmd, err := client.Rest().CreateGlobalCommand(app.Bot.ID, command.Definition) - if err != nil { - logrus.Errorf("error creating global command '%s': %v", cmd.Name(), err) - } else { - logrus.Infof("Added global command '%s'", cmd.Name()) + /* + var existingCommandNames []string + existingCommands, err := client.Rest().GetGlobalCommands(client.ApplicationID(), false) + if err != nil { + logrus.Errorf("error fetching existing global commands: %v", err) + } else { + for _, existingCommand := range existingCommands { + existingCommandNames = append(existingCommandNames, existingCommand.Name()) } } - } - logrus.Info("Successfully started the Bot!") + for _, command := range commands { + if !slices.Contains(existingCommandNames, command.Definition.Name) || slices.Contains(os.Args, "--update="+command.Definition.Name) || slices.Contains(os.Args, "--update=all") || slices.Contains(os.Args, "--clean") { + cmd, err := client.Rest().CreateGlobalCommand(client.ApplicationID(), command.Definition) + if err != nil { + logrus.Errorf("error creating global command '%s': %v", cmd.Name(), err) + } else { + logrus.Infof("Added global command '%s'", cmd.Name()) + } + } + } + logrus.Info("Successfully started the Bot!") + */ } func applicationCommandInteractionCreate(e *events.ApplicationCommandInteractionCreate) { @@ -137,7 +138,9 @@ func modalSubmitInteractionCreate(e *events.ModalSubmitInteractionCreate) { } func removeOldCommandFromAllGuilds() { + logrus.Debug(app.Bot.ID.String()) globalCommands, err := client.Rest().GetGlobalCommands(app.Bot.ID, false) + logrus.Debug("HERE") //doesnt get called if err != nil { logrus.Errorf("error fetching existing global commands: %v", err) return @@ -146,11 +149,10 @@ func removeOldCommandFromAllGuilds() { for _, command := range commands { commandNames = append(commandNames, command.Definition.Name) } - for _, existingCommand := range globalCommands { if slices.Contains(commandNames, existingCommand.Name()) { logrus.Infof("Deleting command '%s'", existingCommand.Name()) - err := client.Rest().DeleteGlobalCommand(app.Bot.ID, existingCommand.ID()) + err := client.Rest().DeleteGlobalCommand(client.ApplicationID(), existingCommand.ID()) if err != nil { logrus.Errorf("error deleting command %s: %v", existingCommand.Name(), err) } diff --git a/main.go b/main.go index b33c067..0dd620b 100644 --- a/main.go +++ b/main.go @@ -23,8 +23,8 @@ import ( ) var ( - app *discord.Application client bot.Client + app *discord.Application db *sql.DB ) @@ -47,13 +47,13 @@ func main() { ), ), bot.WithEventListenerFunc(ready), - bot.WithEventListenerFunc(applicationCommandInteractionCreate), - bot.WithEventListenerFunc(autocompleteInteractionCreate), - bot.WithEventListenerFunc(componentInteractionCreate), - bot.WithEventListenerFunc(modalSubmitInteractionCreate), - bot.WithEventListenerFunc(messageCreate), - bot.WithEventListenerFunc(messageDelete), - bot.WithEventListenerFunc(guildMemberJoin), + //bot.WithEventListenerFunc(applicationCommandInteractionCreate), + //bot.WithEventListenerFunc(autocompleteInteractionCreate), + //bot.WithEventListenerFunc(componentInteractionCreate), + //bot.WithEventListenerFunc(modalSubmitInteractionCreate), + //bot.WithEventListenerFunc(messageCreate), + //bot.WithEventListenerFunc(messageDelete), + //bot.WithEventListenerFunc(guildMemberJoin), ) if err != nil { logrus.Fatal("error creating Discord session,", err) @@ -66,7 +66,7 @@ func main() { logrus.Error("error opening connection,", err) return } - app, err := client.Rest().GetCurrentApplication() + app, err = client.Rest().GetCurrentApplication() if err != nil { logrus.Error(err) } diff --git a/tool.go b/tool.go index e40efcb..13ec791 100644 --- a/tool.go +++ b/tool.go @@ -102,7 +102,7 @@ func getModalByFormID(formID string) ModalJson { } func getHighestRole(guildID string) (*discord.Role, error) { - botmember, err := client.Rest().GetMember(snowflake.MustParse(guildID), app.Bot.ID) + botmember, err := client.Rest().GetMember(snowflake.MustParse(guildID), client.ApplicationID()) if err != nil { return nil, err }