plugin XEP-0060: getItems extra is now serialised dict
This commit is contained in:
parent
fcbbc2aeed
commit
f2a06bbcbf
1 changed files with 32 additions and 31 deletions
|
|
@ -77,7 +77,7 @@ class MergeRequests(object):
|
|||
self._handlers_list = [] # handlers sorted by priority
|
||||
self._type_handlers = {} # data type => handler map
|
||||
host.bridge.addMethod("mergeRequestsGet", ".plugin",
|
||||
in_sign='ssiassa{ss}s', out_sign='s',
|
||||
in_sign='ssiassss', out_sign='s',
|
||||
method=self._get,
|
||||
async_=True
|
||||
)
|
||||
|
|
@ -149,11 +149,10 @@ class MergeRequests(object):
|
|||
})
|
||||
|
||||
def _get(self, service='', node='', max_items=10, item_ids=None, sub_id=None,
|
||||
extra_dict=None, profile_key=C.PROF_KEY_NONE):
|
||||
if extra_dict and 'parse' in extra_dict:
|
||||
extra_dict['parse'] = C.bool(extra_dict['parse'])
|
||||
extra="", profile_key=C.PROF_KEY_NONE):
|
||||
extra = data_format.deserialise(extra)
|
||||
client, service, node, max_items, extra, sub_id = self._s.prepareBridgeGet(
|
||||
service, node, max_items, sub_id, extra_dict, profile_key)
|
||||
service, node, max_items, sub_id, extra, profile_key)
|
||||
d = self.get(client, service, node or None, max_items, item_ids, sub_id or None,
|
||||
extra.rsm_request, extra.extra)
|
||||
d.addCallback(self.serialise)
|
||||
|
|
|
|||
Loading…
Reference in a new issue