From a2b04c9d71191e32c162b757b3f7f603d828043b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 7 Nov 2018 14:52:54 +0400
Subject: [PATCH] Improve checks for a hidden webpage url.

---
 .../history/history_media_types.cpp           | 28 ++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_media_types.cpp b/Telegram/SourceFiles/history/history_media_types.cpp
index 3fc14dc3c..577c89867 100644
--- a/Telegram/SourceFiles/history/history_media_types.cpp
+++ b/Telegram/SourceFiles/history/history_media_types.cpp
@@ -3473,14 +3473,34 @@ QSize HistoryWebPage::countOptimalSize() {
 
 	if (!_openl && !_data->url.isEmpty()) {
 		const auto previewOfHiddenUrl = [&] {
+			const auto simplify = [](const QString &url) {
+				auto result = url.toLower();
+				if (result.endsWith('/')) {
+					result.chop(1);
+				}
+				const auto prefixes = { qstr("http://"), qstr("https://") };
+				for (const auto &prefix : prefixes) {
+					if (result.startsWith(prefix)) {
+						result = result.mid(prefix.size());
+						break;
+					}
+				}
+				return result;
+			};
+			const auto simplified = simplify(_data->url);
 			const auto full = _parent->data()->originalText();
 			for (const auto &entity : full.entities) {
-				if (entity.type() == EntityInTextCustomUrl
-					&& entity.data() == _data->url) {
-					return true;
+				if (entity.type() != EntityInTextUrl) {
+					continue;
+				}
+				const auto link = full.text.mid(
+					entity.offset(),
+					entity.length());
+				if (simplify(link) == simplified) {
+					return false;
 				}
 			}
-			return false;
+			return true;
 		}();
 		_openl = previewOfHiddenUrl
 			? std::make_shared<HiddenUrlClickHandler>(_data->url)