From fb2b7281e019de9dbd1eb307d9a2ed655c165187 Mon Sep 17 00:00:00 2001
From: Jiralite <33201955+Jiralite@users.noreply.github.com>
Date: Thu, 30 Oct 2025 21:01:17 +0000
Subject: [PATCH] fix(GuildMember): joinedAt possibly being NaN
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: TÆMBØØ <69138346+TAEMBO@users.noreply.github.com>
---
 .../discord.js/src/structures/GuildMember.js   | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/packages/discord.js/src/structures/GuildMember.js b/packages/discord.js/src/structures/GuildMember.js
index 3abf3f911..0bfa5512d 100644
--- a/packages/discord.js/src/structures/GuildMember.js
+++ b/packages/discord.js/src/structures/GuildMember.js
@@ -24,12 +24,6 @@ class GuildMember extends Base {
      */
     this.guild = guild;
 
-    /**
-     * The timestamp the member joined the guild at
-     * @type {?number}
-     */
-    this.joinedTimestamp = null;
-
     /**
      * The last timestamp this member started boosting the guild
      * @type {?number}
@@ -95,7 +89,17 @@ class GuildMember extends Base {
       this.banner ??= null;
     }
 
-    if ('joined_at' in data) this.joinedTimestamp = Date.parse(data.joined_at);
+    if ('joined_at' in data) {
+      /**
+       * The timestamp the member joined the guild at
+       *
+       * @type {?number}
+       */
+      this.joinedTimestamp = data.joined_at && Date.parse(data.joined_at);
+    } else {
+      this.joinedTimestamp ??= null;
+    }
+
     if ('premium_since' in data) {
       this.premiumSinceTimestamp = data.premium_since ? Date.parse(data.premium_since) : null;
     }