Reload topics on channelDifferenceTooLong.

Telegram/SourceFiles/api/api_updates.cpp

@@ -395,6 +395,9 @@ void Updates::channelDifferenceDone(
 			data.vmessages().v,
 			QVector<MTPDialog>(1, data.vdialog()));
 		session().data().channelDifferenceTooLong(channel);
+		if (const auto forum = channel->forum()) {
+			forum->reloadTopics();
+		}
 	}, [&](const MTPDupdates_channelDifference &data) {
 		feedChannelDifference(data);
 		channel->ptsInit(data.vpts().v);
@@ -2210,7 +2213,9 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 				}
 				const auto history = channel->owner().history(channel);
 				history->requestChatListMessage();
-				if (!history->unreadCountKnown()) {
+				if (!history->folderKnown()
+					|| (!history->unreadCountKnown()
+						&& !history->peer->isForum())) {
 					history->owner().histories().requestDialogEntry(history);
 				}
 				if (!channel->amCreator()) {

Telegram/SourceFiles/data/data_forum.cpp

@@ -32,6 +32,7 @@ namespace {
 constexpr auto kTopicsFirstLoad = 20;
 constexpr auto kLoadedTopicsMinCount = 20;
 constexpr auto kTopicsPerPage = 500;
+constexpr auto kStalePerRequest = 100;
 constexpr auto kGeneralColorId = 0xA9A9A9;
 
 } // namespace
@@ -47,12 +48,17 @@ Forum::Forum(not_null<History*> history)
 }
 
 Forum::~Forum() {
+	for (const auto &request : _topicRequests) {
+		if (request.second.id != _staleRequestId) {
+			owner().histories().cancelRequest(request.second.id);
+		}
+	}
+	if (_staleRequestId) {
+		session().api().request(_staleRequestId).cancel();
+	}
 	if (_requestId) {
 		session().api().request(_requestId).cancel();
 	}
-	for (const auto &request : _topicRequests) {
-		owner().histories().cancelRequest(request.second.id);
-	}
 }
 
 Session &Forum::owner() const {
@@ -100,6 +106,19 @@ void Forum::preloadTopics() {
 	}
 }
 
+void Forum::reloadTopics() {
+	_allLoaded = false;
+	session().api().request(base::take(_requestId)).cancel();
+	_offsetDate = 0;
+	_offsetId = _offsetTopicId = 0;
+	for (const auto &[rootId, topic] : _topics) {
+		if (!topic->creating()) {
+			_staleRootIds.emplace(topic->rootId());
+		}
+	}
+	requestTopics();
+}
+
 void Forum::requestTopics() {
 	if (_allLoaded || _requestId) {
 		return;
@@ -121,6 +140,7 @@ void Forum::requestTopics() {
 		if (_allLoaded) {
 			_chatsListLoadedEvents.fire({});
 		}
+		requestSomeStale();
 	}).fail([=](const MTP::Error &error) {
 		_allLoaded = true;
 		_requestId = 0;
@@ -161,6 +181,7 @@ void Forum::applyReceivedTopics(
 		const auto rootId = topic.match([&](const auto &data) {
 			return data.vid().v;
 		});
+		_staleRootIds.remove(rootId);
 		topic.match([&](const MTPDforumTopicDeleted &data) {
 			if (updateOffset) {
 				LOG(("API Error: Got a deleted topic in getForumTopics."));
@@ -189,9 +210,67 @@ void Forum::applyReceivedTopics(
 		&& (list.isEmpty() || list.size() == data.vcount().v)) {
 		_allLoaded = true;
 	}
+	if (!_staleRootIds.empty()) {
+		requestSomeStale();
+	}
+}
+
+void Forum::requestSomeStale() {
+	if (_staleRequestId || (!_offsetId && _requestId)) {
+		return;
+	}
+	const auto type = Histories::RequestType::History;
+	auto rootIds = QVector<MTPint>();
+	rootIds.reserve(std::min(int(_staleRootIds.size()), kStalePerRequest));
+	for (auto i = begin(_staleRootIds); i != end(_staleRootIds);) {
+		const auto rootId = *i;
+		i = _staleRootIds.erase(i);
+
+		if (_topicRequests.contains(rootId)) {
+			continue;
+		}
+		rootIds.push_back(MTP_int(rootId));
+		if (rootIds.size() == kStalePerRequest) {
+			break;
+		}
+	}
+	const auto call = [=] {
+		for (const auto &id : rootIds) {
+			finishTopicRequest(id.v);
+		}
+	};
+	auto &histories = owner().histories();
+	_staleRequestId = histories.sendRequest(_history, type, [=](
+			Fn<void()> finish) {
+		return session().api().request(
+			MTPchannels_GetForumTopicsByID(
+				channel()->inputChannel,
+				MTP_vector<MTPint>(rootIds))
+		).done([=](const MTPmessages_ForumTopics &result) {
+			applyReceivedTopics(result);
+			call();
+			finish();
+		}).fail([=] {
+			call();
+			finish();
+		}).send();
+	});
+	for (const auto &id : rootIds) {
+		_topicRequests[id.v].id = _staleRequestId;
+	}
+}
+
+void Forum::finishTopicRequest(MsgId rootId) {
+	if (const auto request = _topicRequests.take(rootId)) {
+		for (const auto &callback : request->callbacks) {
+			callback();
+		}
+	}
 }
 
 void Forum::requestTopic(MsgId rootId, Fn<void()> done) {
+	_staleRootIds.remove(rootId);
+
 	auto &request = _topicRequests[rootId];
 	if (done) {
 		request.callbacks.push_back(std::move(done));
@@ -200,11 +279,7 @@ void Forum::requestTopic(MsgId rootId, Fn<void()> done) {
 		return;
 	}
 	const auto call = [=] {
-		if (const auto request = _topicRequests.take(rootId)) {
+		finishTopicRequest(rootId);
-			for (const auto &callback : request->callbacks) {
-				callback();
-			}
-		}
 	};
 	const auto type = Histories::RequestType::History;
 	auto &histories = owner().histories();
@@ -215,11 +290,9 @@ void Forum::requestTopic(MsgId rootId, Fn<void()> done) {
 				channel()->inputChannel,
 				MTP_vector<MTPint>(1, MTP_int(rootId.bare)))
 		).done([=](const MTPmessages_ForumTopics &result) {
-			if (const auto forum = _history->peer->forum()) {
+			applyReceivedTopics(result);
-				forum->applyReceivedTopics(result);
+			call();
-				call();
+			finish();
-				finish();
-			}
 		}).fail([=] {
 			call();
 			finish();

Telegram/SourceFiles/data/data_forum.h

@@ -39,6 +39,7 @@ public:
 		-> rpl::producer<not_null<ForumTopic*>>;
 
 	void preloadTopics();
+	void reloadTopics();
 	void requestTopics();
 	[[nodiscard]] rpl::producer<> chatsListChanges() const;
 	[[nodiscard]] rpl::producer<> chatsListLoadedEvents() const;
@@ -79,6 +80,9 @@ private:
 		std::vector<Fn<void()>> callbacks;
 	};
 
+	void requestSomeStale();
+	void finishTopicRequest(MsgId rootId);
+
 	void applyReceivedTopics(
 		const MTPmessages_ForumTopics &topics,
 		bool updateOffset);
@@ -90,6 +94,8 @@ private:
 	Dialogs::MainList _topicsList;
 
 	base::flat_map<MsgId, TopicRequest> _topicRequests;
+	base::flat_set<MsgId> _staleRootIds;
+	mtpRequestId _staleRequestId = 0;
 
 	mtpRequestId _requestId = 0;
 	TimeId _offsetDate = 0;

Telegram/SourceFiles/history/history.cpp

@@ -1185,7 +1185,7 @@ void History::newItemAdded(not_null<HistoryItem*> item) {
 		if (item->unread(this)) {
 			if (unreadCountKnown()) {
 				setUnreadCount(unreadCount() + 1);
-			} else {
+			} else if (!peer->isForum()) {
 				owner().histories().requestDialogEntry(this);
 			}
 		} else {

Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp

@@ -678,9 +678,10 @@ void TopBarWidget::mousePressEvent(QMouseEvent *e) {
 		&& !showSelectedState()
 		&& !_chooseForReportReason;
 	if (handleClick) {
-		if (_animatingMode && _back->rect().contains(e->pos())) {
+		if ((_animatingMode && _back->rect().contains(e->pos()))
+			|| (_activeChat.section == Section::ChatsList)) {
 			backClicked();
-		} else  {
+		} else {
 			infoClicked();
 		}
 	}
@@ -690,8 +691,6 @@ void TopBarWidget::infoClicked() {
 	const auto key = _activeChat.key;
 	if (!key) {
 		return;
-	} else if (key.folder()) {
-		_controller->closeFolder();
 	} else if (const auto topic = key.topic()) {
 		_controller->showSection(std::make_shared<Info::Memento>(topic));
 	} else if (key.peer()->isSelf()) {

Telegram/lib_base

@@ -1 +1 @@
-Subproject commit 12814dcf5067d687c47c710689902fd1219bec4f
+Subproject commit eca70a7b2df50c775224116fd3f6eebdf5cc4907