Don't allow reordering of the archive.

Telegram/SourceFiles/apiwrap.cpp

@@ -875,7 +875,7 @@ void ApiWrap::requestPinnedDialogs() {
 
 			_session->data().processUsers(data.vusers);
 			_session->data().processChats(data.vchats);
-			_session->data().applyPinnedDialogs(data.vdialogs.v);
+			_session->data().clearPinnedDialogs();
 			_session->data().applyDialogs(
 				folderId,
 				data.vmessages.v,

Telegram/SourceFiles/data/data_folder.cpp

@@ -94,7 +94,7 @@ void Folder::registerOne(not_null<History*> history) {
 		}
 	}
 	if (_chatsList.size() == 1) {
-		updateChatListExistence();
+		updateChatListSortPosition();
 	}
 	owner().notifyFolderUpdated(this, FolderUpdateFlag::List);
 }
@@ -426,8 +426,8 @@ bool Folder::toImportant() const {
 	return !_importantChatsList.empty();
 }
 
-bool Folder::useProxyPromotion() const {
+int Folder::fixedOnTopIndex() const {
-	return false;
+	return kArchiveFixOnTopIndex;
 }
 
 bool Folder::shouldBeInChatList() const {

Telegram/SourceFiles/data/data_folder.h

@@ -62,7 +62,7 @@ public:
 	int unreadCount() const;
 	bool unreadCountKnown() const;
 
-	bool useProxyPromotion() const override;
+	int fixedOnTopIndex() const override;
 	bool toImportant() const override;
 	bool shouldBeInChatList() const override;
 	int chatListUnreadCount() const override;

Telegram/SourceFiles/data/data_session.cpp

@@ -1345,19 +1345,6 @@ void Session::setPinnedDialog(const Dialogs::Key &key, bool pinned) {
 	setIsPinned(key, pinned);
 }
 
-void Session::applyPinnedDialogs(const QVector<MTPDialog> &list) {
-	clearPinnedDialogs();
-	for (auto i = list.size(); i != 0;) {
-		list[--i].match([&](const MTPDdialog &data) {
-			if (const auto peer = peerFromMTP(data.vpeer)) {
-				setPinnedDialog(history(peer), true);
-			}
-		}, [&](const MTPDdialogFolder &data) {
-			setPinnedDialog(processFolder(data.vfolder), true);
-		});
-	}
-}
-
 void Session::applyPinnedDialogs(const QVector<MTPDialogPeer> &list) {
 	clearPinnedDialogs();
 	for (auto i = list.size(); i != 0;) {
@@ -1376,6 +1363,15 @@ void Session::applyDialogs(
 		FolderId requestFolderId,
 		const QVector<MTPMessage> &messages,
 		const QVector<MTPDialog> &dialogs) {
+	for (const auto &dialog : dialogs | ranges::view::reverse) {
+		dialog.match([&](const MTPDdialog &data) {
+			if (const auto peer = peerFromMTP(data.vpeer)) {
+				setPinnedDialog(history(peer), data.is_pinned());
+			}
+		}, [&](const MTPDdialogFolder &data) {
+			setPinnedDialog(processFolder(data.vfolder), data.is_pinned());
+		});
+	}
 	App::feedMsgs(messages, NewMessageLast);
 	for (const auto &dialog : dialogs) {
 		dialog.match([&](const auto &data) {
@@ -1393,7 +1389,7 @@ void Session::applyDialog(FolderId requestFolderId, const MTPDdialog &data) {
 	const auto history = session().data().history(peerId);
 	history->applyDialog(requestFolderId, data);
 
-	if (!history->useProxyPromotion() && !history->isPinnedDialog()) {
+	if (!history->fixedOnTopIndex() && !history->isPinnedDialog()) {
 		const auto date = history->chatListTimeId();
 		if (date != 0) {
 			addSavedPeersAfter(ParseDateTime(date));
@@ -1419,7 +1415,7 @@ void Session::applyDialog(
 	const auto folder = processFolder(dialog.vfolder);
 	folder->applyDialog(dialog);
 
-	if (!folder->useProxyPromotion() && !folder->isPinnedDialog()) {
+	if (!folder->fixedOnTopIndex() && !folder->isPinnedDialog()) {
 		const auto date = folder->chatListTimeId();
 		if (date != 0) {
 			addSavedPeersAfter(ParseDateTime(date));

Telegram/SourceFiles/data/data_session.h

@@ -307,7 +307,7 @@ public:
 	int pinnedDialogsCount() const;
 	const std::deque<Dialogs::Key> &pinnedDialogsOrder() const;
 	void setPinnedDialog(const Dialogs::Key &key, bool pinned);
-	void applyPinnedDialogs(const QVector<MTPDialog> &list);
+	void clearPinnedDialogs();
 	void applyPinnedDialogs(const QVector<MTPDialogPeer> &list);
 	void reorderTwoPinnedDialogs(
 		const Dialogs::Key &key1,
@@ -694,7 +694,6 @@ private:
 	}
 	void userIsContactUpdated(not_null<UserData*> user);
 
-	void clearPinnedDialogs();
 	void setIsPinned(const Dialogs::Key &key, bool pinned);
 
 	NotifySettings &defaultNotifySettings(not_null<const PeerData*> peer);

Telegram/SourceFiles/dialogs/dialogs_entry.cpp

@@ -29,8 +29,8 @@ uint64 DialogPosFromDate(TimeId date) {
 	return (uint64(date) << 32) | (++DialogsPosToTopShift);
 }
 
-uint64 ProxyPromotedDialogPos() {
+uint64 FixedOnTopDialogPos(int index) {
-	return 0xFFFFFFFFFFFF0001ULL;
+	return 0xFFFFFFFFFFFF000FULL - index;
 }
 
 uint64 PinnedDialogPos(int pinnedIndex) {
@@ -87,8 +87,9 @@ void Entry::updateChatListSortPosition() {
 		updateChatListEntry();
 		return;
 	}
-	_sortKeyInChatList = useProxyPromotion()
+	const auto fixedIndex = fixedOnTopIndex();
-		? ProxyPromotedDialogPos()
+	_sortKeyInChatList = fixedIndex
+		? FixedOnTopDialogPos(fixedIndex)
 		: isPinnedDialog()
 		? PinnedDialogPos(_pinnedIndex)
 		: DialogPosFromDate(adjustedChatListTimeId());

Telegram/SourceFiles/dialogs/dialogs_entry.h

@@ -70,7 +70,6 @@ public:
 	bool isProxyPromoted() const {
 		return _isProxyPromoted;
 	}
-	virtual bool useProxyPromotion() const = 0;
 	void cacheProxyPromoted(bool promoted);
 	uint64 sortKeyInChatList() const {
 		return _sortKeyInChatList;
@@ -81,6 +80,10 @@ public:
 	bool needUpdateInChatList() const;
 	virtual TimeId adjustedChatListTimeId() const;
 
+	virtual int fixedOnTopIndex() const = 0;
+	static constexpr auto kArchiveFixOnTopIndex = 1;
+	static constexpr auto kProxyPromotionFixOnTopIndex = 2;
+
 	virtual bool toImportant() const = 0;
 	virtual bool shouldBeInChatList() const = 0;
 	virtual int chatListUnreadCount() const = 0;

Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp

@@ -134,6 +134,19 @@ DialogsInner::DialogsInner(QWidget *parent, not_null<Window::Controller*> contro
 			UpdateRowSection::Default | UpdateRowSection::Filtered);
 	}, lifetime());
 
+	session().data().chatsListChanges(
+	) | rpl::filter([=](Data::Folder *folder) {
+		return (folder == _openedFolder);
+	}) | rpl::start_with_next([=] {
+		if (_openedFolder
+			&& _openedFolder->chatsList(Global::DialogsMode())->empty()) {
+			_openedFolder->updateChatListSortPosition();
+			cancelFolder();
+		} else {
+			refresh();
+		}
+	}, lifetime());
+
 	subscribe(Window::Theme::Background(), [=](const Window::Theme::BackgroundUpdate &data) {
 		if (data.paletteChanged()) {
 			Dialogs::Layout::clearUnreadBadgesCache();
@@ -214,8 +227,8 @@ int DialogsInner::dialogsOffset() const {
 
 int DialogsInner::proxyPromotedCount() const {
 	auto result = 0;
-	for_const (auto row, *shownDialogs()) {
+	for (const auto row : *shownDialogs()) {
-		if (row->entry()->useProxyPromotion()) {
+		if (row->entry()->fixedOnTopIndex()) {
 			++result;
 		} else {
 			break;
@@ -902,8 +915,8 @@ void DialogsInner::checkReorderPinnedStart(QPoint localPosition) {
 
 int DialogsInner::shownPinnedCount() const {
 	auto result = 0;
-	for_const (auto row, *shownDialogs()) {
+	for (const auto row : *shownDialogs()) {
-		if (row->entry()->useProxyPromotion()) {
+		if (row->entry()->fixedOnTopIndex()) {
 			continue;
 		} else if (!row->entry()->isPinnedDialog()) {
 			break;
@@ -918,8 +931,8 @@ int DialogsInner::countPinnedIndex(Dialogs::Row *ofRow) {
 		return -1;
 	}
 	auto result = 0;
-	for_const (auto row, *shownDialogs()) {
+	for (const auto row : *shownDialogs()) {
-		if (row->entry()->useProxyPromotion()) {
+		if (row->entry()->fixedOnTopIndex()) {
 			continue;
 		} else if (!row->entry()->isPinnedDialog()) {
 			break;
@@ -1342,7 +1355,7 @@ void DialogsInner::updateSearchResult(not_null<PeerData*> peer) {
 	if (_state == State::Filtered) {
 		if (!_peerSearchResults.empty()) {
 			auto index = 0, add = peerSearchOffset();
-			for_const (auto &result, _peerSearchResults) {
+			for (const auto &result : _peerSearchResults) {
 				if (result->peer == peer) {
 					rtlupdate(0, add + index * st::dialogsRowHeight, width(), st::dialogsRowHeight);
 					break;

Telegram/SourceFiles/dialogs/dialogs_layout.cpp

@@ -251,7 +251,7 @@ void paintRow(
 		namewidth,
 		st::msgNameFont->height);
 
-	const auto promoted = chat.entry()->useProxyPromotion()
+	const auto promoted = (history && history->useProxyPromotion())
 		&& !(flags & (Flag::SearchResult/* | Flag::FeedSearchResult*/)); // #feed
 	if (promoted) {
 		const auto text = lang(lng_proxy_sponsor);
@@ -278,7 +278,7 @@ void paintRow(
 		}
 
 		auto availableWidth = namewidth;
-		if (entry->isPinnedDialog()) {
+		if (entry->isPinnedDialog() && !entry->fixedOnTopIndex()) {
 			auto &icon = (active ? st::dialogsPinnedIconActive : (selected ? st::dialogsPinnedIconOver : st::dialogsPinnedIcon));
 			icon.paint(p, fullWidth - st::dialogsPadding.x() - icon.width(), texttop, fullWidth);
 			availableWidth -= icon.width() + st::dialogsUnreadPadding;
@@ -305,7 +305,7 @@ void paintRow(
 		}
 	} else if (!item) {
 		auto availableWidth = namewidth;
-		if (entry->isPinnedDialog()) {
+		if (entry->isPinnedDialog() && !entry->fixedOnTopIndex()) {
 			auto &icon = (active ? st::dialogsPinnedIconActive : (selected ? st::dialogsPinnedIconOver : st::dialogsPinnedIcon));
 			icon.paint(p, fullWidth - st::dialogsPadding.x() - icon.width(), texttop, fullWidth);
 			availableWidth -= icon.width() + st::dialogsUnreadPadding;
@@ -322,7 +322,7 @@ void paintRow(
 		}
 
 		paintItemCallback(nameleft, namewidth);
-	} else if (entry->isPinnedDialog()) {
+	} else if (entry->isPinnedDialog() && !entry->fixedOnTopIndex()) {
 		auto availableWidth = namewidth;
 		auto &icon = (active ? st::dialogsPinnedIconActive : (selected ? st::dialogsPinnedIconOver : st::dialogsPinnedIcon));
 		icon.paint(p, fullWidth - st::dialogsPadding.x() - icon.width(), texttop, fullWidth);
@@ -590,7 +590,8 @@ void RowPainter::paint(
 	const auto displayPinnedIcon = !displayUnreadCounter
 		&& !displayMentionBadge
 		&& !displayUnreadMark
-		&& entry->isPinnedDialog();
+		&& entry->isPinnedDialog()
+		&& !entry->fixedOnTopIndex();
 
 	const auto from = history
 		? (history->peer->migrateTo()

Telegram/SourceFiles/dialogs/dialogs_widget.cpp

@@ -184,13 +184,14 @@ DialogsWidget::DialogsWidget(QWidget *parent, not_null<Window::Controller*> cont
 	});
 	connect(_scroll, SIGNAL(geometryChanged()), _inner, SLOT(onParentGeometryChanged()));
 	connect(_scroll, SIGNAL(scrolled()), this, SLOT(onListScroll()));
+
 	session().data().chatsListChanges(
 	) | rpl::filter([=](Data::Folder *folder) {
 		return (folder == _inner->shownFolder());
 	}) | rpl::start_with_next([=] {
-		_inner->refresh();
+		Ui::PostponeCall(this, [=] { onListScroll(); });
-		onListScroll();
 	}, lifetime());
+
 	connect(_filter, &Ui::FlatInput::cancelled, [=] {
 		onCancel();
 	});

Telegram/SourceFiles/history/history.cpp

@@ -2425,6 +2425,10 @@ bool History::useProxyPromotion() const {
 	return false;
 }
 
+int History::fixedOnTopIndex() const {
+	return isProxyPromoted() ? kProxyPromotionFixOnTopIndex : 0;
+}
+
 bool History::shouldBeInChatList() const {
 	if (peer->migrateTo() || !folderKnown()) {
 		return false;

Telegram/SourceFiles/history/history.h

@@ -290,7 +290,8 @@ public:
 	void setForwardDraft(MessageIdsList &&items);
 
 	History *migrateSibling() const;
-	bool useProxyPromotion() const override;
+	bool useProxyPromotion() const;
+	int fixedOnTopIndex() const override;
 	void updateChatListExistence() override;
 	bool shouldBeInChatList() const override;
 	bool toImportant() const override;

Telegram/SourceFiles/window/window_peer_menu.cpp

@@ -472,7 +472,7 @@ void Filler::addChannelActions(not_null<ChannelData*> channel) {
 void Filler::fill() {
 	if (_source == PeerMenuSource::ChatsList) {
 		if (const auto history = _peer->owner().historyLoaded(_peer)) {
-			if (!history->useProxyPromotion()) {
+			if (!history->fixedOnTopIndex()) {
 				addPinToggle();
 			}
 		}