Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2cac64f91b | ||
|
|
71efaa0d45 | ||
|
|
fc4b370a1e | ||
|
|
30065b313f | ||
|
|
4236915c5b |
@@ -94,6 +94,7 @@ func (c *CommandManager) OnMessage(session *discordgo.Session, m *discordgo.Mess
|
|||||||
// If we found our prefix then remove it and split the command into pieces
|
// If we found our prefix then remove it and split the command into pieces
|
||||||
cmd, err = shellquote.Split(strings.TrimPrefix(content, prefix))
|
cmd, err = shellquote.Split(strings.TrimPrefix(content, prefix))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
fmt.Println(err.Error())
|
||||||
if err.Error() == "Unterminated double-quoted string" || err.Error() == "Unterminated single-quoted string" {
|
if err.Error() == "Unterminated double-quoted string" || err.Error() == "Unterminated single-quoted string" {
|
||||||
cmd = strings.Split(strings.TrimPrefix(content, prefix), " ")
|
cmd = strings.Split(strings.TrimPrefix(content, prefix), " ")
|
||||||
} else {
|
} else {
|
||||||
@@ -116,6 +117,10 @@ func (c *CommandManager) OnMessage(session *discordgo.Session, m *discordgo.Mess
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if len(cmd) < 1 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
var command *Command
|
var command *Command
|
||||||
invoked := cmd[0]
|
invoked := cmd[0]
|
||||||
if cmnd, ok := c.Commands[invoked]; ok {
|
if cmnd, ok := c.Commands[invoked]; ok {
|
||||||
@@ -125,6 +130,13 @@ func (c *CommandManager) OnMessage(session *discordgo.Session, m *discordgo.Mess
|
|||||||
return
|
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) {
|
if !CheckPermissions(session, m.Author.ID, *channel, command.RequiredPermissions) {
|
||||||
ctx := Context{
|
ctx := Context{
|
||||||
Session: session,
|
Session: session,
|
||||||
|
|||||||
@@ -48,6 +48,8 @@ type Command struct {
|
|||||||
Hidden bool
|
Hidden bool
|
||||||
// Permissions that are required for the command to function
|
// Permissions that are required for the command to function
|
||||||
RequiredPermissions Permission
|
RequiredPermissions Permission
|
||||||
|
// Should the message content be sanitized before invoking the command
|
||||||
|
SanitizeEveryone bool
|
||||||
// Function to invoke when command is called
|
// Function to invoke when command is called
|
||||||
Invoke CommandInvokeFunc
|
Invoke CommandInvokeFunc
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ func GetDefaultStatusManager() StatusManager {
|
|||||||
"Golang!",
|
"Golang!",
|
||||||
"DiscordGo!",
|
"DiscordGo!",
|
||||||
"Disgoman!",
|
"Disgoman!",
|
||||||
}, "30s"}
|
}, "300s"}
|
||||||
}
|
}
|
||||||
|
|
||||||
// HasHigherRole checks if the caller has a higher role than the target in the given guild
|
// HasHigherRole checks if the caller has a higher role than the target in the given guild
|
||||||
|
|||||||
Reference in New Issue
Block a user