diamondburned
/
arikawa
mirror of https://github.com/diamondburned/arikawa.git
1
0
Fork 0
Code Issues Releases Activity

cmdroute: Add ev.Data into {Command,Autocomplete}Data 

This mostly helps avoid a type assertion that could potentially be
incorrectly done.
This commit is contained in:
diamondburned 2023-08-31 23:42:35 -07:00
parent 5e0d1cfe4a
commit 4bc415f72b
No known key found for this signature in database
GPG Key ID: D78C4471CE776659
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/cmdroute/fntypes.go
View File

@ -38,6 +38,7 @@ type Middleware = func(next InteractionHandler) InteractionHandler
type CommandData struct { type CommandData struct {
discord.CommandInteractionOption discord.CommandInteractionOption
Event *discord.InteractionEvent Event *discord.InteractionEvent
Data *discord.CommandInteraction
} }
// CommandHandler is a slash command handler. // CommandHandler is a slash command handler.
@ -71,6 +72,7 @@ func (f CommandHandlerFunc) HandleCommand(ctx context.Context, data CommandData)
type AutocompleteData struct { type AutocompleteData struct {
discord.AutocompleteOption discord.AutocompleteOption
Event *discord.InteractionEvent Event *discord.InteractionEvent
Data *discord.AutocompleteInteraction
} }
// Autocompleter is a type for an autocompleter. // Autocompleter is a type for an autocompleter.

2
api/cmdroute/router.go
View File

@ -194,6 +194,7 @@ func (r *Router) callCommandHandler(ev *discord.InteractionEvent, found handlerD
data := found.handler.HandleCommand(ctx, CommandData{ data := found.handler.HandleCommand(ctx, CommandData{
CommandInteractionOption: found.data, CommandInteractionOption: found.data,
Event: ev, Event: ev,
Data: ev.Data.(*discord.CommandInteraction),
}) })
if data == nil { if data == nil {
return nil return nil
@ -299,6 +300,7 @@ func (r *Router) callAutocompletion(ev *discord.InteractionEvent, found autocomp
choices := found.handler.Autocomplete(ctx, AutocompleteData{ choices := found.handler.Autocomplete(ctx, AutocompleteData{
AutocompleteOption: found.data, AutocompleteOption: found.data,
Event: ev, Event: ev,
Data: ev.Data.(*discord.AutocompleteInteraction),
}) })
if choices == nil { if choices == nil {
return nil return nil