Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2cac64f91b | ||
|
|
71efaa0d45 | ||
|
|
fc4b370a1e | ||
|
|
30065b313f | ||
|
|
4236915c5b | ||
|
|
4ad95f415f | ||
|
|
c80fb3f00a |
@@ -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
|
||||
cmd, err = shellquote.Split(strings.TrimPrefix(content, prefix))
|
||||
if err != nil {
|
||||
fmt.Println(err.Error())
|
||||
if err.Error() == "Unterminated double-quoted string" || err.Error() == "Unterminated single-quoted string" {
|
||||
cmd = strings.Split(strings.TrimPrefix(content, prefix), " ")
|
||||
} else {
|
||||
@@ -116,6 +117,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 +130,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,
|
||||
|
||||
+2
-2
@@ -50,14 +50,14 @@ func (s *StatusManager) OnReady(session *discordgo.Session, _ *discordgo.Ready)
|
||||
|
||||
err = s.UpdateStatus(session)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
log.Println(err)
|
||||
}
|
||||
|
||||
ticker := time.NewTicker(interval)
|
||||
for range ticker.C {
|
||||
err = s.UpdateStatus(session)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
log.Println(err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user