From 4295a823c64478623fa102655b85277b4589c04e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 7 Nov 2017 11:21:48 +0400
Subject: [PATCH] Improve bot About section in info profile.

---
 Telegram/SourceFiles/facades.cpp              |  9 +++++-
 .../profile/info_profile_inner_widget.cpp     |  6 +++-
 .../info/profile/info_profile_values.cpp      | 29 +++++++++++++++----
 .../info/profile/info_profile_values.h        |  6 ++++
 4 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/facades.cpp b/Telegram/SourceFiles/facades.cpp
index ac6890429..47916804b 100644
--- a/Telegram/SourceFiles/facades.cpp
+++ b/Telegram/SourceFiles/facades.cpp
@@ -155,7 +155,14 @@ void activateBotCommand(const HistoryItem *msg, int row, int col) {
 }
 
 void searchByHashtag(const QString &tag, PeerData *inPeer) {
-	if (MainWidget *m = main()) m->searchMessages(tag + ' ', (inPeer && inPeer->isChannel() && !inPeer->isMegagroup()) ? inPeer : 0);
+	if (MainWidget *m = main()) {
+		Ui::hideSettingsAndLayer();
+		Messenger::Instance().hideMediaView();
+		if (inPeer && (!inPeer->isChannel() || inPeer->isMegagroup())) {
+			inPeer = nullptr;
+		}
+		m->searchMessages(tag + ' ', inPeer);
+	}
 }
 
 void openPeerByName(const QString &username, MsgId msgId, const QString &startToken) {
diff --git a/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp b/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp
index 3b4152de7..3e637507a 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp
@@ -180,7 +180,11 @@ object_ptr<Ui::RpWidget> InnerWidget::setupInfo(
 	};
 	if (auto user = _peer->asUser()) {
 		addInfoOneLine(lng_info_mobile_label, PhoneValue(user));
-		addInfoLine(lng_info_bio_label, BioValue(user));
+		if (user->botInfo) {
+			addInfoLine(lng_info_about_label, AboutValue(user));
+		} else {
+			addInfoLine(lng_info_bio_label, BioValue(user));
+		}
 		addInfoOneLine(lng_info_username_label, UsernameValue(user));
 	} else {
 		addInfoOneLine(lng_info_link_label, LinkValue(_peer));
diff --git a/Telegram/SourceFiles/info/profile/info_profile_values.cpp b/Telegram/SourceFiles/info/profile/info_profile_values.cpp
index 05ddc58a0..b7e0c1c1f 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_values.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_values.cpp
@@ -44,16 +44,22 @@ rpl::producer<TextWithEntities> PhoneValue(
 		| WithEmptyEntities();
 }
 
-rpl::producer<TextWithEntities> BioValue(
+auto PlainBioValue(
 		not_null<UserData*> user) {
 	return Notify::PeerUpdateValue(
 			user,
 			Notify::PeerUpdate::Flag::AboutChanged)
-		| rpl::map([user] { return user->about(); })
+		| rpl::map([user] { return user->about(); });
+}
+
+rpl::producer<TextWithEntities> BioValue(
+		not_null<UserData*> user) {
+	return PlainBioValue(user)
+		| ToSingleLine()
 		| WithEmptyEntities();
 }
 
-rpl::producer<QString> PlainUsernameViewer(
+auto PlainUsernameValue(
 		not_null<PeerData*> peer) {
 	return Notify::PeerUpdateValue(
 			peer,
@@ -65,7 +71,7 @@ rpl::producer<QString> PlainUsernameViewer(
 
 rpl::producer<TextWithEntities> UsernameValue(
 		not_null<UserData*> user) {
-	return PlainUsernameViewer(user)
+	return PlainUsernameValue(user)
 		| rpl::map([](QString &&username) {
 			return username.isEmpty()
 				? QString()
@@ -82,13 +88,26 @@ rpl::producer<TextWithEntities> AboutValue(
 				Notify::PeerUpdate::Flag::AboutChanged)
 			| rpl::map([channel] { return channel->about(); })
 			| WithEmptyEntities();
+	} else if (auto user = peer->asUser()) {
+		if (user->botInfo) {
+			return PlainBioValue(user)
+				| WithEmptyEntities()
+				| rpl::map([](TextWithEntities &&text) {
+					auto flags = TextParseLinks
+						| TextParseMentions
+						| TextParseHashtags
+						| TextParseBotCommands;
+					TextUtilities::ParseEntities(text, flags);
+					return std::move(text);
+				});
+		}
 	}
 	return rpl::single(TextWithEntities{});
 }
 
 rpl::producer<TextWithEntities> LinkValue(
 		not_null<PeerData*> peer) {
-	return PlainUsernameViewer(peer)
+	return PlainUsernameValue(peer)
 		| rpl::map([](QString &&username) {
 			return username.isEmpty()
 				? QString()
diff --git a/Telegram/SourceFiles/info/profile/info_profile_values.h b/Telegram/SourceFiles/info/profile/info_profile_values.h
index a80a98ab2..14ee0d8ca 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_values.h
+++ b/Telegram/SourceFiles/info/profile/info_profile_values.h
@@ -33,6 +33,12 @@ class SlideWrap;
 namespace Info {
 namespace Profile {
 
+inline auto ToSingleLine() {
+	return rpl::map([](const QString &text) {
+		return TextUtilities::SingleLine(text);
+	});
+}
+
 inline auto WithEmptyEntities() {
 	return rpl::map([](QString &&text) {
 		return TextWithEntities{ std::move(text), {} };