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

Emit -ed and fixed presence vs. userUpdated check

Browse Source
This commit is contained in:
abalabahaha
2015-11-22 17:15:49 -08:00
parent 213379e669
commit c9497a0f75
27 changed files with 49 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Client/Client.js
View File

@@ -933,4 +933,4 @@ var Client = (function (_EventEmitter) {
return Client;
})(EventEmitter);
module.exports = Client;
module.exports = Client;

2
lib/Client/ConnectionState.js
View File

@@ -4,4 +4,4 @@ exports.IDLE = 0;
exports.LOGGING_IN = 1;
exports.LOGGED_IN = 2;
exports.READY = 3;
exports.DISCONNECTED = 4;
exports.DISCONNECTED = 4;

10
lib/Client/InternalClient.js
View File

@@ -1556,14 +1556,14 @@ var InternalClient = (function () {
var presenceUser = new User(data.user, client);
if (presenceUser.equalsStrict(user)) {
if (presenceUser.equals(user)) {
// a real presence update
client.emit("presence", user, data.status, data.game_id);
user.status = data.status;
user.gameID = data.game_id;
} else {
// a name change or avatar change
client.emit("userUpdate", user, presenceUser);
client.emit("userUpdated", user, presenceUser);
self.users.update(user, presenceUser);
}
} else {
@@ -1583,14 +1583,14 @@ var InternalClient = (function () {
} else {
user.typing.since = Date.now();
user.typing.channel = channel;
client.emit("userTypingStart", user, channel);
client.emit("userTypingStarted", user, channel);
}
setTimeout(function () {
if (Date.now() - user.typing.since > 5500) {
// they haven't typed since
user.typing.since = null;
user.typing.channel = null;
client.emit("userTypingStop", user, channel);
client.emit("userTypingStopped", user, channel);
}
}, 6000);
} else {
@@ -1631,4 +1631,4 @@ var InternalClient = (function () {
return InternalClient;
})();
module.exports = InternalClient;
module.exports = InternalClient;

2
lib/Client/Resolver/Resolver.js
View File

@@ -236,4 +236,4 @@ var Resolver = (function () {
return Resolver;
})();
module.exports = Resolver;
module.exports = Resolver;