From 2155acd45b6369ff3be0fa12b9389a479514b0d8 Mon Sep 17 00:00:00 2001 From: Goffi Date: Sun, 6 Jun 2021 19:35:19 +0200 Subject: [PATCH] plugin forums: use serialised data for extra in forumTopicsGet --- sat/plugins/plugin_misc_forums.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sat/plugins/plugin_misc_forums.py b/sat/plugins/plugin_misc_forums.py index 8f338c1b..15990610 100644 --- a/sat/plugins/plugin_misc_forums.py +++ b/sat/plugins/plugin_misc_forums.py @@ -21,7 +21,7 @@ from sat.core.i18n import _ from sat.core.constants import Const as C from sat.core import exceptions from sat.core.log import getLogger -from sat.tools.common import uri +from sat.tools.common import uri, data_format from twisted.words.protocols.jabber import jid from twisted.words.xish import domish from twisted.internet import defer @@ -73,7 +73,7 @@ class forums(object): method=self._set, async_=True) host.bridge.addMethod("forumTopicsGet", ".plugin", - in_sign='ssa{ss}s', out_sign='(aa{ss}a{ss})', + in_sign='ssa{ss}s', out_sign='(aa{ss}s)', method=self._getTopics, async_=True) host.bridge.addMethod("forumTopicCreate", ".plugin", @@ -249,7 +249,9 @@ class forums(object): client = self.host.getClient(profile_key) extra = self._p.parseExtra(extra) d = self.getTopics(client, jid.JID(service), node, rsm_request=extra.rsm_request, extra=extra.extra) - d.addCallback(lambda topics_metadata: (topics_metadata[0], {k: str(v) for k,v in topics_metadata[1].items()})) + d.addCallback( + lambda topics_data: (topics_data[0], data_format.serialise(topics_data[1])) + ) return d @defer.inlineCallbacks