Consistently rename selfMute/selfDeaf

This commit is contained in:
abalabahaha
2016-05-04 19:55:19 -07:00
parent 46bcd3f5e3
commit 2eca16dee6
4 changed files with 11 additions and 11 deletions

View File

@@ -874,4 +874,4 @@ Emitted when a user leaves a voice channel, supplies a VoiceChannel_ and a User_
voiceStateUpdate voiceStateUpdate
~~~~~~~~~~ ~~~~~~~~~~
Emitted when a user mutes/deafens, supplies a VoiceChannel_, User_, an object containing the old mute/self_mute/deaf/self_deaf properties, and an object containing the new mute/self_mute/deaf/self_deaf properties Emitted when a user mutes/deafens, supplies a VoiceChannel_, User_, an object containing the old mute/selfMute/deaf/selfDeaf properties, and an object containing the new mute/selfMute/deaf/selfDeaf properties

View File

@@ -109,9 +109,9 @@ Returns an object containing metadata of a user within the server, containing a
joinedAt: 1449339323747, joinedAt: 1449339323747,
roles: [], roles: [],
mute: false, mute: false,
self_mute: false, selfMute: false,
deaf: false, deaf: false,
self_deaf: false selfDeaf: false
} }
leave() leave()

View File

@@ -231,14 +231,14 @@ var Server = (function (_Equality) {
} }
var oldState = { var oldState = {
mute: this.memberMap[user.id].mute, mute: this.memberMap[user.id].mute,
self_mute: this.memberMap[user.id].self_mute, selfMute: this.memberMap[user.id].self_mute,
deaf: this.memberMap[user.id].deaf, deaf: this.memberMap[user.id].deaf,
self_deaf: this.memberMap[user.id].self_deaf selfDeaf: this.memberMap[user.id].self_deaf
}; };
this.memberMap[user.id].mute = data.mute; this.memberMap[user.id].mute = data.mute;
this.memberMap[user.id].self_mute = data.self_mute; this.memberMap[user.id].selfMute = data.self_mute;
this.memberMap[user.id].deaf = data.deaf; this.memberMap[user.id].deaf = data.deaf;
this.memberMap[user.id].self_deaf = data.self_deaf; this.memberMap[user.id].selfDeaf = data.self_deaf;
if (oldState.mute !== undefined && (oldState.mute != data.mute || oldState.self_mute != data.self_mute || oldState.deaf != data.deaf || oldState.self_deaf != data.self_deaf)) { if (oldState.mute !== undefined && (oldState.mute != data.mute || oldState.self_mute != data.self_mute || oldState.deaf != data.deaf || oldState.self_deaf != data.self_deaf)) {
this.client.emit("voiceStateUpdate", channel, user, oldState, this.memberMap[user.id]); this.client.emit("voiceStateUpdate", channel, user, oldState, this.memberMap[user.id]);
} else { } else {

View File

@@ -194,14 +194,14 @@ export default class Server extends Equality {
} }
var oldState = { var oldState = {
mute: this.memberMap[user.id].mute, mute: this.memberMap[user.id].mute,
self_mute: this.memberMap[user.id].self_mute, selfMute: this.memberMap[user.id].self_mute,
deaf: this.memberMap[user.id].deaf, deaf: this.memberMap[user.id].deaf,
self_deaf: this.memberMap[user.id].self_deaf selfDeaf: this.memberMap[user.id].self_deaf
}; };
this.memberMap[user.id].mute = data.mute; this.memberMap[user.id].mute = data.mute;
this.memberMap[user.id].self_mute = data.self_mute; this.memberMap[user.id].selfMute = data.self_mute;
this.memberMap[user.id].deaf = data.deaf; this.memberMap[user.id].deaf = data.deaf;
this.memberMap[user.id].self_deaf = data.self_deaf; this.memberMap[user.id].selfDeaf = data.self_deaf;
if (oldState.mute !== undefined && (oldState.mute != data.mute || oldState.self_mute != data.self_mute if (oldState.mute !== undefined && (oldState.mute != data.mute || oldState.self_mute != data.self_mute
|| oldState.deaf != data.deaf || oldState.self_deaf != data.self_deaf)) { || oldState.deaf != data.deaf || oldState.self_deaf != data.self_deaf)) {
this.client.emit("voiceStateUpdate", channel, user, oldState, this.memberMap[user.id]); this.client.emit("voiceStateUpdate", channel, user, oldState, this.memberMap[user.id]);