plugin XEP-0313: fixed MAMGet signature
This commit is contained in:
parent
7f713e39f3
commit
e60b64d876
2 changed files with 5 additions and 3 deletions
|
|
@ -69,7 +69,7 @@ class XEP_0313(object):
|
|||
self._last_stanza_id_d.callback(None)
|
||||
host.bridge.addMethod(
|
||||
"MAMGet", ".plugin", in_sign='sss',
|
||||
out_sign='(a(sdssa{ss}a{ss}sa{ss})a{ss}s)', method=self._getArchives,
|
||||
out_sign='(a(sdssa{ss}a{ss}ss)ss)', method=self._getArchives,
|
||||
async_=True)
|
||||
|
||||
@defer.inlineCallbacks
|
||||
|
|
@ -331,7 +331,7 @@ class XEP_0313(object):
|
|||
'rsm': self._rsm.response2dict(rsm_response),
|
||||
'mam': mam_response
|
||||
}
|
||||
return mess_list, metadata, client.profile
|
||||
return mess_list, data_format.serialise(metadata), client.profile
|
||||
|
||||
def _getArchives(self, service, extra_ser, profile_key):
|
||||
"""
|
||||
|
|
|
|||
|
|
@ -236,12 +236,14 @@ class MAM(base.CommandBase):
|
|||
if value is not None:
|
||||
extra[key] = str(value)
|
||||
try:
|
||||
data, metadata, profile = await self.host.bridge.MAMGet(
|
||||
data, metadata_s, profile = await self.host.bridge.MAMGet(
|
||||
self.args.service, data_format.serialise(extra), self.profile)
|
||||
except Exception as e:
|
||||
self.disp(f"can't retrieve MAM archives: {e}", error=True)
|
||||
self.host.quit(C.EXIT_BRIDGE_ERRBACK)
|
||||
|
||||
metadata = data_format.deserialise(metadata_s)
|
||||
|
||||
try:
|
||||
session_info = await self.host.bridge.sessionInfosGet(self.profile)
|
||||
except Exception as e:
|
||||
|
|
|
|||
Loading…
Reference in a new issue