From 9c84e5dcab35c95332f5dd68e589b22ac316adaf Mon Sep 17 00:00:00 2001 From: Goffi Date: Fri, 8 Nov 2019 11:55:21 +0100 Subject: [PATCH] plugin XEP-0277: fixed comments URLs parsing --- sat/plugins/plugin_xep_0060.py | 6 ++---- sat/plugins/plugin_xep_0277.py | 6 +++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/sat/plugins/plugin_xep_0060.py b/sat/plugins/plugin_xep_0060.py index 947015d5..13032ac7 100644 --- a/sat/plugins/plugin_xep_0060.py +++ b/sat/plugins/plugin_xep_0060.py @@ -1128,10 +1128,8 @@ class XEP_0060(object): """ items, metadata = items_data - def eb(failure): - log.warning( - "Error while serialising/parsing item: {}".format(str(failure.value)) - ) + def eb(failure_): + log.warning(f"Error while serialising/parsing item: {failure_.value}") d = defer.gatherResults([item_cb(item).addErrback(eb) for item in items]) diff --git a/sat/plugins/plugin_xep_0277.py b/sat/plugins/plugin_xep_0277.py index cd19e92a..38daa496 100644 --- a/sat/plugins/plugin_xep_0277.py +++ b/sat/plugins/plugin_xep_0277.py @@ -365,8 +365,8 @@ class XEP_0277(object): microblog_data[key] = link_elt["href"] try: service, node = self.parseCommentUrl(microblog_data[key]) - except: - log.warning("Can't parse url {}".format(microblog_data[key])) + except Exception as e: + log.warning(f"Can't parse url {microblog_data[key]}: {e}") del microblog_data[key] else: microblog_data["{}_service".format(key)] = service.full() @@ -853,7 +853,7 @@ class XEP_0277(object): """ parsed_url = urllib.parse.urlparse(node_url, "xmpp") service = jid.JID(parsed_url.path) - parsed_queries = urllib.parse.parse_qs(parsed_url.query.encode("utf-8")) + parsed_queries = urllib.parse.parse_qs(parsed_url.query) node = parsed_queries.get("node", [""])[0] if not node: