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

Attempted merge of userUpdated and presence, along with before/after arguments

Browse Source
This commit is contained in:
abalabahaha
2016-01-13 23:35:37 -08:00
parent fc58a0d5cf
commit 0164d3e7b5
2 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/Client/InternalClient.js
View File

@@ -1591,22 +1591,17 @@ var InternalClient = (function () {
var user = self.users.get("id", data.user.id);
if (user) {
data.user.username = data.user.username || user.username;
data.user.id = data.user.id || user.id;
data.user.avatar = data.user.avatar || user.avatar;
data.user.discriminator = data.user.discriminator || user.discriminator;
data.user.status = data.status || user.status;
data.user.game = data.game || user.game;
var presenceUser = new _StructuresUser2["default"](data.user, client);
if (presenceUser.equals(user)) {
// a real presence update
user.status = data.status;
user.game = data.game;
client.emit("presence", user, data.status, data.game);
} else {
// a name change or avatar change
client.emit("userUpdated", user, presenceUser);
if (!presenceUser.equalsStrict(user)) {
client.emit("presence", user, presenceUser);
self.users.update(user, presenceUser);
}
} else {

14
src/Client/InternalClient.js
View File

@@ -1400,23 +1400,17 @@ export default class InternalClient {
var user = self.users.get("id", data.user.id);
if (user) {
data.user.username = data.user.username || user.username;
data.user.id = data.user.id || user.id;
data.user.avatar = data.user.avatar || user.avatar;
data.user.discriminator = data.user.discriminator || user.discriminator;
data.user.status = data.status || user.status;
data.user.game = data.game || user.game;
var presenceUser = new User(data.user, client);
if (presenceUser.equals(user)) {
// a real presence update
user.status = data.status;
user.game = data.game;
client.emit("presence", user, data.status, data.game);
} else {
// a name change or avatar change
client.emit("userUpdated", user, presenceUser);
if(!presenceUser.equalsStrict(user)) {
client.emit("presence", user, presenceUser);
self.users.update(user, presenceUser);
}