diamondburned/arikawa
1
0
Fork 0
mirror of https://github.com/diamondburned/arikawa.git synced 2025-02-10 13:33:14 +00:00
Code Issues Releases Activity

discord: Support the new username system (#393)

Browse source 
* add support for the new username system

* rename User.GlobalName to DisplayName
This commit is contained in:
sam 2023-06-08 02:56:07 +02:00 committed by GitHub
parent 73986699b7
commit 13a6bf10cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
discord/user.go
View file

@ -8,8 +8,9 @@ import (
type User struct {
ID UserID `json:"id"`
Username string `json:"username"`
Discriminator string `json:"discriminator"`
Discriminator string `json:"discriminator"` // This is "0" if the user has migrated to the new username system.
Avatar Hash `json:"avatar"`
DisplayName string `json:"global_name"`
// These fields may be omitted
@ -42,6 +43,10 @@ func (u User) Mention() string {
// Tag returns a tag of the user.
func (u User) Tag() string {
if u.Discriminator == "0" {
return u.Username
}
return u.Username + "#" + u.Discriminator
}
@ -62,11 +67,16 @@ func (u User) AvatarURLWithType(t ImageType) string {
return ""
}
disc, err := strconv.Atoi(u.Discriminator)
if err != nil { // this should never happen
return ""
var picNo string
if u.Discriminator != "0" {
disc, err := strconv.Atoi(u.Discriminator)
if err != nil { // this should never happen
return ""
}
picNo = strconv.Itoa(disc % 5)
} else {
picNo = strconv.FormatUint(uint64(u.ID>>22)%5, 10)
}
picNo := strconv.Itoa(disc % 5)
return "https://cdn.discordapp.com/embed/avatars/" + picNo + ".png"
}