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

Use new rate limit millisecond precision option.

Browse Source
This commit is contained in:
Rapptz 2019-08-11 19:17:06 -04:00
parent 5d7cf56d7f
commit 078d1d71d8
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
discord/http.py
View File

@ -105,7 +105,7 @@ class HTTPClient:
if self.__session.closed: if self.__session.closed:
self.__session = aiohttp.ClientSession(connector=self.connector, loop=self.loop) self.__session = aiohttp.ClientSession(connector=self.connector, loop=self.loop)
async def request(self, route, *, files=None, header_bypass_delay=None, **kwargs): async def request(self, route, *, files=None, **kwargs):
bucket = route.bucket bucket = route.bucket
method = route.method method = route.method
url = route.url url = route.url
@ -119,6 +119,7 @@ class HTTPClient:
# header creation # header creation
headers = { headers = {
'User-Agent': self.user_agent, 'User-Agent': self.user_agent,
'X-Ratelimit-Precision': 'millisecond',
} }
if self.token is not None: if self.token is not None:
@ -165,11 +166,7 @@ class HTTPClient:
remaining = r.headers.get('X-Ratelimit-Remaining') remaining = r.headers.get('X-Ratelimit-Remaining')
if remaining == '0' and r.status != 429: if remaining == '0' and r.status != 429:
# we've depleted our current bucket # we've depleted our current bucket
if header_bypass_delay is None:
delta = utils._parse_ratelimit_header(r) delta = utils._parse_ratelimit_header(r)
else:
delta = header_bypass_delay
log.debug('A rate limit bucket has been exhausted (bucket: %s, retry: %s).', bucket, delta) log.debug('A rate limit bucket has been exhausted (bucket: %s, retry: %s).', bucket, delta)
maybe_lock.defer() maybe_lock.defer()
self.loop.call_later(delta, lock.release) self.loop.call_later(delta, lock.release)
@ -383,17 +380,17 @@ class HTTPClient:
def add_reaction(self, channel_id, message_id, emoji): def add_reaction(self, channel_id, message_id, emoji):
r = Route('PUT', '/channels/{channel_id}/messages/{message_id}/reactions/{emoji}/@me', r = Route('PUT', '/channels/{channel_id}/messages/{message_id}/reactions/{emoji}/@me',
channel_id=channel_id, message_id=message_id, emoji=emoji) channel_id=channel_id, message_id=message_id, emoji=emoji)
return self.request(r, header_bypass_delay=0.25) return self.request(r)
def remove_reaction(self, channel_id, message_id, emoji, member_id): def remove_reaction(self, channel_id, message_id, emoji, member_id):
r = Route('DELETE', '/channels/{channel_id}/messages/{message_id}/reactions/{emoji}/{member_id}', r = Route('DELETE', '/channels/{channel_id}/messages/{message_id}/reactions/{emoji}/{member_id}',
channel_id=channel_id, message_id=message_id, member_id=member_id, emoji=emoji) channel_id=channel_id, message_id=message_id, member_id=member_id, emoji=emoji)
return self.request(r, header_bypass_delay=0.25) return self.request(r)
def remove_own_reaction(self, channel_id, message_id, emoji): def remove_own_reaction(self, channel_id, message_id, emoji):
r = Route('DELETE', '/channels/{channel_id}/messages/{message_id}/reactions/{emoji}/@me', r = Route('DELETE', '/channels/{channel_id}/messages/{message_id}/reactions/{emoji}/@me',
channel_id=channel_id, message_id=message_id, emoji=emoji) channel_id=channel_id, message_id=message_id, emoji=emoji)
return self.request(r, header_bypass_delay=0.25) return self.request(r)
def get_reaction_users(self, channel_id, message_id, emoji, limit, after=None): def get_reaction_users(self, channel_id, message_id, emoji, limit, after=None):
r = Route('GET', '/channels/{channel_id}/messages/{message_id}/reactions/{emoji}', r = Route('GET', '/channels/{channel_id}/messages/{message_id}/reactions/{emoji}',

2
discord/utils.py
View File

@ -304,7 +304,7 @@ def to_json(obj):
def _parse_ratelimit_header(request): def _parse_ratelimit_header(request):
now = parsedate_to_datetime(request.headers['Date']) now = parsedate_to_datetime(request.headers['Date'])
reset = datetime.datetime.fromtimestamp(int(request.headers['X-Ratelimit-Reset']), datetime.timezone.utc) reset = datetime.datetime.fromtimestamp(float(request.headers['X-Ratelimit-Reset']), datetime.timezone.utc)
return (reset - now).total_seconds() return (reset - now).total_seconds()
async def maybe_coroutine(f, *args, **kwargs): async def maybe_coroutine(f, *args, **kwargs):