-
Notifications
You must be signed in to change notification settings - Fork 3
✨feat: prefer guild nickname/global name when resolving users #2279
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -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) | ||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||
|
Comment on lines
+142
to
+157
|
||||||||||||||||||||||||||||||||
| 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) | |
| } | |
| } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There’s duplicated
member.User != nilguarding in the name resolution (GlobalNameandUsernamefallbacks). This can be simplified (e.g., assignu := member.Useronce and check it once) to reduce repetition and make the fallback order easier to read/maintain.