From 44fea382317b59e87ce46b1d3b5fc435ae9cc56c Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Thu, 15 Feb 2018 14:01:14 +0200
Subject: [PATCH] Fix lint warnings and properly handle ShortMessages

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

diff --git a/mautrix_telegram/formatter.py b/mautrix_telegram/formatter.py
index 2faa1146..824dc96e 100644
--- a/mautrix_telegram/formatter.py
+++ b/mautrix_telegram/formatter.py
@@ -242,8 +242,9 @@ async def telegram_event_to_matrix(evt, source, native_replies=False, message_li
                 + f"<blockquote>{html}</blockquote>")
 
     if evt.reply_to_msg_id:
-        space = evt.to_id.channel_id if isinstance(evt, Message) and isinstance(evt.to_id,
-                                                                                PeerChannel) else source.tgid
+        space = (evt.to_id.channel_id
+                 if isinstance(evt, Message) and isinstance(evt.to_id, PeerChannel)
+                 else source.tgid)
         msg = DBMessage.query.get((evt.reply_to_msg_id, space))
         if msg:
             if native_replies:
@@ -260,7 +261,7 @@ async def telegram_event_to_matrix(evt, source, native_replies=False, message_li
                     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_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_text}</a>")
                                     if message_link_in_reply else "Reply")
@@ -272,7 +273,7 @@ async def telegram_event_to_matrix(evt, source, native_replies=False, message_li
             else:
                 html = quote + escape(text)
 
-    if evt.post and evt.post_author:
+    if isinstance(evt, Message) and evt.post and evt.post_author:
         if not html:
             html = escape(text)
         text += f"\n- {evt.post_author}"