Show last chats in archive dialog row.

Telegram/Resources/langs/lang.strings

@@ -1202,11 +1202,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_archived_remove" = "Unarchive";
 "lng_archived_added" = "Chat archived.\nMuted chats will stay archived after new messages arrive.";
 "lng_archived_removed" = "Chat restored from your archive.";
-"lng_archived_chats#one" = "{count} chat";
+"lng_archived_last_list" = "{accumulated}, {chat}";
-"lng_archived_chats#other" = "{count} chats";
+"lng_archived_last#one" = "{chats} and {count} more chat";
-"lng_archived_unread_two" = "{chat}, {second_chat}";
+"lng_archived_last#other" = "{chats} and {count} more chats";
-"lng_archived_unread#one" = "{chat}, {second_chat} and {count} more unread chat";
-"lng_archived_unread#other" = "{chat}, {second_chat} and {count} more unread chats";
 
 "lng_dialogs_text_with_from" = "{from_part} {message}";
 "lng_dialogs_text_from_wrapped" = "{from}:";

Telegram/SourceFiles/data/data_folder.cpp

@@ -26,7 +26,7 @@ namespace Data {
 namespace {
 
 constexpr auto kLoadedChatsMinCount = 20;
-constexpr auto kShowChatNamesCount = 2;
+constexpr auto kShowChatNamesCount = 8;
 
 rpl::producer<int> PinnedDialogsInFolderMaxValue() {
 	return rpl::single(
@@ -60,7 +60,7 @@ Folder::Folder(not_null<Data::Session*> owner, FolderId id)
 	Notify::PeerUpdateViewer(
 		Notify::PeerUpdate::Flag::NameChanged
 	) | rpl::start_with_next([=](const Notify::PeerUpdate &update) {
-		for (const auto history : _unreadHistoriesLast) {
+		for (const auto history : _lastHistories) {
 			if (history->peer == update.peer) {
 				++_chatListViewVersion;
 				updateChatListEntry();
@@ -112,6 +112,7 @@ void Folder::registerOne(not_null<History*> history) {
 		updateChatListEntry();
 	}
 	applyChatListMessage(history->chatListMessage());
+	reorderLastHistories();
 }
 
 void Folder::unregisterOne(not_null<History*> history) {
@@ -124,6 +125,7 @@ void Folder::unregisterOne(not_null<History*> history) {
 	if (_chatListMessage && _chatListMessage->history() == history) {
 		computeChatListMessage();
 	}
+	reorderLastHistories();
 }
 
 void Folder::oneListMessageChanged(HistoryItem *from, HistoryItem *to) {
@@ -131,10 +133,7 @@ void Folder::oneListMessageChanged(HistoryItem *from, HistoryItem *to) {
 		computeChatListMessage();
 	}
 	if (from || to) {
-		const auto history = from ? from->history() : to->history();
+		reorderLastHistories();
-		if (!history->chatListUnreadState().empty()) {
-			reorderUnreadHistories();
-		}
 	}
 }
 
@@ -171,49 +170,34 @@ void Folder::computeChatListMessage() {
 	updateChatListEntry();
 }
 
-void Folder::addUnreadHistory(not_null<History*> history) {
+void Folder::reorderLastHistories() {
-	const auto i = ranges::find(_unreadHistories, history);
-	if (i == end(_unreadHistories)) {
-		_unreadHistories.push_back(history);
-		reorderUnreadHistories();
-	}
-}
-
-void Folder::removeUnreadHistory(not_null<History*> history) {
-	const auto i = ranges::find(_unreadHistories, history);
-	if (i != end(_unreadHistories)) {
-		_unreadHistories.erase(i);
-		reorderUnreadHistories();
-	}
-}
-
-void Folder::reorderUnreadHistories() {
 	// We want first kShowChatNamesCount histories, by last message date.
-	const auto predicate = [](not_null<History*> a, not_null<History*> b) {
+	const auto pred = [](not_null<History*> a, not_null<History*> b) {
 		const auto aItem = a->chatListMessage();
 		const auto bItem = b->chatListMessage();
 		const auto aDate = aItem ? aItem->date() : TimeId(0);
 		const auto bDate = bItem ? bItem->date() : TimeId(0);
 		return aDate > bDate;
 	};
-	if (size(_unreadHistories) <= kShowChatNamesCount) {
+	_lastHistories.erase(_lastHistories.begin(), _lastHistories.end());
-		ranges::sort(_unreadHistories, predicate);
+	_lastHistories.reserve(kShowChatNamesCount + 1);
-		if (!ranges::equal(_unreadHistories, _unreadHistoriesLast)) {
+	auto &&histories = ranges::view::all(
-			_unreadHistoriesLast = _unreadHistories;
+		*_chatsList.indexed()
+	) | ranges::view::transform([](not_null<Dialogs::Row*> row) {
+		return row->history();
+	}) | ranges::view::filter([](History *history) {
+		return (history != nullptr);
+	}) | ranges::view::transform([](History *history) {
+		return not_null<History*>(history);
+	});
+	for (const auto history : histories) {
+		const auto i = ranges::upper_bound(_lastHistories, history, pred);
+		if (size(_lastHistories) < kShowChatNamesCount
+			|| i != end(_lastHistories)) {
+			_lastHistories.insert(i, history);
 		}
-	} else {
+		if (size(_lastHistories) > kShowChatNamesCount) {
-		const auto till = begin(_unreadHistories) + kShowChatNamesCount - 1;
+			_lastHistories.pop_back();
-		ranges::nth_element(_unreadHistories, till, predicate);
-		if constexpr (kShowChatNamesCount > 2) {
-			ranges::sort(begin(_unreadHistories), till, predicate);
-		}
-		auto &&head = ranges::view::all(
-			_unreadHistories
-		) | ranges::view::take_exactly(
-			kShowChatNamesCount
-		);
-		if (!ranges::equal(head, _unreadHistoriesLast)) {
-			_unreadHistoriesLast = head | ranges::to_vector;
 		}
 	}
 	++_chatListViewVersion;
@@ -296,12 +280,8 @@ int Folder::chatsListSize() const {
 		_chatsList.loaded() ? 0 : _cloudChatsListSize);
 }
 
-int Folder::unreadHistoriesCount() const {
+const std::vector<not_null<History*>> &Folder::lastHistories() const {
-	return _unreadHistories.size();
+	return _lastHistories;
-}
-
-const std::vector<not_null<History*>> &Folder::lastUnreadHistories() const {
-	return _unreadHistoriesLast;
 }
 
 uint32 Folder::chatListViewVersion() const {
@@ -380,14 +360,6 @@ void Folder::unreadStateChanged(
 		const Dialogs::Key &key,
 		const Dialogs::UnreadState &wasState,
 		const Dialogs::UnreadState &nowState) {
-	if (const auto history = key.history()) {
-		if (!wasState.empty() && nowState.empty()) {
-			removeUnreadHistory(history);
-		} else if (wasState.empty() && !nowState.empty()) {
-			addUnreadHistory(history);
-		}
-	}
-
 	const auto updateCloudUnread = _cloudUnread.known && wasState.known;
 	const auto notify = _chatsList.loaded() || updateCloudUnread;
 	const auto notifier = unreadStateChangeNotifier(notify);
@@ -404,16 +376,6 @@ void Folder::unreadEntryChanged(
 		const Dialogs::Key &key,
 		const Dialogs::UnreadState &state,
 		bool added) {
-	if (const auto history = key.history()) {
-		if (!state.empty()) {
-			if (added) {
-				addUnreadHistory(history);
-			} else {
-				removeUnreadHistory(history);
-			}
-		}
-	}
-
 	const auto updateCloudUnread = _cloudUnread.known && state.known;
 	const auto notify = _chatsList.loaded() || updateCloudUnread;
 	const auto notifier = unreadStateChangeNotifier(notify);

Telegram/SourceFiles/data/data_folder.h

@@ -80,8 +80,7 @@ public:
 	void setCloudChatsListSize(int size);
 
 	int chatsListSize() const;
-	int unreadHistoriesCount() const;
+	const std::vector<not_null<History*>> &lastHistories() const;
-	const std::vector<not_null<History*>> &lastUnreadHistories() const;
 	uint32 chatListViewVersion() const;
 
 private:
@@ -89,9 +88,7 @@ private:
 	bool applyChatListMessage(HistoryItem *item);
 	void computeChatListMessage();
 
-	void addUnreadHistory(not_null<History*> history);
+	void reorderLastHistories();
-	void removeUnreadHistory(not_null<History*> history);
-	void reorderUnreadHistories();
 	void finalizeCloudUnread();
 
 	FolderId _id = 0;
@@ -103,8 +100,7 @@ private:
 
 	Dialogs::UnreadState _cloudUnread;
 	int _cloudChatsListSize = 0;
-	std::vector<not_null<History*>> _unreadHistories;
+	std::vector<not_null<History*>> _lastHistories;
-	std::vector<not_null<History*>> _unreadHistoriesLast;
 	HistoryItem *_chatListMessage = nullptr;
 	uint32 _chatListViewVersion = 0;
 	//rpl::variable<MessagePosition> _unreadPosition;

Telegram/SourceFiles/dialogs/dialogs_row.cpp

@@ -20,33 +20,42 @@ namespace Dialogs {
 namespace {
 
 QString ComposeFolderListEntryText(not_null<Data::Folder*> folder) {
-	const auto &list = folder->lastUnreadHistories();
+	const auto &list = folder->lastHistories();
 	if (list.empty()) {
-		const auto count = folder->chatsListSize();
+		return QString();
-		if (!count) {
-			return QString();
-		}
-		return lng_archived_chats(lt_count, count);
 	}
+
 	const auto count = std::max(
 		int(list.size()),
-		folder->unreadHistoriesCount());
+		folder->chatsListSize());
-	if (list.size() == 1) {
+
-		return App::peerName(list[0]->peer);
+	const auto throwAwayLastName = (list.size() > 1)
-	} else if (count == 2) {
+		&& (count == list.size() + 1);
-		return lng_archived_unread_two(
+	auto &&peers = ranges::view::all(
-			lt_chat,
+		list
-			App::peerName(list[0]->peer),
+	) | ranges::view::take(
-			lt_second_chat,
+		list.size() - (throwAwayLastName ? 1 : 0)
-			App::peerName(list[1]->peer));
+	) | ranges::view::transform([](not_null<History*> history) {
-	}
+		return history->peer;
-	return lng_archived_unread(
+	});
-		lt_count,
+	const auto shown = int(peers.size());
-		count - 2,
+	const auto accumulated = [&] {
-		lt_chat,
+		Expects(shown > 0);
-		App::peerName(list[0]->peer),
+
-		lt_second_chat,
+		auto i = peers.begin();
-		App::peerName(list[1]->peer));
+		auto result = App::peerName(*i);
+		for (++i; i != peers.end(); ++i) {
+			result = lng_archived_last_list(
+				lt_accumulated,
+				result,
+				lt_chat,
+				App::peerName(*i));
+		}
+		return result;
+	}();
+	return (shown < count)
+		? lng_archived_last(lt_count, (count - shown), lt_chats, accumulated)
+		: accumulated;
 }
 
 } // namespace