Skip to content

fixed getting _hash property #119

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.

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

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 13 additions & 0 deletions pubnub/endpoints/fetch_messages.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ def __init__(self, pubnub):
self._end = None
self._count = None
self._include_meta = None
self._include_uuid = None
self._include_message_actions = None

def channels(self, channels):
Expand Down Expand Up @@ -59,6 +60,11 @@ def include_meta(self, include_meta):
self._include_meta = include_meta
return self

def include_uuid(self, include_uuid):
assert isinstance(include_uuid, bool)
self._include_uuid = include_uuid
return self

def include_message_actions(self, include_message_actions):
assert isinstance(include_message_actions, bool)
self._include_message_actions = include_message_actions
Expand All @@ -76,6 +82,10 @@ def custom_params(self):
if self._include_meta is not None:
params['include_meta'] = "true" if self._include_meta else "false"

if self._include_uuid is not None:
params['include_uuid'] = "true" if self._include_uuid else "false"


return params

def build_path(self):
Expand Down Expand Up @@ -104,6 +114,9 @@ def validate_params(self):

if self._include_meta is None:
self._include_meta = False

if self._include_uuid is None:
self._include_uuid = False

if self._include_message_actions is None:
self._include_message_actions = False
Expand Down
4 changes: 2 additions & 2 deletions pubnub/endpoints/objects_v2/objects_endpoint.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@ def custom_params(self):

if self._page:
if isinstance(self._page, Next):
params["start"] = self._page.hash()
params["start"] = self._page.hash
elif isinstance(self._page, Previous):
params["end"] = self._page.hash()
params["end"] = self._page.hash
else:
raise ValueError()

Expand Down
6 changes: 5 additions & 1 deletion pubnub/models/consumer/history.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@ def from_json(cls, json_input, include_message_actions=False, start_timetoken=No
if 'meta' in item:
message.meta = item['meta']

if 'uuid' in item:
message.uuid = item['uuid']

if include_message_actions:
if 'actions' in item:
message.actions = item['actions']
Expand All @@ -89,11 +92,12 @@ def from_json(cls, json_input, include_message_actions=False, start_timetoken=No


class PNFetchMessageItem(object):
def __init__(self, message, timetoken, meta=None, actions=None):
def __init__(self, message, timetoken, uuid=None, meta=None, actions=None):
self.message = message
self.meta = meta
self.timetoken = timetoken
self.actions = actions
self.uuid = uuid

def __str__(self):
return "Fetch message item with tt: %s and content: %s" % (self.timetoken, self.message)