From f3ed7a674a3dd9faad27add7dde3badc0e19ee5e Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 18 Apr 2019 13:00:38 +0400 Subject: [PATCH] Create dialog rows only with known folders. --- Telegram/SourceFiles/data/data_folder.cpp | 8 +++- Telegram/SourceFiles/data/data_folder.h | 3 +- Telegram/SourceFiles/data/data_session.cpp | 4 +- .../SourceFiles/dialogs/dialogs_entry.cpp | 12 +++--- Telegram/SourceFiles/dialogs/dialogs_entry.h | 5 ++- Telegram/SourceFiles/history/history.cpp | 40 ++++++++++++------- Telegram/SourceFiles/history/history.h | 5 ++- 7 files changed, 50 insertions(+), 27 deletions(-) diff --git a/Telegram/SourceFiles/data/data_folder.cpp b/Telegram/SourceFiles/data/data_folder.cpp index 9b3a1a81f..b48246ff3 100644 --- a/Telegram/SourceFiles/data/data_folder.cpp +++ b/Telegram/SourceFiles/data/data_folder.cpp @@ -234,8 +234,14 @@ void Folder::requestChatListMessage() { } } +TimeId Folder::adjustedChatListTimeId() const { + return _chatsList.empty() + ? TimeId(0) + : (*_chatsList.begin())->entry()->adjustedChatListTimeId(); +} + int Folder::unreadCount() const { - return _unreadCount ? *_unreadCount : 0; + return _unreadCount.value_or(0); } rpl::producer Folder::unreadCountValue() const { diff --git a/Telegram/SourceFiles/data/data_folder.h b/Telegram/SourceFiles/data/data_folder.h index daa455861..78d393d87 100644 --- a/Telegram/SourceFiles/data/data_folder.h +++ b/Telegram/SourceFiles/data/data_folder.h @@ -30,7 +30,7 @@ struct FolderUpdate { //MessagePosition FeedPositionFromMTP(const MTPFeedPosition &position); // #feed -class Folder : public Dialogs::Entry { +class Folder final : public Dialogs::Entry { public: static constexpr auto kId = 1; @@ -58,6 +58,7 @@ public: //bool unreadMark() const; //int unreadCountForBadge() const; // unreadCount || unreadMark ? 1 : 0. + TimeId adjustedChatListTimeId() const override; int unreadCount() const; bool unreadCountKnown() const; diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp index 42910c52b..dcc317124 100644 --- a/Telegram/SourceFiles/data/data_session.cpp +++ b/Telegram/SourceFiles/data/data_session.cpp @@ -1435,7 +1435,9 @@ void Session::addSavedPeersAfter(const QDateTime &date) { saved.remove(lastDate, lastPeer); const auto history = session().data().history(lastPeer); - history->setChatListTimeId(ServerTimeFromParsed(lastDate)); + if (!history->chatListTimeId()) { + history->setChatListTimeId(ServerTimeFromParsed(lastDate)); + } } } diff --git a/Telegram/SourceFiles/dialogs/dialogs_entry.cpp b/Telegram/SourceFiles/dialogs/dialogs_entry.cpp index 331b03857..88a0877d8 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_entry.cpp +++ b/Telegram/SourceFiles/dialogs/dialogs_entry.cpp @@ -91,7 +91,7 @@ void Entry::updateChatListSortPosition() { ? ProxyPromotedDialogPos() : isPinnedDialog() ? PinnedDialogPos(_pinnedIndex) - : DialogPosFromDate(adjustChatListTimeId()); + : DialogPosFromDate(adjustedChatListTimeId()); if (needUpdateInChatList()) { setChatListExistence(true); } @@ -112,7 +112,7 @@ void Entry::setChatListExistence(bool exists) { } } -TimeId Entry::adjustChatListTimeId() const { +TimeId Entry::adjustedChatListTimeId() const { return chatListTimeId(); } @@ -145,13 +145,11 @@ PositionChange Entry::adjustByPosInChatList(Mode list) { } void Entry::setChatListTimeId(TimeId date) { - if (_timeId && _timeId >= date) { - if (!inChatList(Dialogs::Mode::All)) { - return; - } - } _timeId = date; updateChatListSortPosition(); + if (const auto folder = this->folder()) { + folder->updateChatListSortPosition(); + } } int Entry::posInChatList(Dialogs::Mode list) const { diff --git a/Telegram/SourceFiles/dialogs/dialogs_entry.h b/Telegram/SourceFiles/dialogs/dialogs_entry.h index 0148006e3..8cb01e6a3 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_entry.h +++ b/Telegram/SourceFiles/dialogs/dialogs_entry.h @@ -79,6 +79,7 @@ public: void setChatListTimeId(TimeId date); virtual void updateChatListExistence(); bool needUpdateInChatList() const; + virtual TimeId adjustedChatListTimeId() const; virtual bool toImportant() const = 0; virtual bool shouldBeInChatList() const = 0; @@ -92,6 +93,9 @@ public: virtual const base::flat_set &chatListNameWords() const = 0; virtual const base::flat_set &chatListFirstLetters() const = 0; + virtual bool folderKnown() const { + return true; + } virtual Data::Folder *folder() const { return nullptr; } @@ -119,7 +123,6 @@ public: mutable Text lastItemTextCache; private: - virtual TimeId adjustChatListTimeId() const; virtual void changedInChatListHook(Mode list, bool added); virtual void changedChatListPinHook(); diff --git a/Telegram/SourceFiles/history/history.cpp b/Telegram/SourceFiles/history/history.cpp index 752adc464..34ca2ff12 100644 --- a/Telegram/SourceFiles/history/history.cpp +++ b/Telegram/SourceFiles/history/history.cpp @@ -629,6 +629,9 @@ HistoryItem *History::addNewMessage( setLastMessage(item); if (type == NewMessageUnread) { newItemAdded(item); + if (!folderKnown()) { + session().api().requestDialogEntry(this); + } } return item; } @@ -1806,8 +1809,12 @@ std::shared_ptr History::adminLogIdManager() { return result; } +bool History::folderKnown() const { + return _folder.has_value(); +} + Data::Folder *History::folder() const { - return _folder; + return _folder.value_or(nullptr); } void History::setFolder( @@ -1824,36 +1831,41 @@ void History::clearFolder() { } void History::setFolderPointer(Data::Folder *folder) { + using Mode = Dialogs::Mode; + if (_folder == folder) { return; } - using Mode = Dialogs::Mode; - const auto wasAll = inChatList(Mode::All); - const auto wasImportant = wasAll && inChatList(Mode::Important); - if (wasAll) { + const auto wasKnown = folderKnown(); + const auto wasInAll = inChatList(Mode::All); + const auto wasInImportant = wasInAll && inChatList(Mode::Important); + if (wasInAll) { removeFromChatList(Mode::All); - if (wasImportant) { + if (wasInImportant) { removeFromChatList(Mode::Important); } } - const auto was = std::exchange(_folder, folder); + const auto was = _folder.value_or(nullptr); + _folder = folder; if (was) { was->unregisterOne(this); } - if (wasAll) { + if (wasInAll) { addToChatList(Mode::All); - if (wasImportant) { + if (wasInImportant) { addToChatList(Mode::Important); } owner().chatsListChanged(was); - owner().chatsListChanged(_folder); + owner().chatsListChanged(folder); + } else if (!wasKnown) { + updateChatListSortPosition(); } - if (_folder) { - _folder->registerOne(this); + if (folder) { + folder->registerOne(this); } } -TimeId History::adjustChatListTimeId() const { +TimeId History::adjustedChatListTimeId() const { const auto result = chatListTimeId(); if (const auto draft = cloudDraft()) { if (!Data::draftIsNull(draft) && !session().supportMode()) { @@ -2415,7 +2427,7 @@ bool History::useProxyPromotion() const { } bool History::shouldBeInChatList() const { - if (peer->migrateTo() || folder() != nullptr) { + if (peer->migrateTo() || !folderKnown()) { return false; } else if (isPinnedDialog()) { return true; diff --git a/Telegram/SourceFiles/history/history.h b/Telegram/SourceFiles/history/history.h index 8b14ec38a..353f1a0bf 100644 --- a/Telegram/SourceFiles/history/history.h +++ b/Telegram/SourceFiles/history/history.h @@ -323,6 +323,7 @@ public: std::shared_ptr adminLogIdManager(); + bool folderKnown() const override; Data::Folder *folder() const override; void setFolder( not_null folder, @@ -416,7 +417,7 @@ private: not_null view); void removeNotification(not_null item); - TimeId adjustChatListTimeId() const override; + TimeId adjustedChatListTimeId() const override; void changedInChatListHook(Dialogs::Mode list, bool added) override; void changedChatListPinHook() override; @@ -476,7 +477,7 @@ private: bool _loadedAtTop = false; bool _loadedAtBottom = true; - Data::Folder *_folder = nullptr; + std::optional _folder; std::optional _inboxReadBefore; std::optional _outboxReadBefore;