command-manager.go

@@ -9,10 +9,9 @@ package disgoman
 import (
 	"errors"
 	"fmt"
-	"regexp"
+	"github.com/bwmarrin/discordgo"
+	"github.com/kballard/go-shellquote"
 	"strings"
-
-	"github.com/dustinpianalto/discordgo"
 )
 
 // AddCommand adds the Command at the address passed in to the Commands array on the CommandManager.
@@ -91,6 +90,13 @@ 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 {
+		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,
@@ -99,39 +105,37 @@ func (c *CommandManager) OnMessage(session *discordgo.Session, m *discordgo.Mess
 				Guild:        guild,
 				Member:       m.Member,
 				Invoked:      "",
-		CommandManager: c,
+				ErrorChannel: c.ErrorChannel,
 			}
-
+			c.ErrorChannel <- CommandError{
-	var cmd []string
+				Context: ctx,
-	// If we found our prefix then remove it and split the command into pieces
+				Message: "",
-	content = strings.TrimPrefix(content, prefix)
+				Error:   err,
-	r := regexp.MustCompile(`[^ "]+|"([^"]*)"`)
-	cmd = r.FindAllString(content, -1)
-	for i, val := range cmd {
-		cmd[i] = strings.Trim(val, "\"")
 			}
-
-	if len(cmd) < 1 {
 			return
 		}
+	}
 
 	var command *Command
-	ctx.Invoked = cmd[0]
+	invoked := cmd[0]
-	if cmnd, ok := c.Commands[ctx.Invoked]; ok {
+	if cmnd, ok := c.Commands[invoked]; ok {
 		command = cmnd
 	} else {
 		fmt.Println("Command Not Found")
 		return
 	}
 
-	if command.SanitizeEveryone {
-		for i := 1; i < len(cmd); i++ {
-			cmd[i] = strings.ReplaceAll(cmd[i], "@everyone", "@\ufff0everyone")
-			cmd[i] = strings.ReplaceAll(cmd[i], "@here", "@\ufff0here")
-		}
-	}
-
 	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.",
@@ -141,6 +145,16 @@ 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.",
@@ -151,6 +165,16 @@ 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!",
@@ -160,5 +184,16 @@ func (c *CommandManager) OnMessage(session *discordgo.Session, m *discordgo.Mess
 
 	}
 
-	go command.Invoke(ctx, cmd[1:])
+	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:])
 }

context.go

@@ -1,9 +1,8 @@
 package disgoman
 
 import (
+	"github.com/bwmarrin/discordgo"
 	"io"
-
-	"github.com/dustinpianalto/discordgo"
 )
 
 /* context.go:
@@ -33,8 +32,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.CommandManager.ErrorChannel != nil {
+	if c.ErrorChannel != nil {
-		c.CommandManager.ErrorChannel <- CommandError{
+		c.ErrorChannel <- CommandError{
 			Context: *c,
 			Message: message,
 			Error:   err,

go.mod

@@ -3,6 +3,6 @@ module github.com/dustinpianalto/disgoman
 go 1.14
 
 require (
-	github.com/dustinpianalto/discordgo v0.0.4
+	github.com/bwmarrin/discordgo v0.20.2
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
 )

go.sum

@@ -1,3 +1,5 @@
+github.com/bwmarrin/discordgo v0.20.2 h1:nA7jiTtqUA9lT93WL2jPjUp8ZTEInRujBdx1C9gkr20=
+github.com/bwmarrin/discordgo v0.20.2/go.mod h1:O9S4p+ofTFwB02em7jkpkV8M3R0/PUVOwN61zSZ0r4Q=
 github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=

status-manager.go

@@ -1,11 +1,10 @@
 package disgoman
 
 import (
+	"github.com/bwmarrin/discordgo"
 	"log"
 	"math/rand"
 	"time"
-
-	"github.com/dustinpianalto/discordgo"
 )
 
 /* status-manager.go:
@@ -38,8 +37,7 @@ 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.UpdateGameStatus(0, s.Values[i])
+	err := session.UpdateStatus(0, s.Values[i])
-	log.Println(err)
 	return err
 }
 

structs.go

@@ -6,7 +6,7 @@ package disgoman
  * Disgoman (c) 2020 Dusty.P/dustinpianalto
  */
 
-import "github.com/dustinpianalto/discordgo"
+import "github.com/bwmarrin/discordgo"
 
 // CommandManager holds the info and structures required for handling command messages
 type CommandManager struct {
@@ -48,8 +48,6 @@ type Command struct {
 	Hidden bool
 	// Permissions that are required for the command to function
 	RequiredPermissions Permission
-	// Should the message content be sanitized before invoking the command
-	SanitizeEveryone bool
 	// Function to invoke when command is called
 	Invoke CommandInvokeFunc
 }
@@ -80,6 +78,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
-	// Command Manager
+	// Error channel
-	CommandManager *CommandManager
+	ErrorChannel chan CommandError
 }

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 int64
+type Permission int
 
 // Defining permissions based on the Discord API
 const (

utils.go

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