From f0cf07d16cddfbbe1029b0af39ba6f5fe4ae89a0 Mon Sep 17 00:00:00 2001
From: ITOH <to@itoh.at>
Date: Wed, 26 May 2021 20:59:45 +0200
Subject: [PATCH 1/3] change: discriminator to number

---
 src/structures/member.ts | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/structures/member.ts b/src/structures/member.ts
index d83f6ca4f..0abcf0554 100644
--- a/src/structures/member.ts
+++ b/src/structures/member.ts
@@ -20,7 +20,7 @@ import { iconBigintToHash, iconHashToBigInt } from "../util/hash.ts";
 import { createNewProp } from "../util/utils.ts";
 import { DiscordenoGuild } from "./guild.ts";
 
-const MEMBER_SNOWFLAKES = ["id", "discriminator"];
+const MEMBER_SNOWFLAKES = ["id"];
 
 export const memberToggles = {
   /** Whether the user belongs to an OAuth2 application */
@@ -151,6 +151,12 @@ export async function createDiscordenoMember(
       const transformed = value ? iconHashToBigInt(value) : undefined;
       if (transformed?.animated) bitfield |= memberToggles.animatedAvatar;
       props.avatar = createNewProp(transformed?.bigint);
+      continue;
+    }
+
+    if (key === "discriminator") {
+      props.discriminator = createNewProp(Number(value));
+      continue;
     }
 
     props[key] = createNewProp(
@@ -224,7 +230,9 @@ export interface DiscordenoMember extends Omit<User, "discriminator" | "id" | "a
   /** Get the nickname or the username if no nickname */
   name(guildId: bigint): string;
   /** Get the guild member object for the specified guild */
-  guildMember(guildId: bigint):
+  guildMember(
+    guildId: bigint
+  ):
     | (Omit<GuildMember, "joinedAt" | "premiumSince" | "roles"> & {
         joinedAt?: number;
         premiumSince?: number;

From f46be53f6286de7894a36c34a530e8108125170e Mon Sep 17 00:00:00 2001
From: itohatweb <itohatweb@users.noreply.github.com>
Date: Wed, 26 May 2021 19:00:20 +0000
Subject: [PATCH 2/3] change: prettier code

---
 src/structures/member.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/structures/member.ts b/src/structures/member.ts
index 0abcf0554..300437919 100644
--- a/src/structures/member.ts
+++ b/src/structures/member.ts
@@ -230,9 +230,7 @@ export interface DiscordenoMember extends Omit<User, "discriminator" | "id" | "a
   /** Get the nickname or the username if no nickname */
   name(guildId: bigint): string;
   /** Get the guild member object for the specified guild */
-  guildMember(
-    guildId: bigint
-  ):
+  guildMember(guildId: bigint):
     | (Omit<GuildMember, "joinedAt" | "premiumSince" | "roles"> & {
         joinedAt?: number;
         premiumSince?: number;

From c6fc8b40a9441b29407c45a4fc6a269ea207c17c Mon Sep 17 00:00:00 2001
From: ITOH <to@itoh.at>
Date: Thu, 27 May 2021 12:27:38 +0200
Subject: [PATCH 3/3] number now

---
 src/handlers/misc/USER_UPDATE.ts  | 2 +-
 src/helpers/members/avatar_url.ts | 2 +-
 src/structures/member.ts          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/handlers/misc/USER_UPDATE.ts b/src/handlers/misc/USER_UPDATE.ts
index 9c85b8759..19c29bab7 100644
--- a/src/handlers/misc/USER_UPDATE.ts
+++ b/src/handlers/misc/USER_UPDATE.ts
@@ -15,7 +15,7 @@ export async function handleUserUpdate(data: DiscordGatewayPayload) {
   // Update username
   member.username = userData.username;
   // Update discriminator
-  member.discriminator = BigInt(userData.discriminator);
+  member.discriminator = Number(userData.discriminator);
 
   // Check if a avatar is available
   const hash = userData.avatar ? iconHashToBigInt(userData.avatar) : undefined;
diff --git a/src/helpers/members/avatar_url.ts b/src/helpers/members/avatar_url.ts
index a49e4a1ad..c6c950cdc 100644
--- a/src/helpers/members/avatar_url.ts
+++ b/src/helpers/members/avatar_url.ts
@@ -7,7 +7,7 @@ import { formatImageURL } from "../../util/utils.ts";
 /** The users custom avatar or the default avatar if you don't have a member object. */
 export function avatarURL(
   userId: bigint,
-  discriminator: bigint,
+  discriminator: number,
   options: {
     avatar?: string | bigint;
     size?: DiscordImageSize;
diff --git a/src/structures/member.ts b/src/structures/member.ts
index 0abcf0554..f16670d5c 100644
--- a/src/structures/member.ts
+++ b/src/structures/member.ts
@@ -196,7 +196,7 @@ export interface DiscordenoMember extends Omit<User, "discriminator" | "id" | "a
   /** The user's id */
   id: bigint;
   /** The user's 4-digit discord-tag */
-  discriminator: bigint;
+  discriminator: number;
   /** The avatar in bigint format. */
   avatar: bigint;
   /** The guild related data mapped by guild id */