Compare commits

...
4 Commits
5 changed files with 21 additions and 16 deletions
+2 -2
View File
@@ -99,13 +99,13 @@ func (c *CommandManager) OnMessage(session *discordgo.Session, m *discordgo.Mess
Guild: guild,
Member: m.Member,
Invoked: "",
ErrorChannel: c.ErrorChannel,
CommandManager: c,
}
var cmd []string
// If we found our prefix then remove it and split the command into pieces
content = strings.TrimPrefix(content, prefix)
r := regexp.MustCompile(`[^\s"]+|"([^"]*)"`)
r := regexp.MustCompile(`[^ "]+|"([^"]*)"`)
cmd = r.FindAllString(content, -1)
for i, val := range cmd {
cmd[i] = strings.Trim(val, "\"")
+4 -3
View File
@@ -1,8 +1,9 @@
package disgoman
import (
"github.com/bwmarrin/discordgo"
"io"
"github.com/bwmarrin/discordgo"
)
/* context.go:
@@ -32,8 +33,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.ErrorChannel != nil {
c.ErrorChannel <- CommandError{
if c.CommandManager.ErrorChannel != nil {
c.CommandManager.ErrorChannel <- CommandError{
Context: *c,
Message: message,
Error: err,
+5 -1
View File
@@ -37,7 +37,11 @@ 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.UpdateStatus(0, s.Values[i])
usd := discordgo.UpdateStatusData {
Status: s.Values[i],
AFK: false,
}
err := session.UpdateStatusComplex(usd)
return err
}
+2 -2
View File
@@ -80,6 +80,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
// Error channel
ErrorChannel chan CommandError
// Command Manager
CommandManager *CommandManager
}
+1 -1
View File
@@ -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 int
type Permission int64
// Defining permissions based on the Discord API
const (