Merge branch 'master' into next-native-replies

2018-02-13 13:46:07 +02:00
parent 65ba1f082b 317b7d3dc7
commit 04c4ba6429
1 changed files with 2 additions and 0 deletions
@@ -256,6 +256,8 @@ async def telegram_event_to_matrix(evt, source, native_replies=False, message_li
                    "event_id": msg.mxid,
                    "room_id": msg.mx_room,
                }
+                if reply_text == "Edit":
+                    html = "<u>Edit:</u> " + (html or escape(text))
            else:
                try:
                    event = await main_intent.get_event(msg.mx_room, msg.mxid)