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

Update error logging

Browse Source
This commit is contained in:
Dusty Pianalto 2020-06-03 19:47:50 -08:00
parent 8ca1580822
commit 60c6cc7d36
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
djpianalto.com/goff/events/message_events.go
View File

@ -2,6 +2,7 @@ package events
import ( import (
"fmt" "fmt"
"log"
"djpianalto.com/goff/djpianalto.com/goff/utils" "djpianalto.com/goff/djpianalto.com/goff/utils"
"github.com/bwmarrin/discordgo" "github.com/bwmarrin/discordgo"
@ -10,7 +11,7 @@ import (
func OnMessageUpdate(session *discordgo.Session, m *discordgo.MessageUpdate) { func OnMessageUpdate(session *discordgo.Session, m *discordgo.MessageUpdate) {
defer func() { defer func() {
if r := recover(); r != nil { if r := recover(); r != nil {
fmt.Println("Recovered from panic in OnMessageUpdate", r) log.Println("Recovered from panic in OnMessageUpdate", r)
} }
}() }()
msg := m.BeforeUpdate msg := m.BeforeUpdate
@ -25,6 +26,7 @@ func OnMessageUpdate(session *discordgo.Session, m *discordgo.MessageUpdate) {
} }
channel, err := session.State.Channel(msg.ChannelID) channel, err := session.State.Channel(msg.ChannelID)
if err != nil { if err != nil {
log.Println(err)
return return
} }
embed := &discordgo.MessageEmbed{ embed := &discordgo.MessageEmbed{
@ -42,10 +44,14 @@ func OnMessageUpdate(session *discordgo.Session, m *discordgo.MessageUpdate) {
func OnMessageDelete(session *discordgo.Session, m *discordgo.MessageDelete) { func OnMessageDelete(session *discordgo.Session, m *discordgo.MessageDelete) {
defer func() { defer func() {
if r := recover(); r != nil { if r := recover(); r != nil {
fmt.Println("Recovered from panic in OnMessageDelete", r) log.Println("Recovered from panic in OnMessageDelete", r)
} }
}() }()
msg := m.BeforeDelete msg := m.BeforeDelete
if msg == nil {
log.Printf("Message Deleted but the original message was not in my cache so we are ignoring it.\nMessage ID: %v\nGuild ID: %v\nChannel ID: %v\n", m.ID, m.GuildID, m.ChannelID)
return
}
if msg.Author.Bot { if msg.Author.Bot {
return return
} }
@ -57,20 +63,22 @@ func OnMessageDelete(session *discordgo.Session, m *discordgo.MessageDelete) {
} }
channel, err := session.State.Channel(msg.ChannelID) channel, err := session.State.Channel(msg.ChannelID)
if err != nil { if err != nil {
log.Println(err)
return return
} }
desc := ""
al, err := session.GuildAuditLog(msg.GuildID, "", "", 72, 1) al, err := session.GuildAuditLog(msg.GuildID, "", "", 72, 1)
if err != nil { if err != nil {
fmt.Println(err) log.Println(err)
} } else {
desc := "" for _, log := range al.AuditLogEntries {
for _, log := range al.AuditLogEntries { if log.TargetID == msg.Author.ID && log.Options.ChannelID == msg.ChannelID {
if log.TargetID == msg.Author.ID && log.Options.ChannelID == msg.ChannelID { user, err := session.User(log.UserID)
user, err := session.User(log.UserID) if err == nil {
if err == nil { desc = fmt.Sprintf("**Content:** %v\nIn Channel: %v\nDeleted By: %v", msg.Content, channel.Mention(), user.Mention())
desc = fmt.Sprintf("**Content:** %v\nIn Channel: %v\nDeleted By: %v", msg.Content, channel.Mention(), user.Mention()) }
break
} }
break
} }
} }
if desc == "" { if desc == "" {