From a3c0d43fc58580206e595df5f766e6ecac2cfa1b Mon Sep 17 00:00:00 2001
From: Xevion <xevion@xevion.dev>
Date: Mon, 29 Jan 2024 03:17:39 -0600
Subject: [PATCH] Prevent fatal crashes from DM commands

---
 helpers.go | 8 ++++++++
 main.go    | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/helpers.go b/helpers.go
index d1d1460..e2fb6fb 100644
--- a/helpers.go
+++ b/helpers.go
@@ -338,3 +338,11 @@ func NewCalendar() *ics.Calendar {
 	c.SetProductId("-//xevion//Banner Discord Bot//EN")
 	return c
 }
+
+func GetUsername(interaction *discordgo.InteractionCreate) string {
+	if interaction.Member != nil {
+		return interaction.Member.User.Username
+	}
+
+	return interaction.User.Username
+}
diff --git a/main.go b/main.go
index 945923c..42890f2 100644
--- a/main.go
+++ b/main.go
@@ -159,7 +159,7 @@ func main() {
 			}
 
 			// Log command invocation
-			log.Info().Str("name", name).Str("user", interaction.Member.User.Username).Dict("options", options).Msg("Command Invoked")
+			log.Info().Str("name", name).Str("user", GetUsername(interaction)).Dict("options", options).Msg("Command Invoked")
 
 			// Call handler
 			err := handler(internalSession, interaction)