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

Fix Telegram forwards

Browse Source
This commit is contained in:
Sijmen Schoon 2016-11-15 07:00:00 +00:00
parent 9f805b87cb
commit fe5f913ab9
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app_service.py
View File

@ -433,17 +433,15 @@ async def aiotg_message(chat, match):
fw_from['last_name']) fw_from['last_name'])
else: else:
msg_from = '{} (Telegram)'.format(fw_from['first_name']) msg_from = '{} (Telegram)'.format(fw_from['first_name'])
date = datetime.fromtimestamp(fw_from['date'])
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 {}, who said:\n{}' \
.format(msg_from, date, 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 {}, who said:</i>\n{}' \
.format(html.escape(msg_from), html.escape(str(date)), .format(html.escape(msg_from), quoted_html)
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,
formatted_body=quoted_html, formatted_body=quoted_html,