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

Cleanup Part 2: Electric Boogaloo (Reloaded) (#594)

Browse Source 
* Cleanup Part 2: Electric Boogaloo (Reloaded)

* Moar cleanup

* Tweak NOT_A_PERMISSION error
This commit is contained in:
Schuyler Cebulskie
2016-09-04 05:08:09 -04:00
committed by Amish Shah
parent 5a9c42061f
commit 0b908f5bce
95 changed files with 946 additions and 1526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/structures/User.js
View File

@@ -8,9 +8,7 @@ const Constants = require('../util/Constants');
class User {
constructor(client, data) {
this.client = client;
if (data) {
this.setup(data);
}
if (data) this.setup(data);
}
setup(data) {
@@ -72,9 +70,7 @@ class User {
* @readonly
*/
get avatarURL() {
if (!this.avatar) {
return null;
}
if (!this.avatar) return null;
return Constants.Endpoints.avatar(this.id, this.avatar);
}
@@ -89,28 +85,23 @@ class User {
/**
* Checks if the user is equal to another. It compares username, ID, discriminator, status and the game being played.
* It is recommended to compare equality by using `user.id === user2.id` unless you want to compare all properties.
* @param {User} user the user to compare
* @param {User} user The user to compare
* @returns {boolean}
*/
equals(user) {
let base = user &&
let equal = user &&
this.username === user.username &&
this.id === user.id &&
this.discriminator === user.discriminator &&
this.avatar === user.avatar &&
this.bot === Boolean(user.bot);
if (base) {
if (user.status) {
base = this.status === user.status;
}
if (user.game) {
base = this.game === user.game;
}
if (equal) {
if (user.status) equal = this.status === user.status;
if (equal && user.game) equal = this.game === user.game;
}
return base;
return equal;
}
sendMessage() {