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

logs_from improvements for after param.

Browse Source 
- Properly support 'after' alone
- Properly support both 'before' and 'after'
- Add optional 'reverse' parameter to sort messages oldest->newest to
  1) provide a sorted result set for 'after'
  2) give flexibility when using both 'before' and 'after'
This commit is contained in:
Khazhismel Kumykov
2016-05-18 17:34:17 -04:00
committed by Rapptz
parent 8e5347f4ed
commit 492c9afffb
2 changed files with 138 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
discord/client.py
View File

@ -1213,15 +1213,9 @@ class Client:
}
if before:
if isinstance(before, datetime.datetime):
params['before'] = utils.time_snowflake(before, high=False)
else:
params['before'] = before.id
params['before'] = before.id
if after:
if isinstance(after, datetime.datetime):
params['after'] = utils.time_snowflake(after, high=True)
else:
params['after'] = after.id
params['after'] = after.id
response = yield from self.session.get(url, params=params, headers=self.headers)
log.debug(request_logging_format.format(method='GET', response=response))
@ -1230,11 +1224,21 @@ class Client:
return messages
if PY35:
def logs_from(self, channel, limit=100, *, before=None, after=None):
return LogsFromIterator(self, channel, limit, before, after)
def logs_from(self, channel, limit=100, *, before=None, after=None, reverse=False):
if isinstance(before, datetime.datetime):
before = Object(utils.time_snowflake(before, high=False))
if isinstance(after, datetime.datetime):
after = Object(utils.time_snowflake(after, high=True))
return LogsFromIterator.create(self, channel, limit, before=before, after=after, reverse=reverse)
else:
@asyncio.coroutine
def logs_from(self, channel, limit=100, *, before=None, after=None):
if isinstance(before, datetime.datetime):
before = Object(utils.time_snowflake(before, high=False))
if isinstance(after, datetime.datetime):
after = Object(utils.time_snowflake(after, high=True))
def generator(data):
for message in data:
yield Message(channel=channel, **message)