Use single Context struct updating Invoked

command-manager.go

@@ -9,9 +9,10 @@ package disgoman
 import (
 	"errors"
 	"fmt"
+	"strings"
+
 	"github.com/bwmarrin/discordgo"
 	"github.com/kballard/go-shellquote"
-	"strings"
 )
 
 // AddCommand adds the Command at the address passed in to the Commands array on the CommandManager.
@@ -90,13 +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 {
-		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,
@@ -107,6 +101,15 @@ func (c *CommandManager) OnMessage(session *discordgo.Session, m *discordgo.Mess
 		Invoked:      "",
 		ErrorChannel: c.ErrorChannel,
 	}
+
+	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 {
 			c.ErrorChannel <- CommandError{
 				Context: ctx,
 				Message: "",
@@ -116,26 +119,27 @@ func (c *CommandManager) OnMessage(session *discordgo.Session, m *discordgo.Mess
 		}
 	}
 
+	if len(cmd) < 1 {
+		return
+	}
+
 	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")
 		return
 	}
 
-	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,
+	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) {
 		c.ErrorChannel <- CommandError{
 			Context: ctx,
 			Message: "You don't have the correct permissions to run this command.",
@@ -145,16 +149,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.",
@@ -165,16 +159,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!",
@@ -184,16 +168,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:])
 }

structs.go

@@ -48,6 +48,8 @@ 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
 }

utils.go

@@ -20,7 +20,7 @@ func GetDefaultStatusManager() StatusManager {
 			"Golang!",
 			"DiscordGo!",
 			"Disgoman!",
-		}, "10s"}
+		}, "300s"}
 }
 
 // HasHigherRole checks if the caller has a higher role than the target in the given guild