From bb167b14eff8db9aea4984932828fbab8f18759e Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Thu, 18 Jul 2019 23:22:57 +0300 Subject: [PATCH] Add/remove reply fallbacks in m.new_content --- mautrix_telegram/portal.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mautrix_telegram/portal.py b/mautrix_telegram/portal.py index a7a03d7f..6db414a2 100644 --- a/mautrix_telegram/portal.py +++ b/mautrix_telegram/portal.py @@ -996,9 +996,10 @@ class Portal: relates_to = message.get("m.relates_to", None) or {} if relates_to.get("rel_type", None) == "m.replace": orig_msg = DBMessage.get_by_mxid(relates_to.get("event_id", ""), self.mxid, space) - if orig_msg: - response = await client.edit_message(self.peer, orig_msg.tgid, - message.get("m.new_content", message), + if orig_msg and "m.new_content" in message: + message = message["m.new_content"] + formatter.matrix_reply_to_telegram(message, space, room_id=self.mxid) + response = await client.edit_message(self.peer, orig_msg.tgid, message, parse_mode=self._matrix_event_to_entities, link_preview=lp) self._add_telegram_message_to_db(event_id, space, -1, response) @@ -1699,8 +1700,7 @@ class Portal: edit_index=prev_edit_msg.edit_index + 1).insert() return - text, html, _ = await formatter.telegram_to_matrix(evt, source, self.main_intent, - no_reply_fallback=True) + text, html, _ = await formatter.telegram_to_matrix(evt, source, self.main_intent) editing_msg = DBMessage.get_one_by_tgid(TelegramID(evt.id), tg_space) if not editing_msg: self.log.info(f"Didn't find edited message {evt.id}@{tg_space} (src {source.tgid}) "