Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5561865b61 | ||
|
|
458250eb80 | ||
|
|
5258cf33a7 | ||
|
|
f70fa91b00 | ||
|
|
e73e3fba54 |
+1
-1
@@ -12,7 +12,7 @@ import (
|
||||
"regexp"
|
||||
"strings"
|
||||
|
||||
"github.com/bwmarrin/discordgo"
|
||||
"github.com/dustinpianalto/discordgo"
|
||||
)
|
||||
|
||||
// AddCommand adds the Command at the address passed in to the Commands array on the CommandManager.
|
||||
|
||||
+4
-6
@@ -1,10 +1,11 @@
|
||||
package disgoman
|
||||
|
||||
import (
|
||||
"github.com/bwmarrin/discordgo"
|
||||
"log"
|
||||
"math/rand"
|
||||
"time"
|
||||
|
||||
"github.com/bwmarrin/discordgo"
|
||||
)
|
||||
|
||||
/* status-manager.go:
|
||||
@@ -37,11 +38,8 @@ 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))
|
||||
usd := discordgo.UpdateStatusData {
|
||||
Status: s.Values[i],
|
||||
AFK: false,
|
||||
}
|
||||
err := session.UpdateStatusComplex(usd)
|
||||
err := session.UpdateGameStatus(0, s.Values[i])
|
||||
log.Println(err)
|
||||
return err
|
||||
}
|
||||
|
||||
|
||||
@@ -73,9 +73,9 @@ func CheckPermissions(session *discordgo.Session, memberID string, channel disco
|
||||
|
||||
for _, overwrite := range channel.PermissionOverwrites {
|
||||
if overwrite.ID == memberID {
|
||||
if overwrite.Allow&perms != 0 {
|
||||
if overwrite.Allow&int64(perms) != 0 {
|
||||
return true // If the channel has an overwrite for the user then true
|
||||
} else if overwrite.Deny&perms != 0 {
|
||||
} else if overwrite.Deny&int64(perms) != 0 {
|
||||
return false // If there is an explicit deny then false
|
||||
}
|
||||
}
|
||||
@@ -94,19 +94,19 @@ func CheckPermissions(session *discordgo.Session, memberID string, channel disco
|
||||
|
||||
for _, overwrite := range channel.PermissionOverwrites {
|
||||
if overwrite.ID == roleID {
|
||||
if overwrite.Allow&perms != 0 {
|
||||
if overwrite.Allow&int64(perms) != 0 {
|
||||
return true // If the channel has an overwrite for the role then true
|
||||
} else if overwrite.Deny&perms != 0 {
|
||||
} else if overwrite.Deny&int64(perms) != 0 {
|
||||
return false // If there is an explicit deny then false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if role.Permissions&PermissionAdministrator != 0 {
|
||||
if role.Permissions&int64(PermissionAdministrator) != 0 {
|
||||
return true // If they are an administrator then they automatically have all permissions
|
||||
}
|
||||
|
||||
if role.Permissions&perms != 0 {
|
||||
if role.Permissions&int64(perms) != 0 {
|
||||
return true // The role has the required permissions
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user