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

Change internal update functions to have a leading underscore.

Browse Source
This commit is contained in:
Rapptz
2016-01-11 14:44:13 -05:00
parent c49efc5412
commit 8974dffc4e
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
discord/channel.py
View File

@@ -75,13 +75,13 @@ class Channel(Hashable):
""" """
def __init__(self, **kwargs): def __init__(self, **kwargs):
self.update(**kwargs) self._update(**kwargs)
self.voice_members = [] self.voice_members = []
def __str__(self): def __str__(self):
return self.name return self.name
def update(self, **kwargs): def _update(self, **kwargs):
self.name = kwargs.get('name') self.name = kwargs.get('name')
self.server = kwargs.get('server') self.server = kwargs.get('server')
self.id = kwargs.get('id') self.id = kwargs.get('id')

4
discord/member.py
View File

@@ -79,9 +79,9 @@ class Member(User):
game = kwargs.get('game') game = kwargs.get('game')
self.game = game and Game(**game) self.game = game and Game(**game)
self.server = kwargs.get('server', None) self.server = kwargs.get('server', None)
self.update_voice_state(mute=mute, deaf=deaf) self._update_voice_state(mute=mute, deaf=deaf)
def update_voice_state(self, **kwargs): def _update_voice_state(self, **kwargs):
self.self_mute = kwargs.get('self_mute', False) self.self_mute = kwargs.get('self_mute', False)
self.self_deaf = kwargs.get('self_deaf', False) self.self_deaf = kwargs.get('self_deaf', False)
self.is_afk = kwargs.get('suppress', False) self.is_afk = kwargs.get('suppress', False)

4
discord/role.py
View File

@@ -69,12 +69,12 @@ class Role(Hashable):
def __init__(self, **kwargs): def __init__(self, **kwargs):
self._is_everyone = kwargs.get('everyone', False) self._is_everyone = kwargs.get('everyone', False)
self.update(**kwargs) self._update(**kwargs)
def __str__(self): def __str__(self):
return self.name return self.name
def update(self, **kwargs): def _update(self, **kwargs):
self.id = kwargs.get('id') self.id = kwargs.get('id')
self.name = kwargs.get('name') self.name = kwargs.get('name')
self.permissions = Permissions(kwargs.get('permissions', 0)) self.permissions = Permissions(kwargs.get('permissions', 0))

2
discord/server.py
View File

@@ -132,7 +132,7 @@ class Server(Hashable):
if member is not None: if member is not None:
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)
return before, member return before, member
def _from_data(self, guild): def _from_data(self, guild):

4
discord/state.py
View File

@@ -173,7 +173,7 @@ class ConnectionState:
channel = server.get_channel(channel_id) channel = server.get_channel(channel_id)
if channel is not None: if channel is not None:
old_channel = copy.copy(channel) old_channel = copy.copy(channel)
channel.update(server=server, **data) channel._update(server=server, **data)
self.dispatch('channel_update', old_channel, channel) self.dispatch('channel_update', old_channel, channel)
def parse_channel_create(self, data): def parse_channel_create(self, data):
@@ -322,7 +322,7 @@ class ConnectionState:
role = utils.find(lambda r: r.id == role_id, server.roles) role = utils.find(lambda r: r.id == role_id, server.roles)
if role is not None: if role is not None:
old_role = copy.copy(role) old_role = copy.copy(role)
role.update(**data['role']) role._update(**data['role'])
self.dispatch('server_role_update', old_role, role) self.dispatch('server_role_update', old_role, role)
def parse_voice_state_update(self, data): def parse_voice_state_update(self, data):