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

refactor: new node features (#5132)

Browse Source 
Co-authored-by: Antonio Román <kyradiscord@gmail.com>
This commit is contained in:
Sugden
2021-06-30 21:40:33 +01:00
committed by GitHub
parent f108746c15
commit 1e8f01253e
68 changed files with 305 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/structures/GuildMember.js
View File

@@ -85,7 +85,7 @@ class GuildMember extends Base {
if ('nick' in data) this.nickname = data.nick;
if ('joined_at' in data) this.joinedTimestamp = new Date(data.joined_at).getTime();
if ('premium_since' in data) {
this.premiumSinceTimestamp = data.premium_since === null ? null : new Date(data.premium_since).getTime();
this.premiumSinceTimestamp = data.premium_since ? new Date(data.premium_since).getTime() : null;
}
if ('roles' in data) this._roles = data.roles;
this.pending = data.pending ?? false;
@@ -121,8 +121,7 @@ class GuildMember extends Base {
* @readonly
*/
get lastMessage() {
const channel = this.guild.channels.cache.get(this.lastMessageChannelID);
return (channel && channel.messages.cache.get(this.lastMessageID)) || null;
return this.guild.channels.resolve(this.lastMessageChannelID)?.messages.resolve(this.lastMessageID) ?? null;
}
/**
@@ -133,7 +132,7 @@ class GuildMember extends Base {
get voice() {
if (!Structures) Structures = require('../util/Structures');
const VoiceState = Structures.get('VoiceState');
return this.guild.voiceStates.cache.get(this.id) || new VoiceState(this.guild, { user_id: this.id });
return this.guild.voiceStates.cache.get(this.id) ?? new VoiceState(this.guild, { user_id: this.id });
}
/**
@@ -163,7 +162,7 @@ class GuildMember extends Base {
if (!Structures) Structures = require('../util/Structures');
const Presence = Structures.get('Presence');
return (
this.guild.presences.cache.get(this.id) ||
this.guild.presences.cache.get(this.id) ??
new Presence(this.client, {
user: {
id: this.id,
@@ -179,8 +178,7 @@ class GuildMember extends Base {
* @readonly
*/
get displayColor() {
const role = this.roles.color;
return (role && role.color) || 0;
return this.roles.color?.color ?? 0;
}
/**
@@ -189,8 +187,7 @@ class GuildMember extends Base {
* @readonly
*/
get displayHexColor() {
const role = this.roles.color;
return (role && role.hexColor) || '#000000';
return this.roles.color?.hexColor ?? '#000000';
}
/**
@@ -208,7 +205,7 @@ class GuildMember extends Base {
* @readonly
*/
get displayName() {
return this.nickname || this.user.username;
return this.nickname ?? this.user.username;
}
/**