matthew/enhanced-discord.py
1
0
Fork 0
Code Issues 4 Pull Requests 21 Projects Releases Wiki Activity

Fix voice state update issue in on_voice_state_update

Browse Source 
Bug was caused to the shallow copy not copying over the VoiceState
information embedded into the copy. This would mean that when the event
is called, before and after voice state information is essentially
equivalent.

The solution to fix this is to also copy the VoiceState objects.
This commit is contained in:
Rapptz 2016-07-23 05:18:56 -04:00
parent b862223a1f
commit b0e5357716
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
discord/member.py
View File

@ -29,6 +29,7 @@ from .game import Game
from . import utils from . import utils
from .enums import Status, ChannelType from .enums import Status, ChannelType
from .colour import Colour from .colour import Colour
import copy
class VoiceState: class VoiceState:
"""Represents a Discord user's voice state. """Represents a Discord user's voice state.
@ -63,10 +64,7 @@ class VoiceState:
self.is_afk = kwargs.get('suppress', False) self.is_afk = kwargs.get('suppress', False)
self.mute = kwargs.get('mute', False) self.mute = kwargs.get('mute', False)
self.deaf = kwargs.get('deaf', False) self.deaf = kwargs.get('deaf', False)
self._handle_voice_channel(kwargs.get('voice_channel'), kwargs.get('user_id')) self.voice_channel = kwargs.get('voice_channel')
def _handle_voice_channel(self, voice_channel, user_id):
self.voice_channel = voice_channel
def flatten_voice_states(cls): def flatten_voice_states(cls):
for attr in VoiceState.__slots__: for attr in VoiceState.__slots__:
@ -142,6 +140,11 @@ class Member(User):
self.voice.voice_channel = vc self.voice.voice_channel = vc
def _copy(self):
ret = copy.copy(self)
ret.voice = copy.copy(self.voice)
return ret
@property @property
def colour(self): def colour(self):
"""A property that returns a :class:`Colour` denoting the rendered colour """A property that returns a :class:`Colour` denoting the rendered colour

4
discord/server.py
View File

@ -31,7 +31,6 @@ from .game import Game
from .channel import Channel from .channel import Channel
from .enums import ServerRegion, Status from .enums import ServerRegion, Status
from .mixins import Hashable from .mixins import Hashable
import copy
class Server(Hashable): class Server(Hashable):
"""Represents a Discord server. """Represents a Discord server.
@ -137,8 +136,9 @@ class Server(Hashable):
def _update_voice_state(self, data): def _update_voice_state(self, data):
user_id = data.get('user_id') user_id = data.get('user_id')
member = self.get_member(user_id) member = self.get_member(user_id)
before = copy.copy(member) before = None
if member is not None: if member is not None:
before = member._copy()
ch_id = data.get('channel_id') ch_id = data.get('channel_id')
channel = self.get_channel(ch_id) channel = self.get_channel(ch_id)
member._update_voice_state(voice_channel=channel, **data) member._update_voice_state(voice_channel=channel, **data)

4
discord/state.py
View File

@ -268,7 +268,7 @@ class ConnectionState:
member = self._make_member(server, data) member = self._make_member(server, data)
server._add_member(member) server._add_member(member)
old_member = copy.copy(member) old_member = member._copy()
member.status = data.get('status') member.status = data.get('status')
try: try:
member.status = Status(member.status) member.status = Status(member.status)
@ -385,7 +385,7 @@ class ConnectionState:
member = server.get_member(user_id) member = server.get_member(user_id)
if member is not None: if member is not None:
user = data['user'] user = data['user']
old_member = copy.copy(member) old_member = member._copy()
member.name = user['username'] member.name = user['username']
member.discriminator = user['discriminator'] member.discriminator = user['discriminator']
member.avatar = user['avatar'] member.avatar = user['avatar']