From 2bd0fcbc51e8e8d554ce97013eeca7ec17a08ffe Mon Sep 17 00:00:00 2001
From: Alex <lightme16@users.noreply.github.com>
Date: Fri, 23 Oct 2020 08:14:27 +0300
Subject: [PATCH] Fix attached msg photos layout (#188)

* Fix attached msg photos layout

* handle urls in textEntityTypeTextUrl
---
 tg/controllers.py | 25 ++++++++++++++-----------
 tg/views.py       |  3 +++
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/tg/controllers.py b/tg/controllers.py
index 95695be..e608d94 100644
--- a/tg/controllers.py
+++ b/tg/controllers.py
@@ -118,23 +118,27 @@ class Controller:
     def open_url(self) -> None:
         msg = MsgProxy(self.model.current_msg)
         if not msg.is_text:
-            self.present_error("Does not contain urls")
-            return
+            return self.present_error("Does not contain urls")
         text = msg["content"]["text"]["text"]
         urls = []
         for entity in msg["content"]["text"]["entities"]:
-            if entity["type"]["@type"] != "textEntityTypeUrl":
+            _type = entity["type"]["@type"]
+            if _type == "textEntityTypeUrl":
+                offset = entity["offset"]
+                length = entity["length"]
+                url = text[offset : offset + length]
+            elif _type == "textEntityTypeTextUrl":
+                url = entity["type"]["url"]
+            else:
                 continue
-            offset = entity["offset"]
-            length = entity["length"]
-            url = text[offset : offset + length]
             urls.append(url)
         if not urls:
-            self.present_error("No url to open")
-            return
+            return self.present_error("No url to open")
         if len(urls) == 1:
             with suspend(self.view) as s:
-                s.call(config.DEFAULT_OPEN.format(file_path=shlex.quote(url)))
+                s.call(
+                    config.DEFAULT_OPEN.format(file_path=shlex.quote(urls[0]))
+                )
             return
         with suspend(self.view) as s:
             s.run_with_input(config.URL_VIEW, "\n".join(urls))
@@ -347,8 +351,7 @@ class Controller:
         is_deleted = self.model.delete_msgs()
         self.discard_selected_msgs()
         if not is_deleted:
-            self.present_error("Can't delete msg(s)")
-            return
+            return self.present_error("Can't delete msg(s)")
         self.present_info("Message deleted")
 
     @bind(msg_handler, ["S"])
diff --git a/tg/views.py b/tg/views.py
index 542f1e6..6ecc37a 100644
--- a/tg/views.py
+++ b/tg/views.py
@@ -362,6 +362,9 @@ class MsgView:
         if not msg_proxy.is_text or "web_page" not in msg_proxy.msg["content"]:
             return ""
         web = msg_proxy.msg["content"]["web_page"]
+        page_type = web["type"]
+        if page_type == "photo":
+            return f"\n | photo: {web['url']}"
         name = web["site_name"]
         title = web["title"]
         description = web["description"].replace("\n", "")