Pass full command manager to context (breaking)

command-manager.go

@@ -92,20 +92,20 @@ 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:      "",
-		ErrorChannel: c.ErrorChannel,
+		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
 	content = strings.TrimPrefix(content, prefix)
-	r := regexp.MustCompile(`[^\s"]+|"([^"]*)"`)
+	r := regexp.MustCompile(`[^ "]+|"([^"]*)"`)
 	cmd = r.FindAllString(content, -1)
 	for i, val := range cmd {
 		cmd[i] = strings.Trim(val, "\"")

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
 }