From 2db6a627918fa649d5dfac22b3bb5ffa898ea966 Mon Sep 17 00:00:00 2001 From: Chris Brown Date: Mon, 15 Feb 2016 08:02:46 -0600 Subject: [PATCH 1/2] Fixes #49 --- hypchat/restobject.py | 3 ++- tests/test_history.py | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 tests/test_history.py diff --git a/hypchat/restobject.py b/hypchat/restobject.py index c94d21b..4ba9d89 100644 --- a/hypchat/restobject.py +++ b/hypchat/restobject.py @@ -169,7 +169,7 @@ def topic(self, text): 'topic': text, }) - def history(self, date='recent', maxResults=200): + def history(self, end_date, date='recent', maxResults=200): """ Requests the room history. @@ -179,6 +179,7 @@ def history(self, date='recent', maxResults=200): if date != 'recent': date, tz = mktimestamp(date) params = { + 'end-date': end_date, 'date': date, 'timezone': tz, 'max-results': maxResults, diff --git a/tests/test_history.py b/tests/test_history.py new file mode 100644 index 0000000..33103bd --- /dev/null +++ b/tests/test_history.py @@ -0,0 +1,11 @@ +import unittest +from common import TestHypChat +from datetime import datetime, timedelta +class TestHistory(TestHypChat): + def setUp(self): + super(TestHistory, self).setUp() + + def runTest(self): + date = datetime.now() + end_date = date + timedelta(days=-7) + messages = self.hipchat.get_room('SOME_ROOM_YOU_CAN_ACCESS').history(maxResults=999, end_date=end_date, date=date).contents() From 0028c894c8184728f882d1028f41752c23c8148f Mon Sep 17 00:00:00 2001 From: Chris Brown Date: Fri, 24 Jun 2016 08:54:33 -0500 Subject: [PATCH 2/2] end_date is optional --- hypchat/restobject.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hypchat/restobject.py b/hypchat/restobject.py index 4ba9d89..a7b5ad8 100644 --- a/hypchat/restobject.py +++ b/hypchat/restobject.py @@ -169,7 +169,7 @@ def topic(self, text): 'topic': text, }) - def history(self, end_date, date='recent', maxResults=200): + def history(self, end_date=None, date='recent', maxResults=200): """ Requests the room history.