make checking perms before sending opt-in

starshine-sys · Jun 2, 2021 · 4b32fb9 · 4b32fb9
1 parent aeef059
commit 4b32fb9
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 12 deletions.
diff --git a/messageSend.go b/messageSend.go
@@ -117,12 +117,6 @@ func (m *MessageSend) Send() (msg *discord.Message, err error) {
 }
 
 func (m *MessageSend) send() (msg *discord.Message, err error) {
-	if m.checkPerms {
-		if !m.ctx.checkBotSendPerms(m.channel, m.Data.Embed != nil) {
-			return nil, ErrBotMissingPermissions
-		}
-	}
-
 	return m.ctx.State.SendMessageComplex(m.channel, m.Data)
 }
 

diff --git a/permCheck.go b/permCheck.go
@@ -54,8 +54,8 @@ func (ctx *Context) checkOwner() bool {
 	return false
 }
 
-// checkBotSendPerms checks if the bot can send messages in a channel
-func (ctx *Context) checkBotSendPerms(ch discord.ChannelID, e bool) bool {
+// CheckBotSendPerms checks if the bot can send messages in a channel
+func (ctx *Context) CheckBotSendPerms(ch discord.ChannelID, e bool) bool {
 	// if this is a DM channel we always have perms
 	if ctx.Channel.ID == ch && ctx.Message.GuildID == 0 {
 		return true

diff --git a/reply.go b/reply.go
@@ -15,10 +15,6 @@ var (
 
 // Send sends a message to the context channel
 func (ctx *Context) Send(content string, embed *discord.Embed) (m *discord.Message, err error) {
-	if !ctx.checkBotSendPerms(ctx.Channel.ID, embed != nil) {
-		return nil, ErrBotMissingPermissions
-	}
-
 	return ctx.State.SendMessageComplex(ctx.Channel.ID, api.SendMessageData{
 		Content:         content,
 		Embed:           embed,