From 69c3cd8c0ab4f963abe8175edd1179dfe738a9e7 Mon Sep 17 00:00:00 2001 From: Michael McCarty Date: Sat, 21 Mar 2026 19:18:02 -0700 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8feat:=20prefer=20guild=20nickname/glob?= =?UTF-8?q?al=20name=20when=20resolving=20users?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/guildstate/slashcmd.go | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/guildstate/slashcmd.go b/src/guildstate/slashcmd.go index 8b538306..a878a8a4 100644 --- a/src/guildstate/slashcmd.go +++ b/src/guildstate/slashcmd.go @@ -139,8 +139,27 @@ func classifySnowflake(s *discordgo.Session, guildID, id string) string { } } + if guildID != "" { + if member, err := s.GuildMember(guildID, id); err == nil && member != nil { + name := strings.TrimSpace(member.Nick) + if name == "" && member.User != nil { + name = strings.TrimSpace(member.User.GlobalName) + } + if name == "" && member.User != nil { + name = strings.TrimSpace(member.User.Username) + } + if name == "" { + return "user" + } + return fmt.Sprintf("user (%s)", name) + } + } + if usr, err := s.User(id); err == nil && usr != nil { - name := strings.TrimSpace(usr.Username) + name := strings.TrimSpace(usr.GlobalName) + if name == "" { + name = strings.TrimSpace(usr.Username) + } if name == "" { return "user" }