Merge branch 'master' into next-native-replies

2018-02-14 23:34:46 +02:00
parent 16b98fa44c 089d372334
commit aff2b313c5
6 changed files with 112 additions and 54 deletions
@@ -280,6 +280,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/>")