Change shellquote error check

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.
@@ -94,7 +95,8 @@ func (c *CommandManager) OnMessage(session *discordgo.Session, m *discordgo.Mess
 	// 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" {
+		fmt.Println(err.Error())
+		if strings.Contains(err.Error(), "Unterminated") {
 			cmd = strings.Split(strings.TrimPrefix(content, prefix), " ")
 		} else {
 			ctx := Context{
@@ -116,6 +118,10 @@ 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 {
@@ -125,6 +131,13 @@ func (c *CommandManager) OnMessage(session *discordgo.Session, m *discordgo.Mess
 		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,

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