Pass full command manager to context (breaking)

command-manager.go

@@ -9,9 +9,10 @@ package disgoman
 import (
 	"errors"
 	"fmt"
-	"github.com/bwmarrin/discordgo"
-	"github.com/kballard/go-shellquote"
+	"regexp"
 	"strings"
+
+	"github.com/bwmarrin/discordgo"
 )
 
 // AddCommand adds the Command at the address passed in to the Commands array on the CommandManager.
@@ -90,30 +91,24 @@ func (c *CommandManager) OnMessage(session *discordgo.Session, m *discordgo.Mess
 
 	guild, _ := session.Guild(m.GuildID)
 
+	ctx := Context{
+		Session:        session,
+		Channel:        channel,
+		Message:        m.Message,
+		User:           m.Author,
+		Guild:          guild,
+		Member:         m.Member,
+		Invoked:        "",
+		CommandManager: c,
+	}
+
 	var cmd []string
 	// If we found our prefix then remove it and split the command into pieces
-	cmd, err = shellquote.Split(strings.TrimPrefix(content, prefix))
-	if err != nil {
-		if err.Error() == "Unterminated double-quoted string" || err.Error() == "Unterminated single-quoted string" {
-			cmd = strings.Split(strings.TrimPrefix(content, prefix), " ")
-		} else {
-			ctx := Context{
-				Session:      session,
-				Channel:      channel,
-				Message:      m.Message,
-				User:         m.Author,
-				Guild:        guild,
-				Member:       m.Member,
-				Invoked:      "",
-				ErrorChannel: c.ErrorChannel,
-			}
-			c.ErrorChannel <- CommandError{
-				Context: ctx,
-				Message: "",
-				Error:   err,
-			}
-			return
-		}
+	content = strings.TrimPrefix(content, prefix)
+	r := regexp.MustCompile(`[^ "]+|"([^"]*)"`)
+	cmd = r.FindAllString(content, -1)
+	for i, val := range cmd {
+		cmd[i] = strings.Trim(val, "\"")
 	}
 
 	if len(cmd) < 1 {
@@ -121,8 +116,8 @@ func (c *CommandManager) OnMessage(session *discordgo.Session, m *discordgo.Mess
 	}
 
 	var command *Command
-	invoked := cmd[0]
-	if cmnd, ok := c.Commands[invoked]; ok {
+	ctx.Invoked = cmd[0]
+	if cmnd, ok := c.Commands[ctx.Invoked]; ok {
 		command = cmnd
 	} else {
 		fmt.Println("Command Not Found")
@@ -137,16 +132,6 @@ func (c *CommandManager) OnMessage(session *discordgo.Session, m *discordgo.Mess
 	}
 
 	if !CheckPermissions(session, m.Author.ID, *channel, command.RequiredPermissions) {
-		ctx := Context{
-			Session:      session,
-			Channel:      channel,
-			Message:      m.Message,
-			User:         m.Author,
-			Guild:        guild,
-			Member:       m.Member,
-			Invoked:      cmd[0],
-			ErrorChannel: c.ErrorChannel,
-		}
 		c.ErrorChannel <- CommandError{
 			Context: ctx,
 			Message: "You don't have the correct permissions to run this command.",
@@ -156,16 +141,6 @@ func (c *CommandManager) OnMessage(session *discordgo.Session, m *discordgo.Mess
 	}
 
 	if !CheckPermissions(session, session.State.User.ID, *channel, command.RequiredPermissions) {
-		ctx := Context{
-			Session:      session,
-			Channel:      channel,
-			Message:      m.Message,
-			User:         m.Author,
-			Guild:        guild,
-			Member:       m.Member,
-			Invoked:      cmd[0],
-			ErrorChannel: c.ErrorChannel,
-		}
 		c.ErrorChannel <- CommandError{
 			Context: ctx,
 			Message: "I don't have the correct permissions to run this command.",
@@ -176,16 +151,6 @@ func (c *CommandManager) OnMessage(session *discordgo.Session, m *discordgo.Mess
 	}
 
 	if command.OwnerOnly && !c.IsOwner(m.Author.ID) {
-		ctx := Context{
-			Session:      session,
-			Channel:      channel,
-			Message:      m.Message,
-			User:         m.Author,
-			Guild:        guild,
-			Member:       m.Member,
-			Invoked:      cmd[0],
-			ErrorChannel: c.ErrorChannel,
-		}
 		c.ErrorChannel <- CommandError{
 			Context: ctx,
 			Message: "Sorry, only the bot owner(s) can run that command!",
@@ -195,16 +160,5 @@ func (c *CommandManager) OnMessage(session *discordgo.Session, m *discordgo.Mess
 
 	}
 
-	context := Context{
-		Session:      session,
-		Channel:      channel,
-		Message:      m.Message,
-		User:         m.Author,
-		Guild:        guild,
-		Member:       m.Member,
-		Invoked:      invoked,
-		ErrorChannel: c.ErrorChannel,
-	}
-
-	go command.Invoke(context, cmd[1:])
+	go command.Invoke(ctx, cmd[1:])
 }

context.go

@@ -1,8 +1,9 @@
 package disgoman
 
 import (
-	"github.com/bwmarrin/discordgo"
 	"io"
+
+	"github.com/bwmarrin/discordgo"
 )
 
 /* context.go:
@@ -32,8 +33,8 @@ func (c *Context) SendFile(filename string, file io.Reader) (*discordgo.Message,
 // Will block if the channel buffer is full. It is up to the client to implement a channel for the errors as well as
 // a function to handle the errors from said channel. If the ErrorChannel is nil then this does nothing.
 func (c *Context) SendError(message string, err error) {
-	if c.ErrorChannel != nil {
-		c.ErrorChannel <- CommandError{
+	if c.CommandManager.ErrorChannel != nil {
+		c.CommandManager.ErrorChannel <- CommandError{
 			Context: *c,
 			Message: message,
 			Error:   err,

structs.go

@@ -80,6 +80,6 @@ type Context struct {
 	Member *discordgo.Member
 	// Name of the command as it was invoked (this is so you know what alias was used to call the command)
 	Invoked string
-	// Error channel
-	ErrorChannel chan CommandError
+	// Command Manager
+	CommandManager *CommandManager
 }