diamondburned/arikawa
1
0
Fork 0
mirror of https://github.com/diamondburned/arikawa.git synced 2025-01-07 12:38:05 +00:00
Code Issues Releases Activity

Bot: Allow variadic functions to have empty trailing arguments

Browse source
This commit is contained in:
diamondburned (Forefront) 2020-05-03 21:22:19 -07:00
parent 6ece6e72ff
commit 4a14c4d059
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bot/ctx_call.go
View file

@ -277,6 +277,12 @@ func (ctx *Context) callMessageCreate(mc *gateway.MessageCreateEvent) error {
if argdelta := len(arguments) - len(cmd.Arguments); argdelta != 0 { if argdelta := len(arguments) - len(cmd.Arguments); argdelta != 0 {
var err error // no err if nil var err error // no err if nil
// If the function is variadic, then we can allow the last argument to
// be empty.
if cmd.Variadic {
argdelta++
}
switch { switch {
// If there aren't enough arguments given. // If there aren't enough arguments given.
case argdelta < 0: case argdelta < 0:

4
bot/ctx_plumb_test.go
View file

@ -20,9 +20,7 @@ func (h *hasPlumb) Normal(_ *gateway.MessageCreateEvent) error {
return nil return nil
} }
func (h *hasPlumb) PーPlumber( func (h *hasPlumb) PーPlumber(_ *gateway.MessageCreateEvent, c RawArguments) error {
_ *gateway.MessageCreateEvent, c Content) error {
h.Plumbed = string(c) h.Plumbed = string(c)
return nil return nil
} }

4
bot/ctx_test.go
View file

@ -214,9 +214,9 @@ func TestContext(t *testing.T) {
t.Run("call command custom trailing manual parser", func(t *testing.T) { t.Run("call command custom trailing manual parser", func(t *testing.T) {
ctx.HasPrefix = NewPrefix("!") ctx.HasPrefix = NewPrefix("!")
expects := []string{"arikawa"} expects := []string{}
if err := testReturn(expects, "!trailCustom hime arikawa"); err != nil { if err := testReturn(expects, "!trailCustom hime_arikawa"); err != nil {
t.Fatal("Unexpected call error:", err) t.Fatal("Unexpected call error:", err)
} }
}) })