stonewareslord/telematrix
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #43 from vurpo/master

Browse Source 
Telegram message formatting changes
This commit is contained in:
Sijmen Schoon 2017-11-04 15:50:02 +01:00 committed by GitHub
commit a4ff6e81c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
telematrix/__init__.py
View File

@ -12,6 +12,7 @@ from datetime import datetime
from time import time from time import time
from urllib.parse import unquote, quote, urlparse, parse_qs from urllib.parse import unquote, quote, urlparse, parse_qs
from io import BytesIO from io import BytesIO
import re
from PIL import Image from PIL import Image
from aiohttp import web, ClientSession from aiohttp import web, ClientSession
@ -82,26 +83,26 @@ def sanitize_html(string):
soup = BeautifulSoup(string, 'html.parser') soup = BeautifulSoup(string, 'html.parser')
for tag in soup.find_all(True): for tag in soup.find_all(True):
if tag.name == 'blockquote': if tag.name == 'blockquote':
tag.string = ('\n' + tag.text).replace('\n', '\n> ').rstrip('\n>') tag.string = ('\n' + tag.text).replace('\n', '\n> ')[3:-3]
if tag.name not in VALID_TAGS: if tag.name not in VALID_TAGS:
tag.hidden = True tag.hidden = True
return soup.renderContents().decode('utf-8') return soup.renderContents().decode('utf-8')
def format_matrix_msg(form, username, content): def format_matrix_msg(form, content):
""" """
Formats a matrix message for sending to Telegram Formats a matrix message for sending to Telegram
:param form: The format string of the message, where the first parameter :param form: The format string of the message, where the first parameter
is the username and the second one the message. is the username and the second one the message.
:param username: The username of the user.
:param content: The content to be sent. :param content: The content to be sent.
:return: The formatted string. :return: The formatted string.
""" """
if 'format' in content and content['format'] == 'org.matrix.custom.html': if 'format' in content and content['format'] == 'org.matrix.custom.html':
sanitized = sanitize_html(content['formatted_body']) sanitized = re.sub("<a href=\\\"https://matrix.to/#/@telegram_([0-9]+):{}\\\">(.+?) \(Telegram\)</a>".format(MATRIX_HOST_BARE), "<a href=\"tg://user?id=\\1\">\\2</a>", content['formatted_body'])
return html.escape(form).format(username, sanitized), 'HTML' sanitized = sanitize_html(sanitized)
return html.escape(form).format(sanitized), 'HTML'
else: else:
return form.format(username, content['body']), None return form.format(html.escape(content['body'])), None
async def download_matrix_file(url, filename): async def download_matrix_file(url, filename):
@ -229,14 +230,14 @@ async def matrix_transaction(request):
continue continue
if content['msgtype'] == 'm.text': if content['msgtype'] == 'm.text':
msg, mode = format_matrix_msg('<{}> {}', displayname, content) msg, mode = format_matrix_msg('{}', content)
response = await group.send_text(msg, parse_mode=mode) response = await group.send_text("<b>{}:</b> {}".format(displayname, msg), parse_mode='HTML')
elif content['msgtype'] == 'm.notice': elif content['msgtype'] == 'm.notice':
msg, mode = format_matrix_msg('[{}] {}', displayname, content) msg, mode = format_matrix_msg('{}', content)
response = await group.send_text(msg, parse_mode=mode) response = await group.send_text("[{}] {}".format(displayname, msg), parse_mode=mode)
elif content['msgtype'] == 'm.emote': elif content['msgtype'] == 'm.emote':
msg, mode = format_matrix_msg('* {} {}', displayname, content) msg, mode = format_matrix_msg('{}', content)
response = await group.send_text(msg, parse_mode=mode) response = await group.send_text("* {} {}".format(displayname, msg), parse_mode=mode)
elif content['msgtype'] == 'm.image': elif content['msgtype'] == 'm.image':
try: try:
url = urlparse(content['url']) url = urlparse(content['url'])
@ -255,8 +256,7 @@ async def matrix_transaction(request):
.format(url.netloc, quote(url.path)) .format(url.netloc, quote(url.path))
url_str = await shorten_url(url_str) url_str = await shorten_url(url_str)
caption = '<{}> {} ({})'.format(displayname, caption = '{} sent an image'.format(displayname)
content['body'], url_str)
response = await group.send_photo(img_file, caption=caption) response = await group.send_photo(img_file, caption=caption)
except: except:
pass pass