From 40178d5917962fdb6dd9f2a5ba06b8c1396291ec Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Sat, 10 Feb 2018 11:38:34 +0200
Subject: [PATCH] Show correct displayname in reply to pill

---
 mautrix_telegram/formatter.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mautrix_telegram/formatter.py b/mautrix_telegram/formatter.py
index c233201b..016fc998 100644
--- a/mautrix_telegram/formatter.py
+++ b/mautrix_telegram/formatter.py
@@ -254,8 +254,10 @@ def telegram_event_to_matrix(evt, source, native_replies=False, message_link_in_
                     body = (content["formatted_body"]
                             if "formatted_body" in content
                             else content["body"])
-                    reply_to_user = ("<a href='https://matrix.to/#/"
-                                     + f"{event['sender']}'>{event['sender']}</a>")
+                    sender = event['sender']
+                    puppet = p.Puppet.get_by_mxid(sender, create=False)
+                    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>")
                                     if message_link_in_reply else "Reply")