Merge v4.14.13

# Conflicts:
#	Telegram/Resources/winrc/Telegram.rc
#	Telegram/Resources/winrc/Updater.rc
#	Telegram/SourceFiles/core/version.h
#	Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
#	Telegram/SourceFiles/history/view/media/history_view_photo.cpp
#	Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
#	Telegram/SourceFiles/mainwidget.cpp
#	Telegram/lib_ui
This commit is contained in:
ZavaruKitsu
2024-02-03 23:20:50 +03:00
251 changed files with 6957 additions and 2361 deletions
@@ -982,6 +982,16 @@ void SessionNavigation::showPollResults(
showSection(std::make_shared<Info::Memento>(poll, contextId), params);
}
void SessionNavigation::searchInChat(Dialogs::Key inChat) {
searchMessages(QString(), inChat);
}
void SessionNavigation::searchMessages(
const QString &query,
Dialogs::Key inChat) {
parentController()->content()->searchMessages(query, inChat);
}
auto SessionNavigation::showToast(Ui::Toast::Config &&config)
-> base::weak_ptr<Ui::Toast::Instance> {
return uiShow()->showToast(std::move(config));
@@ -1329,7 +1339,7 @@ void SessionController::activateFirstChatsFilter() {
bool SessionController::uniqueChatsInSearchResults() const {
return session().supportMode()
&& !session().settings().supportAllSearchResults()
&& !searchInChat.current();
&& !_searchInChat.current();
}
void SessionController::openFolder(not_null<Data::Folder*> folder) {