plugin XEP-0277: max_items fix (last "fix" about it was actually bad)

This commit is contained in:
Goffi 2017-06-29 23:40:12 +02:00
commit cbeb350bd5

View file

@ -605,7 +605,7 @@ class XEP_0277(object):
service = jid.JID(service) if service else None
max_items = None if max_items == C.NO_LIMIT else max_items
extra = self._p.parseExtra(extra_dict)
return self.mbGet(client, service, node or None, None if max_items==C.NO_LIMIT else None, item_ids, extra.rsm_request, extra.extra)
return self.mbGet(client, service, node or None, max_items, item_ids, extra.rsm_request, extra.extra)
@defer.inlineCallbacks
@ -804,7 +804,7 @@ class XEP_0277(object):
max_items = None if max_items == C.NO_LIMIT else max_items
publishers_type, publishers = self._checkPublishers(publishers_type, publishers)
extra = self._p.parseExtra(extra_dict)
return self.mbGetFromMany(publishers_type, publishers, None if max_items==C.NO_LIMIT else max_items, extra.rsm_request, extra.extra, profile_key)
return self.mbGetFromMany(publishers_type, publishers, max_items, extra.rsm_request, extra.extra, profile_key)
def mbGetFromMany(self, publishers_type, publishers, max_items=None, rsm_request=None, extra=None, profile_key=C.PROF_KEY_NONE):
"""Get the published microblogs for a list of groups or jids
@ -861,7 +861,7 @@ class XEP_0277(object):
publishers_type, publishers = self._checkPublishers(publishers_type, publishers)
extra = self._p.parseExtra(extra_dict)
extra_comments = self._p.parseExtra(extra_comments_dict)
return self.mbGetFromManyWithComments(publishers_type, publishers, None if max_items==C.NO_LIMIT else max_items, max_comments or None,
return self.mbGetFromManyWithComments(publishers_type, publishers, max_items, max_comments or None,
extra.rsm_request,
extra.extra,
extra_comments.rsm_request,