erebion/libervia-backend
Watch
1
0
Fork
You've already forked libervia-backend
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

plugin XEP-0060: use client instead of profile_key in getItems

Browse source
This commit is contained in:
Goffi 2017-09-24 16:32:22 +02:00
commit 3f2c1046eb
1 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/plugins/plugin_xep_0277.py
View file

@ -630,7 +630,7 @@ class XEP_0277(object):
"""
if node is None:
node = NS_MICROBLOG
items_data = yield self._p.getItems(service, node, max_items=max_items, item_ids=item_ids, rsm_request=rsm_request, extra=extra, profile_key=client.profile)
items_data = yield self._p.getItems(client, service, node, max_items=max_items, item_ids=item_ids, rsm_request=rsm_request, extra=extra)
serialised = yield self._p.serItemsDataD(items_data, self.item2mbdata)
defer.returnValue(serialised)
@ -892,6 +892,8 @@ class XEP_0277(object):
# to serialise and associate the data, but it make life in frontends side
# a lot easier
client, node_data = self._getClientAndNodeData(publishers_type, publishers, profile_key)
def getComments(items_data):
"""Retrieve comments and add them to the items_data
@ -910,7 +912,7 @@ class XEP_0277(object):
service_s = value
node = item["{}{}".format(prefix, "_node")]
# time to get the comments
d = self._p.getItems(jid.JID(service_s), node, max_comments, rsm_request=rsm_comments, extra=extra_comments, profile_key=profile_key)
d = self._p.getItems(client, jid.JID(service_s), node, max_comments, rsm_request=rsm_comments, extra=extra_comments)
# then serialise
d.addCallback(lambda items_data: self._p.serItemsDataD(items_data, self.item2mbdata))
# with failure handling
@ -930,10 +932,9 @@ class XEP_0277(object):
items_d.addCallback(lambda items_completed: (items_completed, metadata))
return items_d
client, node_data = self._getClientAndNodeData(publishers_type, publishers, profile_key)
deferreds = {}
for service, node in node_data:
d = deferreds[(service, node)] = self._p.getItems(service, node, max_items, rsm_request=rsm_request, extra=extra, profile_key=profile_key)
d = deferreds[(service, node)] = self._p.getItems(client, service, node, max_items, rsm_request=rsm_request, extra=extra)
d.addCallback(lambda items_data: self._p.serItemsDataD(items_data, self.item2mbdata))
d.addCallback(getComments)
d.addCallback(lambda items_comments_data: ('', items_comments_data))