Merge branch 'master' into next-native-replies

mautrix_telegram/formatter.py

@@ -1,4 +1,3 @@
-# -*- coding: future_fstrings -*-
 # mautrix-telegram - A Matrix-Telegram puppeting bridge
 # Copyright (C) 2018 Tulir Asokan
 #
@@ -219,7 +218,7 @@ def telegram_reply_to_matrix(evt, source):
 
 
 async def telegram_event_to_matrix(evt, source, native_replies=False, message_link_in_reply=False,
-                                   main_intent=None):
+                                   main_intent=None, reply_text="Reply"):
     text = evt.message
     html = telegram_to_matrix(evt.message, evt.entities) if evt.entities else None
     relates_to = {}
@@ -269,12 +268,11 @@ async def telegram_event_to_matrix(evt, source, native_replies=False, message_li
                     displayname = puppet.displayname if puppet else sender
                     reply_to_user = (f"<a href='https://matrix.to/#/{sender}'>{displayname}</a>")
                     reply_to_msg = (("<a href='https://matrix.to/#/"
-                                     + f"{msg.mx_room}/{msg.mxid}'>Reply</a>")
+                                     + f"{msg.mx_room}/{msg.mxid}'>{reply_text}</a>")
                                     if message_link_in_reply else "Reply")
                     quote = f"{reply_to_msg} to {reply_to_user}<blockquote>{body}</blockquote>"
                 except (ValueError, KeyError, MatrixRequestError):
-                    quote = "Reply to unknown user <em>(Failed to fetch message)</em>:<br/>"
-
+                    quote = "{reply_text} to unknown user <em>(Failed to fetch message)</em>:<br/>"
                 if html:
                     html = quote + html
                 else: