From 9b863fcf5be3ee2e2432f3a2c37c642273210d57 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 17 Jun 2015 23:07:25 +0300
Subject: [PATCH] version 0.8.27.dev ready

---
 Telegram/SourceFiles/app.cpp           | 6 +++---
 Telegram/SourceFiles/dropdown.cpp      | 8 ++++----
 Telegram/SourceFiles/historywidget.cpp | 4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Telegram/SourceFiles/app.cpp b/Telegram/SourceFiles/app.cpp
index 37ce64fcc..b3a51b5ac 100644
--- a/Telegram/SourceFiles/app.cpp
+++ b/Telegram/SourceFiles/app.cpp
@@ -546,7 +546,7 @@ namespace App {
 							i = chat->participants.erase(i);
 						} else {
 							if (i.key()->botInfo) {
-								botStatus = (botStatus > 0 || i.key()->botInfo->readsAllHistory) ? 2 : 1;
+								botStatus = (botStatus > 0/* || i.key()->botInfo->readsAllHistory*/) ? 2 : 1;
 								if (requestBotInfos && !i.key()->botInfo->inited) App::api()->requestFullPeer(i.key());
 							}
 							++i;
@@ -578,7 +578,7 @@ namespace App {
 					}
 					chat->count++;
 					if (user->botInfo) {
-						chat->botStatus = (chat->botStatus > 0 || !user->botInfo->readsAllHistory) ? 2 : 1;
+						chat->botStatus = (chat->botStatus > 0/* || !user->botInfo->readsAllHistory*/) ? 2 : 1;
 						if (!user->botInfo->inited) App::api()->requestFullPeer(user);
 					}
 				}
@@ -609,7 +609,7 @@ namespace App {
 						int32 botStatus = -1;
 						for (ChatData::Participants::const_iterator j = chat->participants.cbegin(), e = chat->participants.cend(); j != e; ++j) {
 							if (j.key()->botInfo) {
-								if (botStatus > 0 || !j.key()->botInfo->readsAllHistory) {
+								if (botStatus > 0/* || !j.key()->botInfo->readsAllHistory*/) {
 									botStatus = 2;
 									break;
 								}
diff --git a/Telegram/SourceFiles/dropdown.cpp b/Telegram/SourceFiles/dropdown.cpp
index ca2bcdbc3..95a8ee05f 100644
--- a/Telegram/SourceFiles/dropdown.cpp
+++ b/Telegram/SourceFiles/dropdown.cpp
@@ -2483,10 +2483,10 @@ void MentionsInner::paintEvent(QPaintEvent *e) {
 			int32 botStatus = _parent->chat() ? _parent->chat()->botStatus : -1;
 			if (hasUsername || botStatus == 0 || botStatus == 2) {
 				toHighlight += '@' + user->username;
-				if (botStatus == 0 || botStatus == 2) {
-					user->photo->load();
-					p.drawPixmap(st::mentionPadding.left(), i * st::mentionHeight + st::mentionPadding.top(), user->photo->pixRounded(st::mentionPhotoSize));
-				}
+			}
+			if (_parent->chat() || botStatus == 0 || botStatus == 2) {
+				user->photo->load();
+				p.drawPixmap(st::mentionPadding.left(), i * st::mentionHeight + st::mentionPadding.top(), user->photo->pixRounded(st::mentionPhotoSize));
 			}
 
 			int32 addleft = 0, widthleft = htagwidth;
diff --git a/Telegram/SourceFiles/historywidget.cpp b/Telegram/SourceFiles/historywidget.cpp
index de579be5e..c33fb61bf 100644
--- a/Telegram/SourceFiles/historywidget.cpp
+++ b/Telegram/SourceFiles/historywidget.cpp
@@ -3617,7 +3617,7 @@ void HistoryWidget::sendBotCommand(const QString &cmd, MsgId replyTo) { // reply
 	hist->loadAround(0);
 
 	int32 botStatus = histPeer->chat ? histPeer->asChat()->botStatus : -1;
-	App::main()->sendPreparedText(hist, cmd, replyTo ? ((histPeer->chat && (botStatus == 0 || botStatus == 2)) ? replyTo : -1) : 0);
+	App::main()->sendPreparedText(hist, cmd, replyTo ? ((histPeer->chat/* && (botStatus == 0 || botStatus == 2)*/) ? replyTo : -1) : 0);
 	if (replyTo) {
 		cancelReply();
 		if (_keyboard.hasMarkup() && _keyboard.singleUse() && _keyboard.forMsgId() == replyTo) {
@@ -3633,7 +3633,7 @@ void HistoryWidget::insertBotCommand(const QString &cmd) {
 	QString toInsert = cmd;
 	UserData *bot = histPeer->chat ? (App::hoveredLinkItem() ? (App::hoveredLinkItem()->toHistoryForwarded() ? App::hoveredLinkItem()->toHistoryForwarded()->fromForwarded() : App::hoveredLinkItem()->from()) : 0) : histPeer->asUser();
 	QString username = (bot && bot->botInfo) ? bot->username : QString();
-	if (cmd.indexOf('@') < 2 && !username.isEmpty()) {
+	if (cmd.indexOf('@') < 2 && histPeer->chat && !username.isEmpty() && (histPeer->asChat()->botStatus == 0 || histPeer->asChat()->botStatus == 2)) {
 		toInsert += '@' + username;
 	}
 	toInsert += ' ';