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

Rename some events (mainly guild events)

Browse Source
This commit is contained in:
Amish Shah
2016-10-26 15:52:40 +01:00
parent 45632b2eae
commit 35ac80024a
8 changed files with 18 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/client/actions/GuildMemberRemove.js
View File

@@ -17,7 +17,7 @@ class GuildMemberRemoveAction extends Action {
guild.memberCount--; guild.memberCount--;
guild._removeMember(member); guild._removeMember(member);
this.deleted.set(guild.id + data.user.id, member); this.deleted.set(guild.id + data.user.id, member);
if (client.status === Constants.Status.READY) client.emit(Constants.Events.GUILD_MEMBER_REMOVE, guild, member); if (client.status === Constants.Status.READY) client.emit(Constants.Events.GUILD_MEMBER_REMOVE, member);
this.scheduleForDeletion(guild.id, data.user.id); this.scheduleForDeletion(guild.id, data.user.id);
} else { } else {
member = this.deleted.get(guild.id + data.user.id) || null; member = this.deleted.get(guild.id + data.user.id) || null;
@@ -43,8 +43,7 @@ class GuildMemberRemoveAction extends Action {
/** /**
* Emitted whenever a member leaves a guild, or is kicked. * Emitted whenever a member leaves a guild, or is kicked.
* @event Client#guildMemberRemove * @event Client#guildMemberRemove
* @param {Guild} guild The guild that the member has left. * @param {GuildMember} member The member that has left/been kicked from the guild.
* @param {GuildMember} member The member that has left the guild.
*/ */
module.exports = GuildMemberRemoveAction; module.exports = GuildMemberRemoveAction;

7
src/client/actions/GuildRoleCreate.js
View File

@@ -11,7 +11,7 @@ class GuildRoleCreate extends Action {
const already = guild.roles.has(data.role.id); const already = guild.roles.has(data.role.id);
const role = new Role(guild, data.role); const role = new Role(guild, data.role);
guild.roles.set(role.id, role); guild.roles.set(role.id, role);
if (!already) client.emit(Constants.Events.GUILD_ROLE_CREATE, guild, role); if (!already) client.emit(Constants.Events.GUILD_ROLE_CREATE, role);
return { return {
role, role,
}; };
@@ -24,9 +24,8 @@ class GuildRoleCreate extends Action {
} }
/** /**
* Emitted whenever a guild role is created. * Emitted whenever a role is created.
* @event Client#guildRoleCreate * @event Client#roleCreate
* @param {Guild} guild The guild that the role was created in.
* @param {Role} role The role that was created. * @param {Role} role The role that was created.
*/ */

5
src/client/actions/GuildRoleDelete.js
View File

@@ -17,7 +17,7 @@ class GuildRoleDeleteAction extends Action {
guild.roles.delete(data.role_id); guild.roles.delete(data.role_id);
this.deleted.set(guild.id + data.role_id, role); this.deleted.set(guild.id + data.role_id, role);
this.scheduleForDeletion(guild.id, data.role_id); this.scheduleForDeletion(guild.id, data.role_id);
client.emit(Constants.Events.GUILD_ROLE_DELETE, guild, role); client.emit(Constants.Events.GUILD_ROLE_DELETE, role);
} else { } else {
role = this.deleted.get(guild.id + data.role_id) || null; role = this.deleted.get(guild.id + data.role_id) || null;
} }
@@ -39,8 +39,7 @@ class GuildRoleDeleteAction extends Action {
/** /**
* Emitted whenever a guild role is deleted. * Emitted whenever a guild role is deleted.
* @event Client#guildRoleDelete * @event Client#roleDelete
* @param {Guild} guild The guild that the role was deleted in.
* @param {Role} role The role that was deleted. * @param {Role} role The role that was deleted.
*/ */

5
src/client/actions/GuildRoleUpdate.js
View File

@@ -15,7 +15,7 @@ class GuildRoleUpdateAction extends Action {
if (role) { if (role) {
oldRole = cloneObject(role); oldRole = cloneObject(role);
role.setup(data.role); role.setup(data.role);
client.emit(Constants.Events.GUILD_ROLE_UPDATE, guild, oldRole, role); client.emit(Constants.Events.GUILD_ROLE_UPDATE, oldRole, role);
} }
return { return {
@@ -33,8 +33,7 @@ class GuildRoleUpdateAction extends Action {
/** /**
* Emitted whenever a guild role is updated. * Emitted whenever a guild role is updated.
* @event Client#guildRoleUpdate * @event Client#roleUpdate
* @param {Guild} guild The guild that the role was updated in.
* @param {Role} oldRole The role before the update. * @param {Role} oldRole The role before the update.
* @param {Role} newRole The role after the update. * @param {Role} newRole The role after the update.
*/ */

5
src/client/websocket/packets/handlers/GuildMembersChunk.js
View File

@@ -15,14 +15,13 @@ class GuildMembersChunkHandler extends AbstractHandler {
} }
guild._checkChunks(); guild._checkChunks();
client.emit(Constants.Events.GUILD_MEMBERS_CHUNK, guild, members); client.emit(Constants.Events.GUILD_MEMBERS_CHUNK, members);
} }
} }
/** /**
* Emitted whenever a chunk of Guild members is received * Emitted whenever a chunk of Guild members is received (all members come from the same guild)
* @event Client#guildMembersChunk * @event Client#guildMembersChunk
* @param {Guild} guild The guild that the chunks relate to
* @param {GuildMember[]} members The members in the chunk * @param {GuildMember[]} members The members in the chunk
*/ */

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

@@ -33,7 +33,7 @@ class PresenceUpdateHandler extends AbstractHandler {
deaf: false, deaf: false,
mute: false, mute: false,
}, false); }, false);
client.emit(Constants.Events.GUILD_MEMBER_AVAILABLE, guild, member); client.emit(Constants.Events.GUILD_MEMBER_AVAILABLE, member);
} }
if (member) { if (member) {
const oldMember = cloneObject(member); const oldMember = cloneObject(member);
@@ -66,7 +66,6 @@ class PresenceUpdateHandler extends AbstractHandler {
/** /**
* Emitted whenever a member becomes available in a large Guild * Emitted whenever a member becomes available in a large Guild
* @event Client#guildMemberAvailable * @event Client#guildMemberAvailable
* @param {Guild} guild The guild that the member became available in
* @param {GuildMember} member The member that became available * @param {GuildMember} member The member that became available
*/ */

8
src/structures/Guild.js
View File

@@ -726,11 +726,10 @@ class Guild {
/** /**
* Emitted whenever a user joins a guild. * Emitted whenever a user joins a guild.
* @event Client#guildMemberAdd * @event Client#guildMemberAdd
* @param {Guild} guild The guild that the user has joined * @param {GuildMember} member The member that has joined a guild
* @param {GuildMember} member The member that has joined
*/ */
if (this.client.ws.status === Constants.Status.READY && emitEvent && !existing) { if (this.client.ws.status === Constants.Status.READY && emitEvent && !existing) {
this.client.emit(Constants.Events.GUILD_MEMBER_ADD, this, member); this.client.emit(Constants.Events.GUILD_MEMBER_ADD, member);
} }
this._checkChunks(); this._checkChunks();
@@ -749,11 +748,10 @@ class Guild {
/** /**
* Emitted whenever a Guild Member changes - i.e. new role, removed role, nickname * Emitted whenever a Guild Member changes - i.e. new role, removed role, nickname
* @event Client#guildMemberUpdate * @event Client#guildMemberUpdate
* @param {Guild} guild The guild that the update affects
* @param {GuildMember} oldMember The member before the update * @param {GuildMember} oldMember The member before the update
* @param {GuildMember} newMember The member after the update * @param {GuildMember} newMember The member after the update
*/ */
this.client.emit(Constants.Events.GUILD_MEMBER_UPDATE, this, oldMember, member); this.client.emit(Constants.Events.GUILD_MEMBER_UPDATE, oldMember, member);
} }
return { return {

6
src/util/Constants.js
View File

@@ -170,9 +170,9 @@ exports.Events = {
GUILD_MEMBER_AVAILABLE: 'guildMemberAvailable', GUILD_MEMBER_AVAILABLE: 'guildMemberAvailable',
GUILD_MEMBER_SPEAKING: 'guildMemberSpeaking', GUILD_MEMBER_SPEAKING: 'guildMemberSpeaking',
GUILD_MEMBERS_CHUNK: 'guildMembersChunk', GUILD_MEMBERS_CHUNK: 'guildMembersChunk',
GUILD_ROLE_CREATE: 'guildRoleCreate', GUILD_ROLE_CREATE: 'roleCreate',
GUILD_ROLE_DELETE: 'guildRoleDelete', GUILD_ROLE_DELETE: 'roleDelete',
GUILD_ROLE_UPDATE: 'guildRoleUpdate', GUILD_ROLE_UPDATE: 'roleUpdate',
GUILD_EMOJI_CREATE: 'guildEmojiCreate', GUILD_EMOJI_CREATE: 'guildEmojiCreate',
GUILD_EMOJI_DELETE: 'guildEmojiDelete', GUILD_EMOJI_DELETE: 'guildEmojiDelete',
GUILD_EMOJI_UPDATE: 'guildEmojiUpdate', GUILD_EMOJI_UPDATE: 'guildEmojiUpdate',