From 3a535e954c6917863b9fdca87161851af582f3d2 Mon Sep 17 00:00:00 2001 From: JohnyTheCarrot Date: Wed, 27 Sep 2023 13:42:42 +0200 Subject: [PATCH 1/2] fix: accept non integer user IDs --- src/utils/getAvatar.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/utils/getAvatar.ts b/src/utils/getAvatar.ts index ff1283e..d7ce12d 100644 --- a/src/utils/getAvatar.ts +++ b/src/utils/getAvatar.ts @@ -57,9 +57,11 @@ function getAvatar( user: APIUser, { animated = false, size = 80, forceDefault = false }: GetAvatarOptions = {} ): string { - const defaultAvatar = `https://cdn.discordapp.com/embed/avatars/${ - Number(BigInt(user.id) >> 22n) % 6 - }.png`; + const defaultAvatarIndex = isNaN(parseInt(user.id)) + ? 0 + : Number(BigInt(user.id) >> 22n) % 6; + + const defaultAvatar = `https://cdn.discordapp.com/embed/avatars/${defaultAvatarIndex}.png`; const avatarUrl = getAvatarProperty(user, size); From 24f363f2540fdbb88c9b1338413e766b95ff5ebc Mon Sep 17 00:00:00 2001 From: JohnyTheCarrot Date: Thu, 28 Sep 2023 14:42:32 +0200 Subject: [PATCH 2/2] fix bug --- src/utils/getAvatar.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/getAvatar.ts b/src/utils/getAvatar.ts index d7ce12d..f8f1c67 100644 --- a/src/utils/getAvatar.ts +++ b/src/utils/getAvatar.ts @@ -57,7 +57,7 @@ function getAvatar( user: APIUser, { animated = false, size = 80, forceDefault = false }: GetAvatarOptions = {} ): string { - const defaultAvatarIndex = isNaN(parseInt(user.id)) + const defaultAvatarIndex = isNaN(Number(user.id)) ? 0 : Number(BigInt(user.id) >> 22n) % 6;