mirror of
https://github.com/discordjs/discord.js.git
synced 2026-03-10 08:33:30 +01:00
voice: rewrite GuildMember#speaking tracking (#2540)
This commit is contained in:
@@ -879,26 +879,6 @@ class Guild extends Base {
|
||||
c.type === channel.type && (category || c.parent === channel.parent)
|
||||
));
|
||||
}
|
||||
|
||||
/**
|
||||
* Handles a user speaking update in a voice channel.
|
||||
* @param {Snowflake} user ID of the user that the update is for
|
||||
* @param {boolean} speaking Whether the user is speaking
|
||||
* @private
|
||||
*/
|
||||
_memberSpeakUpdate(user, speaking) {
|
||||
const member = this.members.get(user);
|
||||
if (member && member.speaking !== speaking) {
|
||||
member.speaking = speaking;
|
||||
/**
|
||||
* Emitted once a guild member starts/stops speaking.
|
||||
* @event Client#guildMemberSpeaking
|
||||
* @param {GuildMember} member The member that started/stopped speaking
|
||||
* @param {boolean} speaking Whether or not the member is speaking
|
||||
*/
|
||||
this.client.emit(Events.GUILD_MEMBER_SPEAKING, member, speaking);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// TODO: Document this thing
|
||||
@@ -914,7 +894,6 @@ class VoiceStateCollection extends Collection {
|
||||
if (member.voiceChannel && member.voiceChannel.id !== voiceState.channel_id) {
|
||||
member.voiceChannel.members.delete(member.id);
|
||||
}
|
||||
if (!voiceState.channel_id) member.speaking = null;
|
||||
const newChannel = this.guild.channels.get(voiceState.channel_id);
|
||||
if (newChannel) newChannel.members.set(member.user.id, member);
|
||||
}
|
||||
|
||||
@@ -56,14 +56,19 @@ class GuildMember extends Base {
|
||||
if (data) this._patch(data);
|
||||
}
|
||||
|
||||
_patch(data) {
|
||||
/**
|
||||
* Whether this member is speaking and the client is in the same channel
|
||||
* @type {boolean}
|
||||
* @name GuildMember#speaking
|
||||
*/
|
||||
if (typeof this.speaking === 'undefined') this.speaking = false;
|
||||
/**
|
||||
* Whether this member is speaking. If the client isn't sure, then this will be undefined. Otherwise it will be
|
||||
* true/false
|
||||
* @type {?boolean}
|
||||
* @name GuildMember#speaking
|
||||
*/
|
||||
get speaking() {
|
||||
return this.voiceChannel && this.voiceChannel.connection ?
|
||||
Boolean(this.voiceChannel.connection._speaking.get(this.id)) :
|
||||
undefined;
|
||||
}
|
||||
|
||||
_patch(data) {
|
||||
/**
|
||||
* The nickname of this member, if they have one
|
||||
* @type {?string}
|
||||
|
||||
Reference in New Issue
Block a user