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

ConnectionState is now constructed in Client.__init__.

Browse Source 
This should reduce the amount of checks for None if someone doesn't
want a websocket connection. The connection state is instead cleared
rather than reconstructed.
This commit is contained in:
Rapptz
2015-12-29 11:59:18 -05:00
parent 7696a566e1
commit c11bd9b8f4
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
discord/client.py
View File

@@ -109,15 +109,16 @@ class Client:
self.gateway = None self.gateway = None
self.voice = None self.voice = None
self.session_id = None self.session_id = None
self.connection = None
self.sequence = 0 self.sequence = 0
self.loop = asyncio.get_event_loop() if loop is None else loop self.loop = asyncio.get_event_loop() if loop is None else loop
self._listeners = [] self._listeners = []
self.cache_auth = options.get('cache_auth', True) self.cache_auth = options.get('cache_auth', True)
self.max_messages = options.get('max_messages') max_messages = options.get('max_messages')
if self.max_messages is None or self.max_messages < 100: if max_messages is None or max_messages < 100:
self.max_messages = 5000 max_messages = 5000
self.connection = ConnectionState(self.dispatch, max_messages)
# Blame React for this # Blame React for this
user_agent = 'DiscordBot (https://github.com/Rapptz/discord.py {0}) Python/{1[0]}.{1[1]} aiohttp/{2}' user_agent = 'DiscordBot (https://github.com/Rapptz/discord.py {0}) Python/{1[0]}.{1[1]} aiohttp/{2}'
@@ -134,7 +135,7 @@ class Client:
# These two events correspond to the two events necessary # These two events correspond to the two events necessary
# for a connection to be made # for a connection to be made
self._voice_data_found = asyncio.Event(loop=self.loop) self._voice_data_found = asyncio.Event(loop=self.loop)
self._session_id_found = asyncio.Event(loop=self.loop) self._session_id_found = asyncio.Event(loop=self.loop)
# internals # internals
@@ -334,7 +335,7 @@ class Client:
event = msg.get('t') event = msg.get('t')
if event == 'READY': if event == 'READY':
self.connection = ConnectionState(self.dispatch, self.max_messages) self.connection.clear()
self.session_id = data['session_id'] self.session_id = data['session_id']
if event == 'READY' or event == 'RESUMED': if event == 'READY' or event == 'RESUMED':
@@ -706,12 +707,11 @@ class Client:
while not self.is_closed: while not self.is_closed:
msg = yield from self.ws.recv() msg = yield from self.ws.recv()
if msg is None: if msg is None:
if self.connection is None:
raise ClientException('Unexpected websocket closure received')
if self.ws.close_code == 1012: if self.ws.close_code == 1012:
yield from self.redirect_websocket(self.gateway) yield from self.redirect_websocket(self.gateway)
continue continue
elif not self._is_ready.is_set():
raise ClientException('Unexpected websocket closure received')
else: else:
yield from self.close() yield from self.close()
break break
@@ -1743,9 +1743,7 @@ class Client:
# Invite management # Invite management
def _fill_invite_data(self, data): def _fill_invite_data(self, data):
server = None server = self.connection._get_server(data['guild']['id'])
if self.connection is not None:
server = self.connection._get_server(data['guild']['id'])
if server is not None: if server is not None:
ch_id = data['channel']['id'] ch_id = data['channel']['id']
channels = getattr(server, 'channels', []) channels = getattr(server, 'channels', [])

8
discord/state.py
View File

@@ -40,13 +40,15 @@ import datetime
class ConnectionState: class ConnectionState:
def __init__(self, dispatch, max_messages): def __init__(self, dispatch, max_messages):
self.max_messages = max_messages
self.dispatch = dispatch
self.clear()
def clear(self):
self.user = None self.user = None
self.email = None
self.servers = [] self.servers = []
self.private_channels = [] self.private_channels = []
self.max_messages = max_messages
self.messages = deque(maxlen=self.max_messages) self.messages = deque(maxlen=self.max_messages)
self.dispatch = dispatch
def _get_message(self, msg_id): def _get_message(self, msg_id):
return utils.find(lambda m: m.id == msg_id, self.messages) return utils.find(lambda m: m.id == msg_id, self.messages)