Compare commits

...

16 Commits

Author SHA1 Message Date
Dusty.P
b8ee6898cd
Update go.mod 2024-01-06 20:21:06 -09:00
Dusty.P
52b28f3a82
Update go.mod 2024-01-06 20:16:46 -09:00
Dusty.P
d2ed70afda
Update go.mod 2024-01-06 20:10:16 -09:00
Dusty.P
48dc096efc
Update go.mod 2024-01-06 19:58:04 -09:00
Dusty.P
8baa49cac3
Update utils.go 2024-01-06 19:53:30 -09:00
Dusty.P
60af09880f
Update structs.go 2024-01-06 19:53:19 -09:00
Dusty.P
e3c96befb2
Update status-manager.go 2024-01-06 19:53:10 -09:00
Dusty.P
1fcdf10c40
Update go.sum 2024-01-06 19:53:01 -09:00
Dusty.P
242ac2f708
Update go.mod 2024-01-06 19:52:46 -09:00
Dusty.P
cad0dca1b2
Update context.go 2024-01-06 19:52:26 -09:00
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
Dustin Pianalto
01be0e3c2f Update types to fix discordgo updates 2021-08-05 21:07:24 -08:00
7 changed files with 16 additions and 19 deletions

View File

@ -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.

View File

@ -3,7 +3,7 @@ package disgoman
import (
"io"
"github.com/bwmarrin/discordgo"
"github.com/dustinpianalto/discordgo"
)
/* context.go:

2
go.mod
View File

@ -3,6 +3,6 @@ module github.com/dustinpianalto/disgoman
go 1.14
require (
github.com/bwmarrin/discordgo v0.20.2
github.com/dustinpianalto/discordgo v0.0.4
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
)

2
go.sum
View File

@ -1,5 +1,3 @@
github.com/bwmarrin/discordgo v0.20.2 h1:nA7jiTtqUA9lT93WL2jPjUp8ZTEInRujBdx1C9gkr20=
github.com/bwmarrin/discordgo v0.20.2/go.mod h1:O9S4p+ofTFwB02em7jkpkV8M3R0/PUVOwN61zSZ0r4Q=
github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=
github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=

View File

@ -1,10 +1,11 @@
package disgoman
import (
"github.com/bwmarrin/discordgo"
"log"
"math/rand"
"time"
"github.com/dustinpianalto/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
}

View File

@ -6,7 +6,7 @@ package disgoman
* Disgoman (c) 2020 Dusty.P/dustinpianalto
*/
import "github.com/bwmarrin/discordgo"
import "github.com/dustinpianalto/discordgo"
// CommandManager holds the info and structures required for handling command messages
type CommandManager struct {

View File

@ -9,8 +9,9 @@ package disgoman
import (
"errors"
"fmt"
"github.com/bwmarrin/discordgo"
"sort"
"github.com/dustinpianalto/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&int64(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&int64(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&int64(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&int64(perms) != 0 {
return false // If there is an explicit deny then false
}
}
}
if role.Permissions&int(PermissionAdministrator) != 0 {
if role.Permissions&int64(PermissionAdministrator) != 0 {
return true // If they are an administrator then they automatically have all permissions
}
if role.Permissions&int(perms) != 0 {
if role.Permissions&int64(perms) != 0 {
return true // The role has the required permissions
}
}