From 5071477172053ef9d274aaab16cec0cfbd25b860 Mon Sep 17 00:00:00 2001
From: Lewdcario <isabellafj97@gmail.com>
Date: Tue, 5 Jun 2018 20:14:34 -0500
Subject: [PATCH] fix(GuildMember): account for joinedTimestamp as well

---
 src/structures/GuildMember.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/structures/GuildMember.js b/src/structures/GuildMember.js
index 7d30d8609..e9c5dc663 100644
--- a/src/structures/GuildMember.js
+++ b/src/structures/GuildMember.js
@@ -27,6 +27,13 @@ class GuildMember extends Base {
      */
     this.user = {};
 
+    /**
+     * The timestamp the member joined the guild at
+     * @type {?number}
+     * @name GuildMember#joinedTimestamp
+     */
+    this.joinedTimestamp = null;
+
     /**
      * The ID of the last message sent by the member in their guild, if one was sent
      * @type {?Snowflake}
@@ -64,11 +71,6 @@ class GuildMember extends Base {
      */
     if (typeof data.nick !== 'undefined') this.nickname = data.nick;
 
-    /**
-     * The timestamp the member joined the guild at, if the data was received
-     * @type {?number}
-     * @name GuildMember#joinedTimestamp
-     */
     if (data.joined_at) this.joinedTimestamp = new Date(data.joined_at).getTime();
 
     if (data.user) this.user = this.guild.client.users.add(data.user);
@@ -147,7 +149,7 @@ class GuildMember extends Base {
   get voiceChannelID() { return this.voiceState.channel_id; }
 
   /**
-   * The time this member joined the guild, if the data was received
+   * The time this member joined the guild
    * @type {?Date}
    * @readonly
    */