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

Improve forward and reply messages

Browse Source
This commit is contained in:
Sijmen Schoon 2016-11-15 08:28:42 +01:00
parent fe5f913ab9
commit 5af3faf9a3
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app_service.py
View File

@ -435,12 +435,12 @@ async def aiotg_message(chat, match):
msg_from = '{} (Telegram)'.format(fw_from['first_name']) msg_from = '{} (Telegram)'.format(fw_from['first_name'])
quoted_msg = '\n'.join(['>{}'.format(x) for x in message.split('\n')]) quoted_msg = '\n'.join(['>{}'.format(x) for x in message.split('\n')])
quoted_msg = 'Forwarded from {}, who said:\n{}' \ quoted_msg = 'Forwarded from {}:\n{}' \
.format(msg_from, quoted_msg) .format(msg_from, quoted_msg)
quoted_html = '<blockquote>{}</blockquote>' \ quoted_html = '<blockquote>{}</blockquote>' \
.format(html.escape(message).replace('\n', '<br />')) .format(html.escape(message).replace('\n', '<br />'))
quoted_html = '<i>Forwarded from {}, who said:</i>\n{}' \ quoted_html = '<i>Forwarded from {}:</i>\n{}' \
.format(html.escape(msg_from), quoted_html) .format(html.escape(msg_from), quoted_html)
j = await send_matrix_message(room_id, user_id, txn_id, j = await send_matrix_message(room_id, user_id, txn_id,
body=quoted_msg, body=quoted_msg,
@ -456,20 +456,20 @@ async def aiotg_message(chat, match):
else: else:
msg_from = '{} (Telegram)'.format(re_msg['from']['first_name']) msg_from = '{} (Telegram)'.format(re_msg['from']['first_name'])
date = datetime.fromtimestamp(re_msg['date']) \ date = datetime.fromtimestamp(re_msg['date']) \
.strftime('on %Y-%m-%d at %H:%M:%S') .strftime('%Y-%m-%d %H:%M:%S')
quoted_msg = '\n'.join(['>{}'.format(x) quoted_msg = '\n'.join(['>{}'.format(x)
for x in re_msg['text'].split('\n')]) for x in re_msg['text'].split('\n')])
quoted_msg = 'Reply to {}, who {} said:\n{}\n\n{}' \ quoted_msg = 'Reply to {} ({}):\n{}\n\n{}' \
.format(msg_from, date, quoted_msg, message) .format(msg_from, date, quoted_msg, message)
html_message = html.escape(message).replace('\n', '<br />')
quoted_html = '<blockquote>{}</blockquote>' \ quoted_html = '<blockquote>{}</blockquote>' \
.format(html.escape(re_msg['text']) .format(html.escape(re_msg['text'])
.replace('\n', '<br />')) .replace('\n', '<br />'))
quoted_html = '<i>Reply to {}, who {} said:</i><br />{}<p>{}</p>' \ quoted_html = '<i>Reply to {} ({}):</i><br />{}<p>{}</p>' \
.format(html.escape(msg_from), html.escape(str(date)), .format(html.escape(msg_from), html.escape(str(date)),
quoted_html, quoted_html, html_message)
html.escape(message).replace('\n', '<br />'))
j = await send_matrix_message(room_id, user_id, txn_id, j = await send_matrix_message(room_id, user_id, txn_id,
body=quoted_msg, body=quoted_msg,