Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-10 00:23:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(GuildMember): mark joined as nullable

Browse Source
This commit is contained in:
Lewdcario
2018-06-09 15:15:08 -05:00
parent caa4104b95
commit ecf6e2b62d
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/structures/GuildMember.js
View File

@@ -2,7 +2,7 @@ const TextBasedChannel = require('./interfaces/TextBasedChannel');
const Role = require('./Role');
const Permissions = require('../util/Permissions');
const Collection = require('../util/Collection');
const Presence = require('./Presence').Presence;
const { Presence } = require('./Presence');
const util = require('util');
/**
@@ -31,6 +31,12 @@ class GuildMember {
*/
this.user = {};
/**
* The timestamp this member joined the guild at
* @type {number}
*/
this.joinedTimestamp = null;
this._roles = [];
if (data) this.setup(data);
@@ -96,11 +102,7 @@ class GuildMember {
*/
this.nickname = data.nick || null;
/**
* The timestamp this member joined the guild at
* @type {number}
*/
this.joinedTimestamp = new Date(data.joined_at).getTime();
if (data.joined_at) this.joinedTimestamp = new Date(data.joined_at).getTime();
this.user = data.user;
this._roles = data.roles;
@@ -112,7 +114,7 @@ class GuildMember {
* @readonly
*/
get joinedAt() {
return new Date(this.joinedTimestamp);
return this.joinedTimestamp ? new Date(this.joinedTimestamp) : null;
}
/**