From 1f440c31730ba4541c6c6d07c63521e54e52c835 Mon Sep 17 00:00:00 2001
From: Wim <wim@42.be>
Date: Sat, 5 Feb 2022 22:54:41 +0100
Subject: [PATCH] Add more debug options for discord

debuglevel=1 dumps every received discord event
debuglevel=2 dumps every discord event we are sending to discord (also
logs sensitive information)
---
 bridge/discord/discord.go  |  5 ++++-
 bridge/discord/handlers.go | 10 +++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/bridge/discord/discord.go b/bridge/discord/discord.go
index 9b9065f8..4e86835b 100644
--- a/bridge/discord/discord.go
+++ b/bridge/discord/discord.go
@@ -89,6 +89,9 @@ func (b *Bdiscord) Connect() error {
 	b.c.AddHandler(b.messageDeleteBulk)
 	b.c.AddHandler(b.memberAdd)
 	b.c.AddHandler(b.memberRemove)
+	if b.GetInt("debuglevel") == 1 {
+		b.c.AddHandler(b.messageEvent)
+	}
 	// Add privileged intent for guild member tracking. This is needed to track nicks
 	// for display names and @mention translation
 	b.c.Identify.Intents = discordgo.MakeIntent(discordgo.IntentsAllWithoutPrivileged |
@@ -167,7 +170,7 @@ func (b *Bdiscord) Connect() error {
 		return fmt.Errorf("use of removed WebhookURL setting")
 	}
 
-	if b.GetInt("debuglevel") > 0 {
+	if b.GetInt("debuglevel") == 2 {
 		b.Log.Debug("enabling even more discord debug")
 		b.c.Debug = true
 	}
diff --git a/bridge/discord/handlers.go b/bridge/discord/handlers.go
index 81a0e11c..caefc6c3 100644
--- a/bridge/discord/handlers.go
+++ b/bridge/discord/handlers.go
@@ -1,7 +1,10 @@
 package bdiscord
 
 import (
+	"fmt"
+
 	"github.com/42wim/matterbridge/bridge/config"
+	"github.com/davecgh/go-spew/spew"
 	"github.com/matterbridge/discordgo"
 )
 
@@ -31,6 +34,10 @@ func (b *Bdiscord) messageDeleteBulk(s *discordgo.Session, m *discordgo.MessageD
 	}
 }
 
+func (b *Bdiscord) messageEvent(s *discordgo.Session, m *discordgo.Event) {
+	b.Log.Debug(spew.Sdump(m.Struct))
+}
+
 func (b *Bdiscord) messageTyping(s *discordgo.Session, m *discordgo.TypingStart) {
 	if !b.GetBool("ShowUserTyping") {
 		return
@@ -82,8 +89,9 @@ func (b *Bdiscord) messageCreate(s *discordgo.Session, m *discordgo.MessageCreat
 
 	rmsg := config.Message{Account: b.Account, Avatar: "https://cdn.discordapp.com/avatars/" + m.Author.ID + "/" + m.Author.Avatar + ".jpg", UserID: m.Author.ID, ID: m.ID}
 
+	b.Log.Debugf("== Receiving event %#v", m.Message)
+
 	if m.Content != "" {
-		b.Log.Debugf("== Receiving event %#v", m.Message)
 		m.Message.Content = b.replaceChannelMentions(m.Message.Content)
 		rmsg.Text, err = m.ContentWithMoreMentionsReplaced(b.c)
 		if err != nil {