From 6ceb7f735c40f73197580ff8fab25c5adb22afab Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Wed, 13 Feb 2019 00:15:24 +0200
Subject: [PATCH] Show channel name or link in forwarded messages. Fixes #107

---
 mautrix_telegram/formatter/from_telegram.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/mautrix_telegram/formatter/from_telegram.py b/mautrix_telegram/formatter/from_telegram.py
index 59554a07..0cc9b673 100644
--- a/mautrix_telegram/formatter/from_telegram.py
+++ b/mautrix_telegram/formatter/from_telegram.py
@@ -87,6 +87,19 @@ async def _add_forward_header(source, text: str, html: Optional[str],
             if user:
                 fwd_from_text = pu.Puppet.get_displayname(user, False)
                 fwd_from_html = f"<b>{fwd_from_text}</b>"
+    else:
+        portal = po.Portal.get_by_tgid(TelegramID(fwd_from.channel_id))
+        if portal:
+            fwd_from_text = portal.title
+            if portal.alias:
+                fwd_from_html = f"<a href='https://matrix.to/#/{portal.alias}'>{fwd_from_text}</a>"
+            else:
+                fwd_from_html = f"<b>{fwd_from_text}</b>"
+        else:
+            channel = await source.client.get_entity(PeerChannel(fwd_from.channel_id))
+            if channel:
+                fwd_from_text = channel.title
+                fwd_from_html = f"<b>{fwd_from_text}</b>"
 
     if not fwd_from_text:
         if fwd_from.from_id: