plugin XEP-0060: getItem(s), publish and (un)subscribe are now coroutines
This commit is contained in:
parent
a3e6425eb2
commit
bab851006f
1 changed files with 165 additions and 161 deletions
|
|
@ -941,13 +941,14 @@ 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)
|
||||
d = self.mbGet(client, service, node or None, max_items, item_ids,
|
||||
d = defer.ensureDeferred(
|
||||
self.mbGet(client, service, node or None, max_items, item_ids,
|
||||
extra.rsm_request, extra.extra)
|
||||
)
|
||||
d.addCallback(self._mbGetSerialise)
|
||||
return d
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def mbGet(self, client, service=None, node=None, max_items=10, item_ids=None,
|
||||
async def mbGet(self, client, service=None, node=None, max_items=10, item_ids=None,
|
||||
rsm_request=None, extra=None):
|
||||
"""Get some microblogs
|
||||
|
||||
|
|
@ -963,7 +964,7 @@ class XEP_0277(object):
|
|||
"""
|
||||
if node is None:
|
||||
node = NS_MICROBLOG
|
||||
items_data = yield self._p.getItems(
|
||||
items_data = await self._p.getItems(
|
||||
client,
|
||||
service,
|
||||
node,
|
||||
|
|
@ -972,9 +973,9 @@ class XEP_0277(object):
|
|||
rsm_request=rsm_request,
|
||||
extra=extra,
|
||||
)
|
||||
mb_data = yield self._p.transItemsDataD(
|
||||
mb_data = await self._p.transItemsDataD(
|
||||
items_data, partial(self.item2mbdata, client, service=service, node=node))
|
||||
defer.returnValue(mb_data)
|
||||
return mb_data
|
||||
|
||||
def _mbRename(self, service, node, item_id, new_id, profile_key):
|
||||
return defer.ensureDeferred(self.mbRename(
|
||||
|
|
@ -1372,13 +1373,15 @@ class XEP_0277(object):
|
|||
service = jid.JID(service_s)
|
||||
node = item["{}{}".format(prefix, "_node")]
|
||||
# time to get the comments
|
||||
d = self._p.getItems(
|
||||
client,
|
||||
service,
|
||||
node,
|
||||
max_comments,
|
||||
rsm_request=rsm_comments,
|
||||
extra=extra_comments,
|
||||
d = defer.ensureDeferred(
|
||||
self._p.getItems(
|
||||
client,
|
||||
service,
|
||||
node,
|
||||
max_comments,
|
||||
rsm_request=rsm_comments,
|
||||
extra=extra_comments,
|
||||
)
|
||||
)
|
||||
# then serialise
|
||||
d.addCallback(
|
||||
|
|
@ -1420,9 +1423,9 @@ class XEP_0277(object):
|
|||
|
||||
deferreds = {}
|
||||
for service, node in node_data:
|
||||
d = deferreds[(service, node)] = self._p.getItems(
|
||||
d = deferreds[(service, node)] = defer.ensureDeferred(self._p.getItems(
|
||||
client, service, node, max_items, rsm_request=rsm_request, extra=extra
|
||||
)
|
||||
))
|
||||
d.addCallback(
|
||||
lambda items_data: self._p.transItemsDataD(
|
||||
items_data,
|
||||
|
|
|
|||
Loading…
Reference in a new issue