From 45563a0c110d53f31153eda26421f9507fa0f112 Mon Sep 17 00:00:00 2001
From: Atridad Lahiji <88056492+atridadl@users.noreply.github.com>
Date: Wed, 27 Dec 2023 17:13:32 -0700
Subject: [PATCH] fix hs

---
 main.go | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/main.go b/main.go
index 53557e8..573805f 100644
--- a/main.go
+++ b/main.go
@@ -354,9 +354,20 @@ func (h *handler) cmdHS(ctx context.Context, data cmdroute.CommandData) *api.Int
 	if err := data.Options.Unmarshal(&options); err != nil {
 		return errorResponse(err)
 	}
+	
+	member := data.Event.Member
+	user := data.Event.User
+
+	var nameToSend string
+
+	if member != nil {
+		nameToSend = member.User.DisplayName
+	} else {
+		nameToSend = user.DisplayName
+	}
 
 	return &api.InteractionResponseData{
-		Content: option.NewNullableString(options.Arg + " was " + data.Event.User.DisplayName + "'s nickname in highschool!"),
+		Content: option.NewNullableString(options.Arg + " was " + nameToSend + "'s nickname in highschool!"),
 	}
 }