Compare commits

..
5 Commits
Author SHA1 Message Date
Dusty.P 5561865b61 Update command-manager.go 2024-01-06 19:52:14 -09:00
Dustin Pianalto 458250eb80 Update status updater 2021-08-05 23:21:20 -08:00
Dustin Pianalto 5258cf33a7 Test statis update 2021-08-05 22:46:32 -08:00
Dustin Pianalto f70fa91b00 Test status update 2021-08-05 22:40:25 -08:00
Dustin Pianalto e73e3fba54 Update types to fix discordgo updates 2021-08-05 21:17:47 -08:00
3 changed files with 11 additions and 13 deletions
+1 -1
View File
@@ -12,7 +12,7 @@ import (
"regexp" "regexp"
"strings" "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. // AddCommand adds the Command at the address passed in to the Commands array on the CommandManager.
+4 -6
View File
@@ -1,10 +1,11 @@
package disgoman package disgoman
import ( import (
"github.com/bwmarrin/discordgo"
"log" "log"
"math/rand" "math/rand"
"time" "time"
"github.com/bwmarrin/discordgo"
) )
/* status-manager.go: /* status-manager.go:
@@ -37,11 +38,8 @@ func (s *StatusManager) SetInterval(interval string) {
// UpdateStatus updates the status of the bot // UpdateStatus updates the status of the bot
func (s *StatusManager) UpdateStatus(session *discordgo.Session) error { func (s *StatusManager) UpdateStatus(session *discordgo.Session) error {
i := rand.Intn(len(s.Values)) i := rand.Intn(len(s.Values))
usd := discordgo.UpdateStatusData { err := session.UpdateGameStatus(0, s.Values[i])
Status: s.Values[i], log.Println(err)
AFK: false,
}
err := session.UpdateStatusComplex(usd)
return err return err
} }
+6 -6
View File
@@ -73,9 +73,9 @@ func CheckPermissions(session *discordgo.Session, memberID string, channel disco
for _, overwrite := range channel.PermissionOverwrites { for _, overwrite := range channel.PermissionOverwrites {
if overwrite.ID == memberID { 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 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 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 { for _, overwrite := range channel.PermissionOverwrites {
if overwrite.ID == roleID { 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 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 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 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 return true // The role has the required permissions
} }
} }