Merge branch 'master' of github.com:vurpo/telematrix

This commit is contained in:
Max Sandholm 2017-09-21 13:36:49 +02:00
commit 3a21a819b9

View File

@ -97,7 +97,7 @@ def format_matrix_msg(form, content):
:return: The formatted string.
"""
if 'format' in content and content['format'] == 'org.matrix.custom.html':
re.sub("<a href=\"https://matrix.to/#/@telegram_([0-9]+):{}\">(.+?)</a>".format(MATRIX_HOST_BARE), "<a href=\"tg://user?id=\\1\">\\2</a>", content['formatted_body'])
re.sub("<a href=\\\"https://matrix.to/#/@telegram_([0-9]+):{}\\\">(.+?)</a>".format(MATRIX_HOST_BARE), "<a href=\"tg://user?id=\\1\">\\2</a>", content['formatted_body'])
sanitized = sanitize_html(content['formatted_body'])
return html.escape(form).format(sanitized), 'HTML'
else: