Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0701c6f791 | ||
|
|
c38729441b | ||
|
|
a389de2c77 |
+8
-8
@@ -92,14 +92,14 @@ func (c *CommandManager) OnMessage(session *discordgo.Session, m *discordgo.Mess
|
|||||||
guild, _ := session.Guild(m.GuildID)
|
guild, _ := session.Guild(m.GuildID)
|
||||||
|
|
||||||
ctx := Context{
|
ctx := Context{
|
||||||
Session: session,
|
Session: session,
|
||||||
Channel: channel,
|
Channel: channel,
|
||||||
Message: m.Message,
|
Message: m.Message,
|
||||||
User: m.Author,
|
User: m.Author,
|
||||||
Guild: guild,
|
Guild: guild,
|
||||||
Member: m.Member,
|
Member: m.Member,
|
||||||
Invoked: "",
|
Invoked: "",
|
||||||
ErrorChannel: c.ErrorChannel,
|
CommandManager: c,
|
||||||
}
|
}
|
||||||
|
|
||||||
var cmd []string
|
var cmd []string
|
||||||
|
|||||||
+4
-3
@@ -1,8 +1,9 @@
|
|||||||
package disgoman
|
package disgoman
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/bwmarrin/discordgo"
|
|
||||||
"io"
|
"io"
|
||||||
|
|
||||||
|
"github.com/bwmarrin/discordgo"
|
||||||
)
|
)
|
||||||
|
|
||||||
/* context.go:
|
/* 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
|
// 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.
|
// 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) {
|
func (c *Context) SendError(message string, err error) {
|
||||||
if c.ErrorChannel != nil {
|
if c.CommandManager.ErrorChannel != nil {
|
||||||
c.ErrorChannel <- CommandError{
|
c.CommandManager.ErrorChannel <- CommandError{
|
||||||
Context: *c,
|
Context: *c,
|
||||||
Message: message,
|
Message: message,
|
||||||
Error: err,
|
Error: err,
|
||||||
|
|||||||
+5
-1
@@ -37,7 +37,11 @@ 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))
|
||||||
err := session.UpdateStatus(0, s.Values[i])
|
usd := discordgo.UpdateStatusData {
|
||||||
|
Status: s.Values[i],
|
||||||
|
AFK: false,
|
||||||
|
}
|
||||||
|
err := session.UpdateStatusComplex(usd)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -80,6 +80,6 @@ type Context struct {
|
|||||||
Member *discordgo.Member
|
Member *discordgo.Member
|
||||||
// Name of the command as it was invoked (this is so you know what alias was used to call the command)
|
// Name of the command as it was invoked (this is so you know what alias was used to call the command)
|
||||||
Invoked string
|
Invoked string
|
||||||
// Error channel
|
// Command Manager
|
||||||
ErrorChannel chan CommandError
|
CommandManager *CommandManager
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ type CommandInvokeFunc func(Context, []string)
|
|||||||
type PrefixesFunc func(string) []string
|
type PrefixesFunc func(string) []string
|
||||||
|
|
||||||
// Permission type to help with managing permissions for commands
|
// Permission type to help with managing permissions for commands
|
||||||
type Permission int
|
type Permission int64
|
||||||
|
|
||||||
// Defining permissions based on the Discord API
|
// Defining permissions based on the Discord API
|
||||||
const (
|
const (
|
||||||
|
|||||||
Reference in New Issue
Block a user