Update command-manager.go

command-manager.go

@@ -9,10 +9,10 @@ package disgoman
 import (
 	"errors"
 	"fmt"
+	"regexp"
 	"strings"
 
-	"github.com/bwmarrin/discordgo"
+	"github.com/dustinpianalto/discordgo"
-	"github.com/kballard/go-shellquote"
 )
 
 // AddCommand adds the Command at the address passed in to the Commands array on the CommandManager.
@@ -91,14 +91,6 @@ func (c *CommandManager) OnMessage(session *discordgo.Session, m *discordgo.Mess
 
 	guild, _ := session.Guild(m.GuildID)
 
-	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 {
-		fmt.Println(err.Error())
-		if strings.Contains(err.Error(), "Unterminated") {
-			cmd = strings.Split(strings.TrimPrefix(content, prefix), " ")
-		} else {
 	ctx := Context{
 		Session:        session,
 		Channel:        channel,
@@ -107,15 +99,16 @@ func (c *CommandManager) OnMessage(session *discordgo.Session, m *discordgo.Mess
 		Guild:          guild,
 		Member:         m.Member,
 		Invoked:        "",
-				ErrorChannel: c.ErrorChannel,
+		CommandManager: c,
-			}
-			c.ErrorChannel <- CommandError{
-				Context: ctx,
-				Message: "",
-				Error:   err,
-			}
-			return
 	}
+
+	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(`[^ "]+|"([^"]*)"`)
+	cmd = r.FindAllString(content, -1)
+	for i, val := range cmd {
+		cmd[i] = strings.Trim(val, "\"")
 	}
 
 	if len(cmd) < 1 {
@@ -123,8 +116,8 @@ func (c *CommandManager) OnMessage(session *discordgo.Session, m *discordgo.Mess
 	}
 
 	var command *Command
-	invoked := cmd[0]
+	ctx.Invoked = cmd[0]
-	if cmnd, ok := c.Commands[invoked]; ok {
+	if cmnd, ok := c.Commands[ctx.Invoked]; ok {
 		command = cmnd
 	} else {
 		fmt.Println("Command Not Found")
@@ -139,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.",
@@ -158,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.",
@@ -178,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!",
@@ -197,16 +160,5 @@ func (c *CommandManager) OnMessage(session *discordgo.Session, m *discordgo.Mess
 
 	}
 
-	context := Context{
+	go command.Invoke(ctx, cmd[1:])
-		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:])
 }

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 {
+	if c.CommandManager.ErrorChannel != nil {
-		c.ErrorChannel <- CommandError{
+		c.CommandManager.ErrorChannel <- CommandError{
 			Context: *c,
 			Message: message,
 			Error:   err,

status-manager.go

@@ -1,10 +1,11 @@
 package disgoman
 
 import (
-	"github.com/bwmarrin/discordgo"
 	"log"
 	"math/rand"
 	"time"
+
+	"github.com/bwmarrin/discordgo"
 )
 
 /* status-manager.go:
@@ -37,7 +38,8 @@ func (s *StatusManager) SetInterval(interval string) {
 // UpdateStatus updates the status of the bot
 func (s *StatusManager) UpdateStatus(session *discordgo.Session) error {
 	i := rand.Intn(len(s.Values))
-	err := session.UpdateStatus(0, s.Values[i])
+	err := session.UpdateGameStatus(0, s.Values[i])
+	log.Println(err)
 	return 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
+	// Command Manager
-	ErrorChannel chan CommandError
+	CommandManager *CommandManager
 }

types.go

@@ -13,7 +13,7 @@ type CommandInvokeFunc func(Context, []string)
 type PrefixesFunc func(string) []string
 
 // Permission type to help with managing permissions for commands
-type Permission int
+type Permission int64
 
 // Defining permissions based on the Discord API
 const (

utils.go

@@ -9,8 +9,9 @@ package disgoman
 import (
 	"errors"
 	"fmt"
-	"github.com/bwmarrin/discordgo"
 	"sort"
+
+	"github.com/bwmarrin/discordgo"
 )
 
 // GetDefaultStatusManager returns a default Status Manager
@@ -72,9 +73,9 @@ func CheckPermissions(session *discordgo.Session, memberID string, channel disco
 
 	for _, overwrite := range channel.PermissionOverwrites {
 		if overwrite.ID == memberID {
-			if overwrite.Allow&int(perms) != 0 {
+			if overwrite.Allow&int64(perms) != 0 {
 				return true // If the channel has an overwrite for the user then true
-			} else if overwrite.Deny&int(perms) != 0 {
+			} else if overwrite.Deny&int64(perms) != 0 {
 				return false // If there is an explicit deny then false
 			}
 		}
@@ -93,19 +94,19 @@ func CheckPermissions(session *discordgo.Session, memberID string, channel disco
 
 		for _, overwrite := range channel.PermissionOverwrites {
 			if overwrite.ID == roleID {
-				if overwrite.Allow&int(perms) != 0 {
+				if overwrite.Allow&int64(perms) != 0 {
 					return true // If the channel has an overwrite for the role then true
-				} else if overwrite.Deny&int(perms) != 0 {
+				} else if overwrite.Deny&int64(perms) != 0 {
 					return false // If there is an explicit deny then false
 				}
 			}
 		}
 
-		if role.Permissions&int(PermissionAdministrator) != 0 {
+		if role.Permissions&int64(PermissionAdministrator) != 0 {
 			return true // If they are an administrator then they automatically have all permissions
 		}
 
-		if role.Permissions&int(perms) != 0 {
+		if role.Permissions&int64(perms) != 0 {
 			return true // The role has the required permissions
 		}
 	}