Skip to content

Fixes #49 #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
withoutairs wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixes #49 #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2db6a62
Fixes #49
Feb 15, 2016
0028c89
end_date is optional
chris-brown-rally Jun 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion hypchat/restobject.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ def topic(self, text):
'topic': text,
})

def history(self, date='recent', maxResults=200):
def history(self, end_date=None, date='recent', maxResults=200):
"""
Requests the room history.

Expand All @@ -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,
Expand Down
11 changes: 11 additions & 0 deletions tests/test_history.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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()