Compare commits

...
4 Commits
6 changed files with 28 additions and 22 deletions
+1 -1
View File
@@ -99,7 +99,7 @@ func (c *CommandManager) OnMessage(session *discordgo.Session, m *discordgo.Mess
Guild: guild,
Member: m.Member,
Invoked: "",
ErrorChannel: c.ErrorChannel,
CommandManager: c,
}
var cmd []string
+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 (
+8 -7
View File
@@ -9,8 +9,9 @@ package disgoman
import (
"errors"
"fmt"
"github.com/bwmarrin/discordgo"
"sort"
"github.com/bwmarrin/discordgo"
)
// GetDefaultStatusManager returns a default Status Manager
@@ -72,9 +73,9 @@ func CheckPermissions(session *discordgo.Session, memberID string, channel disco
for _, overwrite := range channel.PermissionOverwrites {
if overwrite.ID == memberID {
if overwrite.Allow&int(perms) != 0 {
if overwrite.Allow&perms != 0 {
return true // If the channel has an overwrite for the user then true
} else if overwrite.Deny&int(perms) != 0 {
} else if overwrite.Deny&perms != 0 {
return false // If there is an explicit deny then false
}
}
@@ -93,19 +94,19 @@ func CheckPermissions(session *discordgo.Session, memberID string, channel disco
for _, overwrite := range channel.PermissionOverwrites {
if overwrite.ID == roleID {
if overwrite.Allow&int(perms) != 0 {
if overwrite.Allow&perms != 0 {
return true // If the channel has an overwrite for the role then true
} else if overwrite.Deny&int(perms) != 0 {
} else if overwrite.Deny&perms != 0 {
return false // If there is an explicit deny then false
}
}
}
if role.Permissions&int(PermissionAdministrator) != 0 {
if role.Permissions&PermissionAdministrator != 0 {
return true // If they are an administrator then they automatically have all permissions
}
if role.Permissions&int(perms) != 0 {
if role.Permissions&perms != 0 {
return true // The role has the required permissions
}
}