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

.gitignore

@@ -122,33 +122,36 @@ Session.vim
 tags
 
 
+#VSCode
+.vscode
+
 ### macOS ###
-*.DS_Store
-.AppleDouble
-.LSOverride
-
-# Icon must end with two \r
-Icon
-
-
-# Thumbnails
-._*
-
-# Files that might appear in the root of a volume
-.DocumentRevisions-V100
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.VolumeIcon.icns
-.com.apple.timemachine.donotpresent
-
-# Directories potentially created on remote AFP share
-.AppleDB
-.AppleDesktop
-Network Trash Folder
-Temporary Items
-.apdisk
+*.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
 
 # Config
 config.json

telematrix/__init__.py

@@ -12,6 +12,7 @@ from datetime import datetime
 from time import time
 from urllib.parse import unquote, quote, urlparse, parse_qs
 from io import BytesIO
+import re
 
 from PIL import Image
 from aiohttp import web, ClientSession
@@ -96,6 +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'])
         sanitized = sanitize_html(content['formatted_body'])
         return html.escape(form).format(sanitized), 'HTML'
     else: