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

Move message creation to a factory method inside ConnectionState.

Browse Source
This commit is contained in:
Rapptz
2017-01-03 08:41:44 -05:00
parent 5e6bfecb07
commit 98b981848d
14 changed files with 94 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
discord/client.py
View File

@ -33,10 +33,8 @@ from .enums import ChannelType, Status
from .gateway import *
from .emoji import Emoji
from .http import HTTPClient
import discord.utils
import discord.compat
import discord.state
from .state import ConnectionState
from . import utils, compat
import asyncio
import aiohttp
@ -141,11 +139,8 @@ class Client:
connector = options.pop('connector', None)
self.http = HTTPClient(connector, loop=self.loop)
self.connection = discord.state.ConnectionState(dispatch=self.dispatch,
chunker=self.request_offline_members,
syncer=self._syncer,
http=self.http, loop=self.loop,
**options)
self.connection = ConnectionState(dispatch=self.dispatch, chunker=self.request_offline_members,
syncer=self._syncer, http=self.http, loop=self.loop, **options)
self._closed = asyncio.Event(loop=self.loop)
self._is_logged_in = asyncio.Event(loop=self.loop)
@ -287,7 +282,7 @@ class Client:
getattr(self, handler)(*args, **kwargs)
if hasattr(self, method):
discord.compat.create_task(self._run_event(method, *args, **kwargs), loop=self.loop)
compat.create_task(self._run_event(method, *args, **kwargs), loop=self.loop)
@asyncio.coroutine
def on_error(self, event_method, *args, **kwargs):
@ -937,7 +932,7 @@ class Client:
avatar = self.user.avatar
else:
if avatar_bytes is not None:
avatar = discord.utils._bytes_to_base64_data(avatar_bytes)
avatar = utils._bytes_to_base64_data(avatar_bytes)
else:
avatar = None