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

Clean up recent User changes a bit

Browse Source
This commit is contained in:
Schuyler Cebulskie
2016-09-11 23:34:09 -04:00
parent 032d6613f7
commit d7bcf9564f
1 changed files with 7 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/structures/User.js
View File

@@ -1,10 +1,6 @@
const TextBasedChannel = require('./interface/TextBasedChannel');
const Constants = require('../util/Constants');
function defined(p) {
return typeof p !== 'undefined';
}
/**
* Represents a User on Discord.
* @implements {TextBasedChannel}
@@ -21,24 +17,6 @@ class User {
if (data) this.setup(data);
}
patch(data) {
for (const item of ['id', 'username', 'discriminator', 'game', 'avatar']) {
if (defined(data[item])) {
this[item] = data[item];
}
}
if (defined[data.bot]) {
this.bot = data.bot;
} else {
this.bot = this.bot || false;
}
if (defined[data.status]) {
this.status = data.status;
} else {
this.status = this.status || 'offline';
}
}
setup(data) {
/**
* The ID of the User
@@ -68,7 +46,7 @@ class User {
* Whether or not the User is a Bot.
* @type {boolean}
*/
this.bot = data.bot || false;
this.bot = Boolean(data.bot);
/**
* The status of the user:
@@ -95,6 +73,12 @@ class User {
this.game = data.game;
}
patch(data) {
for (const prop of ['id', 'username', 'discriminator', 'status', 'game', 'avatar', 'bot']) {
if (typeof data[prop] !== 'undefined') this[prop] = data[prop];
}
}
/**
* The time the user was created
* @readonly