all-bot: add support for dm channels not being in state

automod_legacy/bot.go

@@ -101,7 +101,7 @@ func CheckMessage(m *discordgo.Message) bool {
 		return false // Pls no panicerinos or banerinos self
 	}
 
-	if m.Author.Bot {
+	if m.Author.Bot || m.GuildID == 0 {
 		return false
 	}
 

commands/yagcommmand.go

@@ -120,7 +120,7 @@ func (yc *YAGCommand) Run(data *dcmd.Data) (interface{}, error) {
 	}
 
 	// Send typing to indicate the bot's working
-	common.BotSession.ChannelTyping(data.CS.ID)
+	common.BotSession.ChannelTyping(data.Msg.ChannelID)
 
 	logger := yc.Logger(data)
 
@@ -130,22 +130,19 @@ func (yc *YAGCommand) Run(data *dcmd.Data) (interface{}, error) {
 		yc.logExecutionTime(time.Since(started), data.Msg.Content, data.Msg.Author.Username)
 	}()
 
-	cState := bot.State.Channel(true, data.Msg.ChannelID)
-	if cState == nil {
-		return nil, errors.New("Channel not found")
-	}
+	cState := data.CS
 
 	// Set up log entry for later use
 	logEntry := &common.LoggedExecutedCommand{
 		UserID:    discordgo.StrID(data.Msg.Author.ID),
-		ChannelID: discordgo.StrID(cState.ID),
+		ChannelID: discordgo.StrID(data.Msg.ChannelID),
 
 		Command:    yc.Name,
 		RawCommand: data.Msg.Content,
 		TimeStamp:  time.Now(),
 	}
 
-	if cState.Guild != nil {
+	if cState != nil && cState.Guild != nil {
 		logEntry.GuildID = discordgo.StrID(cState.Guild.ID)
 	}
 

customcommands/bot.go

@@ -103,6 +103,10 @@ func StringCommands(ccs []*CustomCommand) string {
 }
 
 func shouldIgnoreChannel(evt *discordgo.MessageCreate, cState *dstate.ChannelState) bool {
+	if evt.GuildID == 0 {
+		return true
+	}
+
 	if cState == nil {
 		log.Warn("Channel not found in state")
 		return true

serverstats/plugin_bot.go

@@ -133,17 +133,16 @@ func HandleMemberRemove(evt *eventsystem.EventData) {
 func HandleMessageCreate(evt *eventsystem.EventData) {
 
 	m := evt.MessageCreate()
-	channel := bot.State.Channel(true, m.ChannelID)
+	if m.GuildID == 0 {
+		return // private channel
+	}
 
+	channel := bot.State.Channel(true, m.ChannelID)
 	if channel == nil {
 		log.WithField("channel", m.ChannelID).Warn("Channel not in state")
 		return
 	}
 
-	if channel.IsPrivate() {
-		return
-	}
-
 	config, err := BotCachedFetchGuildConfig(evt.Context(), channel.Guild)
 	if err != nil {
 		log.WithError(err).WithField("guild", channel.Guild.ID).Error("Failed retrieving config")

stdcommands/reverse/reverse.go

@@ -2,7 +2,6 @@ package reverse
 
 import (
 	"github.com/jonas747/dcmd"
-	"github.com/jonas747/discordgo"
 	"github.com/jonas747/yagpdb/automod_legacy"
 	"github.com/jonas747/yagpdb/commands"
 )
@@ -28,9 +27,9 @@ var Command = &commands.YAGCommand{
 		cop := *data.Msg
 		cop.Content = out
 
-		if data.CS.Type == discordgo.ChannelTypeGuildText {
+		if data.GS != nil {
 
-			if automod_legacy.CheckMessageForBadInvites(out, data.CS.Guild.ID) {
+			if automod_legacy.CheckMessageForBadInvites(out, data.GS.ID) {
 				return data.Msg.Author.Mention() + " tried to use the reverse command to send a invite to another server :(", nil
 			}