mirror of
https://github.com/discordjs/discord.js.git
synced 2026-03-14 02:23:31 +01:00
Cleanup Part 2: Electric Boogaloo (Reloaded) (#594)
* Cleanup Part 2: Electric Boogaloo (Reloaded) * Moar cleanup * Tweak NOT_A_PERMISSION error
This commit is contained in:
committed by
Amish Shah
parent
5a9c42061f
commit
0b908f5bce
@@ -3,21 +3,16 @@ const Constants = require('../../../../util/Constants');
|
||||
const cloneObject = require('../../../../util/CloneObject');
|
||||
|
||||
class PresenceUpdateHandler extends AbstractHandler {
|
||||
|
||||
handle(packet) {
|
||||
const data = packet.d;
|
||||
const client = this.packetManager.client;
|
||||
const data = packet.d;
|
||||
let user = client.users.get(data.user.id);
|
||||
const guild = client.guilds.get(data.guild_id);
|
||||
|
||||
function makeUser(newUser) {
|
||||
return client.dataManager.newUser(newUser);
|
||||
}
|
||||
|
||||
// step 1
|
||||
if (!user) {
|
||||
if (data.user.username) {
|
||||
user = makeUser(data.user);
|
||||
user = client.dataManager.newUser(data.user);
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
@@ -39,7 +34,6 @@ class PresenceUpdateHandler extends AbstractHandler {
|
||||
data.user.username = data.user.username || user.username;
|
||||
data.user.id = data.user.id || user.id;
|
||||
data.user.discriminator = data.user.discriminator || user.discriminator;
|
||||
|
||||
// comment out avatar patching as it causes bugs (see #297)
|
||||
// data.user.avatar = data.user.avatar || user.avatar;
|
||||
data.user.status = data.status || user.status;
|
||||
@@ -58,24 +52,20 @@ class PresenceUpdateHandler extends AbstractHandler {
|
||||
client.emit(Constants.Events.PRESENCE_UPDATE, oldUser, user);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Emitted whenever a user changes one of their details or starts/stop playing a game
|
||||
*
|
||||
* @event Client#presenceUpdate
|
||||
* @param {User} oldUser the user before the presence update
|
||||
* @param {User} newUser the user after the presence update
|
||||
*/
|
||||
* Emitted whenever a user changes one of their details or starts/stop playing a game
|
||||
* @event Client#presenceUpdate
|
||||
* @param {User} oldUser The user before the presence update
|
||||
* @param {User} newUser The user after the presence update
|
||||
*/
|
||||
|
||||
/**
|
||||
* Emitted whenever a member becomes available in a large Guild
|
||||
*
|
||||
* @event Client#guildMemberAvailable
|
||||
* @param {Guild} guild The guild that the member became available in
|
||||
* @param {GuildMember} member the member that became available
|
||||
*/
|
||||
|
||||
* Emitted whenever a member becomes available in a large Guild
|
||||
* @event Client#guildMemberAvailable
|
||||
* @param {Guild} guild The guild that the member became available in
|
||||
* @param {GuildMember} member The member that became available
|
||||
*/
|
||||
|
||||
module.exports = PresenceUpdateHandler;
|
||||
|
||||
Reference in New Issue
Block a user