Merge branch 'master' into python3.5

2018-02-14 23:35:33 +02:00
parent 6d99258c99 089d372334
commit c29059d5d5
6 changed files with 114 additions and 58 deletions
@@ -272,6 +272,12 @@ async def telegram_event_to_matrix(evt, source, native_replies=False, message_li
            else:
                html = quote + escape(text)

+    if evt.post and evt.post_author:
+        if not html:
+            html = escape(text)
+        text += f"\n- {evt.post_author}"
+        html += f"<br/><i>- <u>{evt.post_author}</u></i>"
+
    if html:
        html = html.replace("\n", "<br/>")