wayfinderak/disgoman
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use single Context struct updating Invoked

Browse Source
This commit is contained in:
Dusty Pianalto 2020-06-04 16:29:36 -08:00
parent c2f03b7f61
commit 12b47f1fed
1 changed files with 14 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
command-manager.go
View File

@ -91,6 +91,17 @@ func (c *CommandManager) OnMessage(session *discordgo.Session, m *discordgo.Mess
guild, _ := session.Guild(m.GuildID) guild, _ := session.Guild(m.GuildID)
ctx := Context{
Session: session,
Channel: channel,
Message: m.Message,
User: m.Author,
Guild: guild,
Member: m.Member,
Invoked: "",
ErrorChannel: c.ErrorChannel,
}
var cmd []string var cmd []string
// If we found our prefix then remove it and split the command into pieces // If we found our prefix then remove it and split the command into pieces
cmd, err = shellquote.Split(strings.TrimPrefix(content, prefix)) cmd, err = shellquote.Split(strings.TrimPrefix(content, prefix))
@ -99,16 +110,6 @@ func (c *CommandManager) OnMessage(session *discordgo.Session, m *discordgo.Mess
if strings.Contains(err.Error(), "Unterminated") { if strings.Contains(err.Error(), "Unterminated") {
cmd = strings.Split(strings.TrimPrefix(content, prefix), " ") cmd = strings.Split(strings.TrimPrefix(content, prefix), " ")
} else { } else {
ctx := Context{
Session: session,
Channel: channel,
Message: m.Message,
User: m.Author,
Guild: guild,
Member: m.Member,
Invoked: "",
ErrorChannel: c.ErrorChannel,
}
c.ErrorChannel <- CommandError{ c.ErrorChannel <- CommandError{
Context: ctx, Context: ctx,
Message: "", Message: "",
@ -123,8 +124,8 @@ func (c *CommandManager) OnMessage(session *discordgo.Session, m *discordgo.Mess
} }
var command *Command var command *Command
invoked := cmd[0] ctx.Invoked = cmd[0]
if cmnd, ok := c.Commands[invoked]; ok { if cmnd, ok := c.Commands[ctx.Invoked]; ok {
command = cmnd command = cmnd
} else { } else {
fmt.Println("Command Not Found") fmt.Println("Command Not Found")
@ -139,16 +140,6 @@ func (c *CommandManager) OnMessage(session *discordgo.Session, m *discordgo.Mess
} }
if !CheckPermissions(session, m.Author.ID, *channel, command.RequiredPermissions) { if !CheckPermissions(session, m.Author.ID, *channel, command.RequiredPermissions) {
ctx := Context{
Session: session,
Channel: channel,
Message: m.Message,
User: m.Author,
Guild: guild,
Member: m.Member,
Invoked: cmd[0],
ErrorChannel: c.ErrorChannel,
}
c.ErrorChannel <- CommandError{ c.ErrorChannel <- CommandError{
Context: ctx, Context: ctx,
Message: "You don't have the correct permissions to run this command.", Message: "You don't have the correct permissions to run this command.",
@ -158,16 +149,6 @@ func (c *CommandManager) OnMessage(session *discordgo.Session, m *discordgo.Mess
} }
if !CheckPermissions(session, session.State.User.ID, *channel, command.RequiredPermissions) { if !CheckPermissions(session, session.State.User.ID, *channel, command.RequiredPermissions) {
ctx := Context{
Session: session,
Channel: channel,
Message: m.Message,
User: m.Author,
Guild: guild,
Member: m.Member,
Invoked: cmd[0],
ErrorChannel: c.ErrorChannel,
}
c.ErrorChannel <- CommandError{ c.ErrorChannel <- CommandError{
Context: ctx, Context: ctx,
Message: "I don't have the correct permissions to run this command.", Message: "I don't have the correct permissions to run this command.",
@ -178,16 +159,6 @@ func (c *CommandManager) OnMessage(session *discordgo.Session, m *discordgo.Mess
} }
if command.OwnerOnly && !c.IsOwner(m.Author.ID) { if command.OwnerOnly && !c.IsOwner(m.Author.ID) {
ctx := Context{
Session: session,
Channel: channel,
Message: m.Message,
User: m.Author,
Guild: guild,
Member: m.Member,
Invoked: cmd[0],
ErrorChannel: c.ErrorChannel,
}
c.ErrorChannel <- CommandError{ c.ErrorChannel <- CommandError{
Context: ctx, Context: ctx,
Message: "Sorry, only the bot owner(s) can run that command!", Message: "Sorry, only the bot owner(s) can run that command!",
@ -197,16 +168,5 @@ func (c *CommandManager) OnMessage(session *discordgo.Session, m *discordgo.Mess
} }
context := Context{ go command.Invoke(ctx, cmd[1:])
Session: session,
Channel: channel,
Message: m.Message,
User: m.Author,
Guild: guild,
Member: m.Member,
Invoked: invoked,
ErrorChannel: c.ErrorChannel,
}
go command.Invoke(context, cmd[1:])
} }