wayfinderak/disgoman
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change method of splitting cmd

Browse Source
This commit is contained in:
Dustin Pianalto 2020-09-01 20:10:28 -08:00
parent 12b47f1fed
commit 3151e1479a
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
command-manager.go
View File

@ -9,10 +9,10 @@ package disgoman
import ( import (
"errors" "errors"
"fmt" "fmt"
"regexp"
"strings" "strings"
"github.com/bwmarrin/discordgo" "github.com/bwmarrin/discordgo"
"github.com/kballard/go-shellquote"
) )
// AddCommand adds the Command at the address passed in to the Commands array on the CommandManager. // AddCommand adds the Command at the address passed in to the Commands array on the CommandManager.
@ -104,19 +104,11 @@ func (c *CommandManager) OnMessage(session *discordgo.Session, m *discordgo.Mess
var cmd []string var cmd []string
// If we found our prefix then remove it and split the command into pieces // If we found our prefix then remove it and split the command into pieces
cmd, err = shellquote.Split(strings.TrimPrefix(content, prefix)) content = strings.TrimPrefix(content, prefix)
if err != nil { r := regexp.MustCompile(`[^\s"]+|"([^"]*)"`)
fmt.Println(err.Error()) cmd = r.FindAllString(content, -1)
if strings.Contains(err.Error(), "Unterminated") { for i, val := range cmd {
cmd = strings.Split(strings.TrimPrefix(content, prefix), " ") cmd[i] = strings.Trim(val, "\"")
} else {
c.ErrorChannel <- CommandError{
Context: ctx,
Message: "",
Error: err,
}
return
}
} }
if len(cmd) < 1 { if len(cmd) < 1 {