Allow skipping archive results in messages search.

Telegram/Resources/langs/lang.strings

@@ -1252,6 +1252,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_dialogs_text_media_wrapped" = "{media},";
 "lng_dialogs_show_all_chats" = "Show all chats";
 "lng_dialogs_hide_muted_chats" = "Hide muted chats";
+"lng_dialogs_skip_archive_in_search" = "Skip results from archive";
+"lng_dialogs_show_archive_in_search" = "With results from archive";
 
 "lng_open_this_link" = "Open this link?";
 "lng_open_link" = "Open";

Telegram/SourceFiles/auth_session.cpp

@@ -97,6 +97,7 @@ QByteArray AuthSessionSettings::serialize() const {
 		stream << qint32(_variables.archiveCollapsed.current() ? 1 : 0);
 		stream << qint32(_variables.notifyAboutPinned.current() ? 1 : 0);
 		stream << qint32(_variables.archiveInMainMenu.current() ? 1 : 0);
+		stream << qint32(_variables.skipArchiveInSearch.current() ? 1 : 0);
 	}
 	return result;
 }
@@ -136,6 +137,7 @@ void AuthSessionSettings::constructFromSerialized(const QByteArray &serialized)
 	qint32 archiveCollapsed = _variables.archiveCollapsed.current() ? 1 : 0;
 	qint32 notifyAboutPinned = _variables.notifyAboutPinned.current() ? 1 : 0;
 	qint32 archiveInMainMenu = _variables.archiveInMainMenu.current() ? 1 : 0;
+	qint32 skipArchiveInSearch = _variables.skipArchiveInSearch.current() ? 1 : 0;
 
 	stream >> selectorTab;
 	stream >> lastSeenWarningSeen;
@@ -224,6 +226,9 @@ void AuthSessionSettings::constructFromSerialized(const QByteArray &serialized)
 	if (!stream.atEnd()) {
 		stream >> archiveInMainMenu;
 	}
+	if (!stream.atEnd()) {
+		stream >> skipArchiveInSearch;
+	}
 	if (stream.status() != QDataStream::Ok) {
 		LOG(("App Error: "
 			"Bad data for AuthSessionSettings::constructFromSerialized()"));
@@ -296,6 +301,7 @@ void AuthSessionSettings::constructFromSerialized(const QByteArray &serialized)
 	_variables.archiveCollapsed = (archiveCollapsed == 1);
 	_variables.notifyAboutPinned = (notifyAboutPinned == 1);
 	_variables.archiveInMainMenu = (archiveInMainMenu == 1);
+	_variables.skipArchiveInSearch = (skipArchiveInSearch == 1);
 }
 
 void AuthSessionSettings::setSupportChatsTimeSlice(int slice) {
@@ -402,6 +408,18 @@ rpl::producer<bool> AuthSessionSettings::archiveCollapsedChanges() const {
 	return _variables.archiveCollapsed.changes();
 }
 
+void AuthSessionSettings::setArchiveInMainMenu(bool inMainMenu) {
+	_variables.archiveInMainMenu = inMainMenu;
+}
+
+bool AuthSessionSettings::archiveInMainMenu() const {
+	return _variables.archiveInMainMenu.current();
+}
+
+rpl::producer<bool> AuthSessionSettings::archiveInMainMenuChanges() const {
+	return _variables.archiveInMainMenu.changes();
+}
+
 void AuthSessionSettings::setNotifyAboutPinned(bool notify) {
 	_variables.notifyAboutPinned = notify;
 }
@@ -414,16 +432,16 @@ rpl::producer<bool> AuthSessionSettings::notifyAboutPinnedChanges() const {
 	return _variables.notifyAboutPinned.changes();
 }
 
-void AuthSessionSettings::setArchiveInMainMenu(bool inMainMenu) {
+void AuthSessionSettings::setSkipArchiveInSearch(bool skip) {
-	_variables.archiveInMainMenu = inMainMenu;
+	_variables.skipArchiveInSearch = skip;
 }
 
-bool AuthSessionSettings::archiveInMainMenu() const {
+bool AuthSessionSettings::skipArchiveInSearch() const {
-	return _variables.archiveInMainMenu.current();
+	return _variables.skipArchiveInSearch.current();
 }
 
-rpl::producer<bool> AuthSessionSettings::archiveInMainMenuChanges() const {
+rpl::producer<bool> AuthSessionSettings::skipArchiveInSearchChanges() const {
-	return _variables.archiveInMainMenu.changes();
+	return _variables.skipArchiveInSearch.changes();
 }
 
 AuthSession &Auth() {

Telegram/SourceFiles/auth_session.h

@@ -196,13 +196,17 @@ public:
 	bool archiveCollapsed() const;
 	rpl::producer<bool> archiveCollapsedChanges() const;
 
+	void setArchiveInMainMenu(bool inMainMenu);
+	bool archiveInMainMenu() const;
+	rpl::producer<bool> archiveInMainMenuChanges() const;
+
 	void setNotifyAboutPinned(bool notify);
 	bool notifyAboutPinned() const;
 	rpl::producer<bool> notifyAboutPinnedChanges() const;
 
-	void setArchiveInMainMenu(bool inMainMenu);
+	void setSkipArchiveInSearch(bool skip);
-	bool archiveInMainMenu() const;
+	bool skipArchiveInSearch() const;
-	rpl::producer<bool> archiveInMainMenuChanges() const;
+	rpl::producer<bool> skipArchiveInSearchChanges() const;
 
 	bool hadLegacyCallsPeerToPeerNobody() const {
 		return _variables.hadLegacyCallsPeerToPeerNobody;
@@ -257,8 +261,9 @@ private:
 		bool exeLaunchWarning = true;
 		Data::AutoDownload::Full autoDownload;
 		rpl::variable<bool> archiveCollapsed = false;
-		rpl::variable<bool> notifyAboutPinned = true;
 		rpl::variable<bool> archiveInMainMenu = false;
+		rpl::variable<bool> notifyAboutPinned = true;
+		rpl::variable<bool> skipArchiveInSearch = false;
 
 		static constexpr auto kDefaultSupportChatsLimitSlice
 			= 7 * 24 * 60 * 60;

Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp

@@ -1693,6 +1693,21 @@ void InnerWidget::fillSupportSearchMenu(not_null<Ui::PopupMenu*> menu) {
 	});
 }
 
+void InnerWidget::fillArchiveSearchMenu(not_null<Ui::PopupMenu*> menu) {
+	const auto folder = session().data().folderLoaded(Data::Folder::kId);
+	if (!folder || !folder->chatsListSize() || _searchInChat) {
+		return;
+	}
+	const auto skip = session().settings().skipArchiveInSearch();
+	const auto text = lang(skip
+		? lng_dialogs_show_archive_in_search
+		: lng_dialogs_skip_archive_in_search);
+	menu->addAction(text, [=] {
+		session().settings().setSkipArchiveInSearch(!skip);
+		session().saveSettingsDelayed();
+	});
+}
+
 void InnerWidget::contextMenuEvent(QContextMenuEvent *e) {
 	_menu = nullptr;
 
@@ -1712,8 +1727,7 @@ void InnerWidget::contextMenuEvent(QContextMenuEvent *e) {
 		} else if (_state == WidgetState::Filtered) {
 			if (base::in_range(_filteredSelected, 0, _filterResults.size())) {
 				return { _filterResults[_filteredSelected]->key(), FullMsgId() };
-			} else if (session().supportMode()
+			} else if (base::in_range(_searchedSelected, 0, _searchResults.size())) {
-				&& base::in_range(_searchedSelected, 0, _searchResults.size())) {
 				return {
 					_searchResults[_searchedSelected]->item()->history(),
 					_searchResults[_searchedSelected]->item()->fullId()
@@ -1730,8 +1744,12 @@ void InnerWidget::contextMenuEvent(QContextMenuEvent *e) {
 	}
 
 	_menu = base::make_unique_q<Ui::PopupMenu>(this);
-	if (session().supportMode() && row.fullId) {
+	if (row.fullId) {
-		fillSupportSearchMenu(_menu.get());
+		if (session().supportMode()) {
+			fillSupportSearchMenu(_menu.get());
+		} else {
+			fillArchiveSearchMenu(_menu.get());
+		}
 	} else if (const auto history = row.key.history()) {
 		Window::FillPeerMenu(
 			_controller,

Telegram/SourceFiles/dialogs/dialogs_inner_widget.h

@@ -240,6 +240,7 @@ private:
 		QRect updateRect = QRect(),
 		UpdateRowSections sections = UpdateRowSection::All);
 	void fillSupportSearchMenu(not_null<Ui::PopupMenu*> menu);
+	void fillArchiveSearchMenu(not_null<Ui::PopupMenu*> menu);
 
 	int dialogsOffset() const;
 	int fixedOnTopCount() const;

Telegram/SourceFiles/dialogs/dialogs_widget.cpp

@@ -176,6 +176,9 @@ Widget::Widget(
 		refreshLoadMoreButton(mayBlock, isBlocked);
 	}, lifetime());
 
+	fullSearchRefreshOn(session().settings().skipArchiveInSearchChanges(
+	) | rpl::map([] { return rpl::empty_value(); }));
+
 	connect(_inner, SIGNAL(draggingScrollDelta(int)), this, SLOT(onDraggingScrollDelta(int)));
 	connect(_inner, SIGNAL(mustScrollTo(int,int)), _scroll, SLOT(scrollToY(int,int)));
 	connect(_inner, SIGNAL(dialogMoved(int,int)), this, SLOT(onDialogMoved(int,int)));
@@ -365,7 +368,13 @@ void Widget::setupSupportMode() {
 		return;
 	}
 
-	session().settings().supportAllSearchResultsValue(
+	fullSearchRefreshOn(session().settings().supportAllSearchResultsValue(
+	) | rpl::map([] { return rpl::empty_value(); }));
+}
+
+void Widget::fullSearchRefreshOn(rpl::producer<> events) {
+	std::move(
+		events
 	) | rpl::filter([=] {
 		return !_searchQuery.isEmpty();
 	}) | rpl::start_with_next([=] {
@@ -777,10 +786,14 @@ bool Widget::onSearchMessages(bool searchCache) {
 		//		rpcDone(&Widget::searchReceived, SearchRequestType::FromStart),
 		//		rpcFail(&Widget::searchFailed, SearchRequestType::FromStart));
 		} else {
+			const auto flags = session().settings().skipArchiveInSearch()
+				? MTPmessages_SearchGlobal::Flag::f_folder_id
+				: MTPmessages_SearchGlobal::Flag(0);
+			const auto folderId = 0;
 			_searchRequest = MTP::send(
 				MTPmessages_SearchGlobal(
-					MTP_flags(0),
+					MTP_flags(flags),
-					MTP_int(0), // folder_id
+					MTP_int(folderId),
 					MTP_string(_searchQuery),
 					MTP_int(0),
 					MTP_inputPeerEmpty(),
@@ -916,10 +929,14 @@ void Widget::onSearchMore() {
 			//		rpcDone(&Widget::searchReceived, offsetId ? SearchRequestType::FromOffset : SearchRequestType::FromStart),
 			//		rpcFail(&Widget::searchFailed, offsetId ? SearchRequestType::FromOffset : SearchRequestType::FromStart));
 			} else {
+				const auto flags = session().settings().skipArchiveInSearch()
+					? MTPmessages_SearchGlobal::Flag::f_folder_id
+					: MTPmessages_SearchGlobal::Flag(0);
+				const auto folderId = 0;
 				_searchRequest = MTP::send(
 					MTPmessages_SearchGlobal(
-						MTP_flags(0),
+						MTP_flags(flags),
-						MTP_int(0), // folder_id
+						MTP_int(folderId),
 						MTP_string(_searchQuery),
 						MTP_int(_searchNextRate),
 						offsetPeer

Telegram/SourceFiles/dialogs/dialogs_widget.h

@@ -153,6 +153,7 @@ private:
 	QPixmap grabForFolderSlideAnimation();
 	void startSlideAnimation();
 
+	void fullSearchRefreshOn(rpl::producer<> events);
 	void applyFilterUpdate(bool force = false);
 	void refreshLoadMoreButton(bool mayBlock, bool isBlocked);
 	void loadMoreBlockedByDate();