From 352b0f207994107864416e3107d639d77b6cb2f7 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 7 Jul 2016 19:16:47 +0300
Subject: [PATCH] Ignoring accents when autocompleting mentions in
 field_autocomplete. Do nothing instead of showing in folder a media file with
 bad extension. Showing descriptive error message when we hit the limit of
 stickerpacks.

---
 Telegram/Resources/langs/lang.strings               | 1 +
 Telegram/SourceFiles/boxes/stickersetbox.cpp        | 6 +++++-
 Telegram/SourceFiles/history/field_autocomplete.cpp | 6 ++++--
 Telegram/SourceFiles/mainwidget.cpp                 | 4 ----
 Telegram/SourceFiles/structs.cpp                    | 4 ----
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 9f87cedca..771cd8a25 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -680,6 +680,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 "lng_stickers_add_pack" = "Add stickers";
 "lng_stickers_share_pack" = "Share Stickers";
 "lng_stickers_not_found" = "Sticker pack not found.";
+"lng_stickers_too_many_packs" = "You have too many sticker packs. Please remove some first.";
 "lng_stickers_copied" = "Sticker pack link copied to clipboard.";
 "lng_stickers_default_set" = "Great Minds";
 "lng_stickers_you_have" = "Manage and reorder sticker packs";
diff --git a/Telegram/SourceFiles/boxes/stickersetbox.cpp b/Telegram/SourceFiles/boxes/stickersetbox.cpp
index 10ad1a6ec..2510a7cd6 100644
--- a/Telegram/SourceFiles/boxes/stickersetbox.cpp
+++ b/Telegram/SourceFiles/boxes/stickersetbox.cpp
@@ -154,7 +154,11 @@ void StickerSetInner::installDone(const MTPBool &result) {
 bool StickerSetInner::installFailed(const RPCError &error) {
 	if (MTP::isDefaultHandledError(error)) return false;
 
-	Ui::showLayer(new InformBox(lang(lng_stickers_not_found)));
+	if (error.type() == qstr("STICKERSETS_TOO_MUCH")) {
+		Ui::showLayer(new InformBox(lang(lng_stickers_too_many_packs)));
+	} else {
+		Ui::showLayer(new InformBox(lang(lng_stickers_not_found)));
+	}
 
 	return true;
 }
diff --git a/Telegram/SourceFiles/history/field_autocomplete.cpp b/Telegram/SourceFiles/history/field_autocomplete.cpp
index c62e7637e..2fd38b1e8 100644
--- a/Telegram/SourceFiles/history/field_autocomplete.cpp
+++ b/Telegram/SourceFiles/history/field_autocomplete.cpp
@@ -104,7 +104,7 @@ void FieldAutocomplete::showFiltered(PeerData *peer, QString query, bool addInli
 	bool resetScroll = (_type != type || _filter != plainQuery);
 	if (resetScroll) {
 		_type = type;
-		_filter = plainQuery.toString();
+		_filter = textAccentFold(plainQuery.toString());
 	}
 	_addInlineBots = addInlineBots;
 
@@ -259,7 +259,9 @@ void FieldAutocomplete::updateFiltered(bool resetScroll) {
 		auto &recent(cRecentWriteHashtags());
 		hrows.reserve(recent.size());
 		for (auto i = recent.cbegin(), e = recent.cend(); i != e; ++i) {
-			if (!listAllSuggestions && (!i->first.startsWith(_filter, Qt::CaseInsensitive) || i->first.size() == _filter.size())) continue;
+			if (!listAllSuggestions && (!i->first.startsWith(_filter, Qt::CaseInsensitive) || i->first.size() == _filter.size())) {
+				continue;
+			}
 			hrows.push_back(i->first);
 		}
 	} else if (_type == Type::BotCommands) {
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index 99dd01174..27663838d 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -1543,8 +1543,6 @@ void MainWidget::audioPlayProgress(const AudioMsgId &audioId) {
 		if (!filepath.isEmpty()) {
 			if (documentIsValidMediaFile(filepath)) {
 				psOpenFile(filepath);
-			} else {
-				psShowInFolder(filepath);
 			}
 		}
 	}
@@ -1574,8 +1572,6 @@ void MainWidget::documentPlayProgress(const SongMsgId &songId) {
 		if (!filepath.isEmpty()) {
 			if (documentIsValidMediaFile(filepath)) {
 				psOpenFile(filepath);
-			} else {
-				psShowInFolder(filepath);
 			}
 		}
 	}
diff --git a/Telegram/SourceFiles/structs.cpp b/Telegram/SourceFiles/structs.cpp
index 54b8f7800..fa6da44b7 100644
--- a/Telegram/SourceFiles/structs.cpp
+++ b/Telegram/SourceFiles/structs.cpp
@@ -979,8 +979,6 @@ void DocumentOpenClickHandler::doOpen(DocumentData *data, ActionOnLoad action) {
 			auto filepath = location.name();
 			if (documentIsValidMediaFile(filepath)) {
 				psOpenFile(filepath);
-			} else {
-				psShowInFolder(filepath);
 			}
 			if (App::main()) App::main()->mediaMarkRead(data);
 		} else if (data->size < MediaViewImageSizeLimit) {
@@ -1278,8 +1276,6 @@ void DocumentData::performActionOnLoad() {
 			if (voice() || song() || isVideo()) {
 				if (documentIsValidMediaFile(already)) {
 					psOpenFile(already);
-				} else {
-					psShowInFolder(already);
 				}
 				if (App::main()) App::main()->mediaMarkRead(this);
 			} else if (loc.accessEnable()) {