aboutsummaryrefslogtreecommitdiff
path: root/discord/client.py
diff options
context:
space:
mode:
authorKhazhismel Kumykov <[email protected]>2016-05-16 22:38:31 -0400
committerRapptz <[email protected]>2016-05-20 18:11:56 -0400
commit8e5347f4ed3730f2e040716049233890624d9765 (patch)
tree6c2507dddc167a518e15ef48ed370b73ad3ed1aa /discord/client.py
parentRetry send_file on 502. (diff)
downloaddiscord.py-8e5347f4ed3730f2e040716049233890624d9765.tar.xz
discord.py-8e5347f4ed3730f2e040716049233890624d9765.zip
Allow datetime in limit parameters for logs_from.
Add time_snowflake to convert a datetime to a "snowflake".
Diffstat (limited to 'discord/client.py')
-rw-r--r--discord/client.py21
1 files changed, 15 insertions, 6 deletions
diff --git a/discord/client.py b/discord/client.py
index e8e5d6b3..688e76e4 100644
--- a/discord/client.py
+++ b/discord/client.py
@@ -51,6 +51,7 @@ import logging, traceback
import sys, re
import tempfile, os, hashlib
import itertools
+import datetime
from random import randint as random_integer
PY35 = sys.version_info >= (3, 5)
@@ -1167,10 +1168,12 @@ class Client:
The channel to obtain the logs from.
limit : int
The number of messages to retrieve.
- before : :class:`Message`
- The message before which all returned messages must be.
- after : :class:`Message`
- The message after which all returned messages must be.
+ before : :class:`Message` or `datetime`
+ The message or date before which all returned messages must be.
+ If a date is provided it must be a timezone-naive datetime representing UTC time.
+ after : :class:`Message` or `datetime`
+ The message or date after which all returned messages must be.
+ If a date is provided it must be a timezone-naive datetime representing UTC time.
Raises
------
@@ -1210,9 +1213,15 @@ class Client:
}
if before:
- params['before'] = before.id
+ if isinstance(before, datetime.datetime):
+ params['before'] = utils.time_snowflake(before, high=False)
+ else:
+ params['before'] = before.id
if after:
- params['after'] = after.id
+ if isinstance(after, datetime.datetime):
+ params['after'] = utils.time_snowflake(after, high=True)
+ else:
+ 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))