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

Change how presences are handled

Browse Source
This commit is contained in:
Amish Shah
2016-09-25 14:15:58 +01:00
parent 0e8f1bef97
commit 03651fd6e3
11 changed files with 169 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/client/Client.js
View File

@@ -9,6 +9,7 @@ const ClientVoiceManager = require('./voice/ClientVoiceManager');
const WebSocketManager = require('./websocket/WebSocketManager');
const ActionsManager = require('./actions/ActionsManager');
const Collection = require('../util/Collection');
const Presence = require('../structures/Presence');
/**
* The starting point for making a Discord Bot.
@@ -102,6 +103,13 @@ class Client extends EventEmitter {
*/
this.channels = new Collection();
/**
* A Collection of presences for friends of the logged in user.
* <warn>This is only present for user accounts, not bot accounts!</warn>
* @type {Collection<string, Presence>}
*/
this.presences = new Collection();
/**
* The authorization token for the logged in user/bot.
* @type {?string}
@@ -333,6 +341,14 @@ class Client extends EventEmitter {
clearInterval(interval);
this._intervals.delete(interval);
}
_setPresence(id, presence) {
if (this.presences.get(id)) {
this.presences.get(id).update(presence);
return;
}
this.presences.set(id, new Presence(presence));
}
}
module.exports = Client;

6
src/client/actions/GuildSync.js
View File

@@ -8,11 +8,7 @@ class GuildSync extends Action {
if (guild) {
data.presences = data.presences || [];
for (const presence of data.presences) {
const user = client.users.get(presence.user.id);
if (user) {
user.status = presence.status;
user.game = presence.game;
}
guild._setPresence(presence.user.id, presence);
}
data.members = data.members || [];

28
src/client/websocket/packets/handlers/PresenceUpdate.js
View File

@@ -19,9 +19,9 @@ class PresenceUpdateHandler extends AbstractHandler {
}
if (guild) {
const memberInGuild = guild.members.get(user.id);
if (!memberInGuild && data.status !== 'offline') {
const member = guild._addMember({
let member = guild.members.get(user.id);
if (!member && data.status !== 'offline') {
member = guild._addMember({
user,
roles: data.roles,
deaf: false,
@@ -29,26 +29,12 @@ class PresenceUpdateHandler extends AbstractHandler {
}, false);
client.emit(Constants.Events.GUILD_MEMBER_AVAILABLE, guild, member);
}
guild._setPresence(user.id, data);
}
data.user.username = data.user.username || user.username;
data.user.id = data.user.id || user.id;
data.user.discriminator = data.user.discriminator || user.discriminator;
data.user.status = data.status || user.status;
data.user.game = data.game;
const same = data.user.username === user.username &&
data.user.id === user.id &&
data.user.discriminator === user.discriminator &&
data.user.avatar === user.avatar &&
data.user.status === user.status &&
JSON.stringify(data.user.game) === JSON.stringify(user.game);
if (!same) {
const oldUser = cloneObject(user);
user.patch(data.user);
client.emit(Constants.Events.PRESENCE_UPDATE, oldUser, user);
}
const oldUser = cloneObject(user);
user.patch(data.user);
client.emit(Constants.Events.PRESENCE_UPDATE, oldUser, user);
}
}

6
src/client/websocket/packets/handlers/Ready.js
View File

@@ -16,6 +16,12 @@ class ReadyHandler extends AbstractHandler {
for (const guild of data.guilds) client.dataManager.newGuild(guild);
for (const privateDM of data.private_channels) client.dataManager.newChannel(privateDM);
data.presences = data.presences || [];
for (const presence of data.presences) {
client.dataManager.newUser(presence.user);
client._setPresence(presence.user.id, presence);
}
if (!client.user.bot) client.setInterval(client.syncGuilds.bind(client), 30000);
client.once('ready', client.syncGuilds.bind(client));