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

Use a subclass rather than monkey-patching for the websocket

Browse Source
This commit is contained in:
jack1142 2020-07-24 13:11:45 +02:00 committed by Rapptz
parent ec3c3eb4c6
commit bd9821320e
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
discord/gateway.py
View File

@ -164,14 +164,9 @@ class VoiceKeepAliveHandler(KeepAliveHandler):
self.latency = ack_time - self._last_send self.latency = ack_time - self._last_send
self.recent_ack_latencies.append(self.latency) self.recent_ack_latencies.append(self.latency)
# Monkey patch certain things from the aiohttp websocket code class DiscordClientWebSocketResponse(aiohttp.ClientWebSocketResponse):
# Check this whenever we update dependencies. async def close(self, *, code: int = 4000, message: bytes = b'') -> bool:
OLD_CLOSE = aiohttp.ClientWebSocketResponse.close return await super().close(code=code, message=message)
async def _new_ws_close(self, *, code: int = 4000, message: bytes = b'') -> bool:
return await OLD_CLOSE(self, code=code, message=message)
aiohttp.ClientWebSocketResponse.close = _new_ws_close
class DiscordWebSocket: class DiscordWebSocket:
"""Implements a WebSocket for Discord's gateway v6. """Implements a WebSocket for Discord's gateway v6.

5
discord/http.py
View File

@ -34,6 +34,7 @@ import weakref
import aiohttp import aiohttp
from .errors import HTTPException, Forbidden, NotFound, LoginFailure, GatewayNotFound from .errors import HTTPException, Forbidden, NotFound, LoginFailure, GatewayNotFound
from .gateway import DiscordClientWebSocketResponse
from . import __version__, utils from . import __version__, utils
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
@ -113,7 +114,7 @@ class HTTPClient:
def recreate(self): def recreate(self):
if self.__session.closed: if self.__session.closed:
self.__session = aiohttp.ClientSession(connector=self.connector) self.__session = aiohttp.ClientSession(connector=self.connector, ws_response_class=DiscordClientWebSocketResponse)
async def ws_connect(self, url, *, compress=0): async def ws_connect(self, url, *, compress=0):
kwargs = { kwargs = {
@ -279,7 +280,7 @@ class HTTPClient:
async def static_login(self, token, *, bot): async def static_login(self, token, *, bot):
# Necessary to get aiohttp to stop complaining about session creation # Necessary to get aiohttp to stop complaining about session creation
self.__session = aiohttp.ClientSession(connector=self.connector) self.__session = aiohttp.ClientSession(connector=self.connector, ws_response_class=DiscordClientWebSocketResponse)
old_token, old_bot = self.token, self.bot_token old_token, old_bot = self.token, self.bot_token
self._token(token, bot=bot) self._token(token, bot=bot)