diff --git a/Telegram/SourceFiles/base/unique_any.h b/Telegram/SourceFiles/base/unique_any.h new file mode 100644 index 0000000000..4a8f6a62cf --- /dev/null +++ b/Telegram/SourceFiles/base/unique_any.h @@ -0,0 +1,243 @@ +/* +This file is part of Telegram Desktop, +the official desktop version of Telegram messaging app, see https://telegram.org + +Telegram Desktop is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +It is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +In addition, as a special exception, the copyright holders give permission +to link the code of portions of this program with the OpenSSL library. + +Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE +Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org +*/ +#pragma once + +#include + +namespace base { +namespace details { + +template +struct moveable_as_copyable_wrap { + moveable_as_copyable_wrap(Value &&other) + : value(std::move(other)) { + } + moveable_as_copyable_wrap &operator=(Value &&other) { + value = std::move(other); + return *this; + } + moveable_as_copyable_wrap(moveable_as_copyable_wrap &&other) + : value(std::move(other.value)) { + } + moveable_as_copyable_wrap( + const moveable_as_copyable_wrap &other) { + Unexpected("Attempt to copy-construct a move-only type."); + } + moveable_as_copyable_wrap &operator=( + moveable_as_copyable_wrap &&other) { + value = std::move(other.value); + return *this; + } + moveable_as_copyable_wrap &operator=( + const moveable_as_copyable_wrap &other) { + Unexpected("Attempt to copy-assign a move-only type."); + } + + Value value; + +}; + +template < + typename Value, + typename = std::enable_if_t< + std::is_move_constructible_v> + && !std::is_lvalue_reference_v>> +auto wrap_moveable_as_copyable(Value &&value) { + return moveable_as_copyable_wrap(std::move(value)); +} + +} // namespace details + +class unique_any; + +template +Value *any_cast(unique_any *value) noexcept; + +template +const Value *any_cast(const unique_any *value) noexcept; + +class unique_any final { +public: + // Construction and destruction [any.cons] + constexpr unique_any() noexcept { + } + + unique_any(const unique_any &other) = delete; + unique_any &operator=(const unique_any &other) = delete; + + unique_any(unique_any &&other) noexcept + : _impl(std::move(other._impl)) { + } + + unique_any &operator=(unique_any &&other) noexcept { + _impl = std::move(other._impl); + return *this; + } + + template < + typename Value, + typename = std::enable_if_t< + !std::is_same_v, unique_any>>> + unique_any(Value &&other) + : unique_any( + std::forward(other), + std::is_copy_constructible>()) { + } + + template < + typename Value, + typename = std::enable_if_t< + !std::is_same_v, unique_any>>> + unique_any &operator=(Value &&other) { + if constexpr (std::is_copy_constructible_v>) { + _impl = std::forward(other); + } else if constexpr (std::is_move_constructible_v> + && !std::is_lvalue_reference_v) { + _impl = details::wrap_moveable_as_copyable(std::move(other)); + } else { + static_assert( + false_t(Value{}), + "Bad value for base::unique_any."); + } + return *this; + } + + template < + typename Value, + typename ...Args, + typename = std::enable_if_t< + std::is_constructible_v, Args...> + && std::is_copy_constructible_v>>> + std::decay_t &emplace(Args &&...args) { + return _impl.emplace(std::forward(args)...); + } + + void reset() noexcept { + _impl.reset(); + } + + void swap(unique_any &other) noexcept { + _impl.swap(other._impl); + } + + bool has_value() const noexcept { + return _impl.has_value(); + } + + // Should check if it is a moveable_only wrap first. + //const std::type_info &type() const noexcept { + // return _impl.type(); + //} + +private: + template < + typename Value, + typename = std::enable_if_t< + !std::is_same_v, unique_any> + && std::is_copy_constructible_v>>> + unique_any(Value &&other, std::true_type) + : _impl(std::forward(other)) { + } + + template < + typename Value, + typename = std::enable_if_t< + !std::is_same_v, unique_any> + && !std::is_copy_constructible_v> + && std::is_move_constructible_v> + && !std::is_lvalue_reference_v>> + unique_any(Value &&other, std::false_type) + : _impl(details::wrap_moveable_as_copyable(std::move(other))) { + } + + template < + typename Value, + typename ...Args> + friend unique_any make_any(Args &&...args); + + template + friend const Value *any_cast(const unique_any *value) noexcept; + + template + friend Value *any_cast(unique_any *value) noexcept; + + std::any _impl; + +}; + +inline void swap(unique_any &a, unique_any &b) noexcept { + a.swap(b); +} + +template < + typename Value, + typename ...Args> +inline auto make_any(Args &&...args) +-> std::enable_if_t< + std::is_copy_constructible_v>, + unique_any> { + return std::make_any(std::forward(args)...); +} + +template < + typename Value, + typename ...Args> +inline auto make_any(Args &&...args) +-> std::enable_if_t< + !std::is_copy_constructible_v> + && std::is_move_constructible_v>, + unique_any> { + return Value(std::forward(args)...); +} + +template +inline Value *any_cast(unique_any *value) noexcept { + if constexpr (std::is_copy_constructible_v) { + return std::any_cast(&value->_impl); + } else if constexpr (std::is_move_constructible_v) { + auto wrap = std::any_cast< + details::moveable_as_copyable_wrap + >(&value->_impl); + return wrap ? &wrap->value : nullptr; + } else { + static_assert( + false_t(Value{}), + "Bad type for base::any_cast."); + } +} + +template +inline const Value *any_cast(const unique_any *value) noexcept { + if constexpr (std::is_copy_constructible_v) { + return std::any_cast(&value->_impl); + } else if constexpr (std::is_move_constructible_v) { + auto wrap = std::any_cast< + details::moveable_as_copyable_wrap + >(&value->_impl); + return wrap ? &wrap->value : nullptr; + } else { + static_assert( + false_t(Value{}), + "Bad type for base::any_cast."); + } +} + +} // namespace base diff --git a/Telegram/SourceFiles/boxes/peer_list_box.cpp b/Telegram/SourceFiles/boxes/peer_list_box.cpp index dc4a2f3ba5..4b8a16c612 100644 --- a/Telegram/SourceFiles/boxes/peer_list_box.cpp +++ b/Telegram/SourceFiles/boxes/peer_list_box.cpp @@ -586,8 +586,8 @@ void PeerListContent::addToSearchIndex(not_null row) { } removeFromSearchIndex(row); - row->setNameFirstChars(row->peer()->chars); - for_const (auto ch, row->nameFirstChars()) { + row->setNameFirstChars(row->peer()->nameFirstChars()); + for (auto ch : row->nameFirstChars()) { _searchIndex[ch].push_back(row); } } @@ -595,7 +595,7 @@ void PeerListContent::addToSearchIndex(not_null row) { void PeerListContent::removeFromSearchIndex(not_null row) { auto &nameFirstChars = row->nameFirstChars(); if (!nameFirstChars.empty()) { - for_const (auto ch, row->nameFirstChars()) { + for (auto ch : row->nameFirstChars()) { auto it = _searchIndex.find(ch); if (it != _searchIndex.cend()) { auto &entry = it->second; @@ -605,7 +605,7 @@ void PeerListContent::removeFromSearchIndex(not_null row) { } } } - row->setNameFirstChars(OrderedSet()); + row->setNameFirstChars({}); } } @@ -644,7 +644,9 @@ void PeerListContent::refreshIndices() { } } -void PeerListContent::removeRowAtIndex(std::vector> &from, int index) { +void PeerListContent::removeRowAtIndex( + std::vector> &from, + int index) { from.erase(from.begin() + index); for (auto i = index, count = int(from.size()); i != count; ++i) { from[i]->setAbsoluteIndex(i); @@ -664,17 +666,40 @@ void PeerListContent::removeRow(not_null row) { Assert(index >= 0 && index < eraseFrom.size()); Assert(eraseFrom[index].get() == row); + auto pressedData = saveSelectedData(_pressed); + auto contextedData = saveSelectedData(_contexted); setSelected(Selected()); setPressed(Selected()); + setContexted(Selected()); _rowsById.erase(row->id()); auto &byPeer = _rowsByPeer[row->peer()]; byPeer.erase(std::remove(byPeer.begin(), byPeer.end(), row), byPeer.end()); removeFromSearchIndex(row); - _filterResults.erase(std::find(_filterResults.begin(), _filterResults.end(), row), _filterResults.end()); + _filterResults.erase( + std::find(_filterResults.begin(), _filterResults.end(), row), + _filterResults.end()); removeRowAtIndex(eraseFrom, index); restoreSelection(); + setPressed(restoreSelectedData(pressedData)); + setContexted(restoreSelectedData(contextedData)); +} + +void PeerListContent::clearAllContent() { + setSelected(Selected()); + setPressed(Selected()); + setContexted(Selected()); + _rowsById.clear(); + _rowsByPeer.clear(); + _filterResults.clear(); + _searchIndex.clear(); + _rows.clear(); + _searchRows.clear(); + _searchQuery + = _normalizedSearchQuery + = _mentionHighlight + = QString(); } void PeerListContent::convertRowToSearchResult(not_null row) { @@ -926,28 +951,23 @@ void PeerListContent::contextMenuEvent(QContextMenuEvent *e) { _menu->deleteLater(); _menu = nullptr; } - if (_context.index.value >= 0) { - updateRow(_context.index); - _context = Selected(); - } - + setContexted(Selected()); if (e->reason() == QContextMenuEvent::Mouse) { handleMouseMove(e->globalPos()); } - _context = _selected; + setContexted(_selected); if (_pressButton != Qt::LeftButton) { mousePressReleased(_pressButton); } - if (auto row = getRow(_context.index)) { + if (auto row = getRow(_contexted.index)) { _menu = _controller->rowContextMenu(row); if (_menu) { _menu->setDestroyedCallback(base::lambda_guarded( this, [this] { - updateRow(_context.index); - _context = Selected(); + setContexted(Selected()); handleMouseMove(QCursor::pos()); })); _menu->popup(e->globalPos()); @@ -977,8 +997,8 @@ TimeMs PeerListContent::paintRow(Painter &p, TimeMs ms, RowIndex index) { auto peer = row->peer(); auto user = peer->asUser(); - auto active = (_context.index.value >= 0) - ? _context + auto active = (_contexted.index.value >= 0) + ? _contexted : (_pressed.index.value >= 0) ? _pressed : _selected; @@ -1155,7 +1175,7 @@ void PeerListContent::checkScrollForPreload() { void PeerListContent::searchQueryChanged(QString query) { auto searchWordsList = TextUtilities::PrepareSearchWords(query); - auto normalizedQuery = searchWordsList.isEmpty() ? QString() : searchWordsList.join(' '); + auto normalizedQuery = searchWordsList.join(' '); if (_normalizedSearchQuery != normalizedQuery) { setSearchQuery(query, normalizedQuery); if (_controller->searchInLocal() && !searchWordsList.isEmpty()) { @@ -1172,15 +1192,18 @@ void PeerListContent::searchQueryChanged(QString query) { } } if (minimalList) { - auto searchWordInNames = [](PeerData *peer, const QString &searchWord) { - for_const (auto &nameWord, peer->names) { + auto searchWordInNames = []( + not_null peer, + const QString &searchWord) { + for (auto &nameWord : peer->nameWords()) { if (nameWord.startsWith(searchWord)) { return true; } } return false; }; - auto allSearchWordsInNames = [searchWordInNames, &searchWordsList](PeerData *peer) { + auto allSearchWordsInNames = [&]( + not_null peer) { for_const (auto &searchWord, searchWordsList) { if (!searchWordInNames(peer, searchWord)) { return false; @@ -1205,12 +1228,58 @@ void PeerListContent::searchQueryChanged(QString query) { } } -void PeerListContent::setSearchQuery(const QString &query, const QString &normalizedQuery) { +std::unique_ptr PeerListContent::saveState() const { + auto result = std::make_unique(); + result->controllerState = EmptyControllerState(); + result->list.reserve(_rows.size()); + for (auto &row : _rows) { + result->list.push_back(row->peer()); + } + result->filterResults.reserve(_filterResults.size()); + for (auto &row : _filterResults) { + result->filterResults.push_back(row->peer()); + } + result->searchQuery = _searchQuery; + return result; +} + +void PeerListContent::restoreState( + std::unique_ptr state) { + if (!state || !state->controllerState.has_value()) { + return; + } + + clearAllContent(); + + for (auto peer : state->list) { + if (auto row = _controller->createRestoredRow(peer)) { + appendRow(std::move(row)); + } + } + auto query = state->searchQuery; + auto searchWords = TextUtilities::PrepareSearchWords(query); + setSearchQuery(query, searchWords.join(' ')); + for (auto peer : state->filterResults) { + if (auto existingRow = findRow(peer->id)) { + _filterResults.push_back(existingRow); + } else if (auto row = _controller->createSearchRow(peer)) { + appendSearchRow(std::move(row)); + } + } + refreshRows(); +} + +void PeerListContent::setSearchQuery( + const QString &query, + const QString &normalizedQuery) { setSelected(Selected()); setPressed(Selected()); + setContexted(Selected()); _searchQuery = query; _normalizedSearchQuery = normalizedQuery; - _mentionHighlight = _searchQuery.startsWith('@') ? _searchQuery.mid(1) : _searchQuery; + _mentionHighlight = _searchQuery.startsWith('@') + ? _searchQuery.mid(1) + : _searchQuery; _filterResults.clear(); clearSearchRows(); } @@ -1239,11 +1308,38 @@ void PeerListContent::setSelected(Selected selected) { } } +void PeerListContent::setContexted(Selected contexted) { + updateRow(_contexted.index); + if (_contexted != contexted) { + _contexted = contexted; + updateRow(_contexted.index); + } +} + void PeerListContent::restoreSelection() { _lastMousePosition = QCursor::pos(); updateSelection(); } +auto PeerListContent::saveSelectedData(Selected from) +-> SelectedSaved { + if (auto row = getRow(from.index)) { + return { row->id(), from }; + } + return { PeerListRowId(0), from }; +} + +auto PeerListContent::restoreSelectedData(SelectedSaved from) +-> Selected { + auto result = from.old; + if (auto row = findRow(from.id)) { + result.index = findRowIndex(row, result.index); + } else { + result.index.value = -1; + } + return result; +} + void PeerListContent::updateSelection() { if (!_mouseSelection) return; @@ -1305,6 +1401,9 @@ void PeerListContent::updateRow(RowIndex index) { if (index == _pressed.index) { setPressed(Selected()); } + if (index == _contexted.index) { + setContexted(Selected()); + } } update(0, getRowTop(index), width(), _rowHeight); } @@ -1349,7 +1448,9 @@ PeerListRow *PeerListContent::getRow(RowIndex index) { return nullptr; } -PeerListContent::RowIndex PeerListContent::findRowIndex(not_null row, RowIndex hint) { +PeerListContent::RowIndex PeerListContent::findRowIndex( + not_null row, + RowIndex hint) { if (!showingSearch()) { Assert(!row->isSearchResult()); return RowIndex(row->absoluteIndex()); diff --git a/Telegram/SourceFiles/boxes/peer_list_box.h b/Telegram/SourceFiles/boxes/peer_list_box.h index 3b7d32f957..2a5029a4f1 100644 --- a/Telegram/SourceFiles/boxes/peer_list_box.h +++ b/Telegram/SourceFiles/boxes/peer_list_box.h @@ -161,10 +161,10 @@ public: int outerWidth); float64 checkedRatio(); - void setNameFirstChars(const OrderedSet &nameFirstChars) { + void setNameFirstChars(const base::flat_set &nameFirstChars) { _nameFirstChars = nameFirstChars; } - const OrderedSet &nameFirstChars() const { + const base::flat_set &nameFirstChars() const { return _nameFirstChars; } @@ -202,7 +202,7 @@ private: Text _status; StatusType _statusType = StatusType::Online; TimeMs _statusValidTill = 0; - OrderedSet _nameFirstChars; + base::flat_set _nameFirstChars; int _absoluteIndex = -1; State _disabledState = State::Active; bool _initialized : 1; @@ -215,6 +215,17 @@ enum class PeerListSearchMode { Enabled, }; +struct PeerListState { + PeerListState() = default; + PeerListState(PeerListState &&other) = delete; + PeerListState &operator=(PeerListState &&other) = delete; + + base::unique_any controllerState; + std::vector> list; + std::vector> filterResults; + QString searchQuery; +}; + class PeerListDelegate { public: virtual void peerListSetTitle(base::lambda title) = 0; @@ -252,6 +263,9 @@ public: virtual int peerListSelectedRowsCount() = 0; virtual std::vector> peerListCollectSelectedRows() = 0; + virtual std::unique_ptr peerListSaveState() = 0; + virtual void peerListRestoreState( + std::unique_ptr state) = 0; virtual ~PeerListDelegate() = default; private: @@ -279,6 +293,12 @@ public: _delegate = delegate; } + virtual base::unique_any saveState() { + return {}; + } + virtual void restoreState(base::unique_any &&state) { + } + protected: not_null delegate() const { return _delegate; @@ -314,9 +334,22 @@ public: bool isSearchLoading() const { return _searchController ? _searchController->isLoading() : false; } - virtual std::unique_ptr createSearchRow(not_null peer) { + virtual std::unique_ptr createSearchRow( + not_null peer) { return nullptr; } + virtual std::unique_ptr createRestoredRow( + not_null peer) { + return nullptr; + } + + virtual std::unique_ptr saveState() { + return delegate()->peerListSaveState(); + } + virtual void restoreState( + std::unique_ptr state) { + delegate()->peerListRestoreState(std::move(state)); + } bool isRowSelected(not_null peer) { return delegate()->peerListIsRowSelected(peer); @@ -418,6 +451,9 @@ public: update(); } + std::unique_ptr saveState() const; + void restoreState(std::unique_ptr state); + auto scrollToRequests() const { return _scrollToRequests.events(); } @@ -473,10 +509,23 @@ private: friend inline bool operator!=(Selected a, Selected b) { return !(a == b); } + struct SelectedSaved { + SelectedSaved(PeerListRowId id, Selected old) + : id(id), old(old) { + } + PeerListRowId id = 0; + Selected old; + }; + + struct EmptyControllerState { + }; void setSelected(Selected selected); void setPressed(Selected pressed); + void setContexted(Selected contexted); void restoreSelection(); + SelectedSaved saveSelectedData(Selected from); + Selected restoreSelectedData(SelectedSaved from); void updateSelection(); void loadProfilePhotos(); @@ -511,6 +560,7 @@ private: int labelHeight() const; void clearSearchRows(); + void clearAllContent(); void handleMouseMove(QPoint position); void mousePressReleased(Qt::MouseButton button); @@ -524,7 +574,7 @@ private: Selected _selected; Selected _pressed; - Selected _context; + Selected _contexted; bool _mouseSelection = false; Qt::MouseButton _pressButton = Qt::LeftButton; @@ -649,6 +699,13 @@ public: }); return result; } + std::unique_ptr peerListSaveState() override { + return _content->saveState(); + } + void peerListRestoreState( + std::unique_ptr state) override { + _content->restoreState(std::move(state)); + } protected: not_null content() const { @@ -660,7 +717,9 @@ private: }; -class PeerListBox : public BoxContent, public PeerListContentDelegate { +class PeerListBox + : public BoxContent + , public PeerListContentDelegate { public: PeerListBox( QWidget*, @@ -670,7 +729,8 @@ public: void peerListSetTitle(base::lambda title) override { setTitle(std::move(title)); } - void peerListSetAdditionalTitle(base::lambda title) override { + void peerListSetAdditionalTitle( + base::lambda title) override { setAdditionalTitle(std::move(title)); } void peerListSetSearchMode(PeerListSearchMode mode) override; @@ -691,12 +751,15 @@ protected: void paintEvent(QPaintEvent *e) override; private: - void peerListAddSelectedRowInBunch(not_null peer) override { + void peerListAddSelectedRowInBunch( + not_null peer) override { addSelectItem(peer, PeerListRow::SetStyle::Fast); } void peerListFinishSelectedRowsBunch() override; - void addSelectItem(not_null peer, PeerListRow::SetStyle style); + void addSelectItem( + not_null peer, + PeerListRow::SetStyle style); void createMultiSelect(); int getTopScrollSkip() const; void updateScrollSkips(); diff --git a/Telegram/SourceFiles/boxes/share_box.cpp b/Telegram/SourceFiles/boxes/share_box.cpp index 99e8beeb09..8fe664cf80 100644 --- a/Telegram/SourceFiles/boxes/share_box.cpp +++ b/Telegram/SourceFiles/boxes/share_box.cpp @@ -349,7 +349,7 @@ void ShareBox::Inner::activateSkipPage(int pageHeight, int direction) { void ShareBox::Inner::notifyPeerUpdated(const Notify::PeerUpdate &update) { if (update.flags & Notify::PeerUpdate::Flag::NameChanged) { - _chatsIndexed->peerNameChanged(update.peer, update.oldNames, update.oldNameFirstChars); + _chatsIndexed->peerNameChanged(update.peer, update.oldNameFirstChars); } updateChat(update.peer); @@ -635,7 +635,10 @@ void ShareBox::Inner::changeCheckState(Chat *chat) { if (!_filter.isEmpty()) { auto row = _chatsIndexed->getRow(chat->peer->id); if (!row) { - row = _chatsIndexed->addToEnd(App::history(chat->peer)).value(0); + auto rowsByLetter = _chatsIndexed->addToEnd(App::history(chat->peer)); + auto it = rowsByLetter.find(0); + Assert(it != rowsByLetter.cend()); + row = it->second; } chat = getChat(row); if (!chat->checkbox.checked()) { @@ -712,8 +715,8 @@ void ShareBox::Inner::updateFilter(QString filter) { if (toFilter) { _filtered.reserve(toFilter->size()); for_const (auto row, *toFilter) { - auto &names = row->history()->peer->names; - PeerData::Names::const_iterator nb = names.cbegin(), ne = names.cend(), ni; + auto &nameWords = row->history()->peer->nameWords(); + auto nb = nameWords.cbegin(), ne = nameWords.cend(), ni = nb; for (fi = fb; fi != fe; ++fi) { auto filterName = *fi; for (ni = nb; ni != ne; ++ni) { diff --git a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp index cb0ddba39e..c660da3592 100644 --- a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp +++ b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp @@ -172,9 +172,9 @@ void FieldAutocomplete::updateFiltered(bool resetScroll) { return true; }; auto filterNotPassedByName = [this, &filterNotPassedByUsername](UserData *user) -> bool { - for_const (auto &namePart, user->names) { - if (namePart.startsWith(_filter, Qt::CaseInsensitive)) { - bool exactUsername = (user->username.compare(_filter, Qt::CaseInsensitive) == 0); + for (auto &nameWord : user->nameWords()) { + if (nameWord.startsWith(_filter, Qt::CaseInsensitive)) { + auto exactUsername = (user->username.compare(_filter, Qt::CaseInsensitive) == 0); return exactUsername; } } diff --git a/Telegram/SourceFiles/data/data_peer.cpp b/Telegram/SourceFiles/data/data_peer.cpp index bca1534cd8..5d4777df2f 100644 --- a/Telegram/SourceFiles/data/data_peer.cpp +++ b/Telegram/SourceFiles/data/data_peer.cpp @@ -293,8 +293,7 @@ void PeerData::updateNameDelayed(const QString &newName, const QString &newNameO Notify::PeerUpdate update(this); update.flags |= UpdateFlag::NameChanged; - update.oldNames = names; - update.oldNameFirstChars = chars; + update.oldNameFirstChars = nameFirstChars(); if (isUser()) { if (asUser()->username != newUsername) { @@ -453,8 +452,8 @@ void UserData::setPhoto(const MTPUserProfilePhoto &p) { // see Local::readPeer a } void PeerData::fillNames() { - names.clear(); - chars.clear(); + _nameWords.clear(); + _nameFirstChars.clear(); auto toIndex = TextUtilities::RemoveAccents(name); if (cRussianLetters().match(toIndex).hasMatch()) { toIndex += ' ' + translitRusEng(toIndex); @@ -469,8 +468,8 @@ void PeerData::fillNames() { auto namesList = TextUtilities::PrepareSearchWords(toIndex); for (auto &name : namesList) { - names.insert(name); - chars.insert(name[0]); + _nameWords.insert(name); + _nameFirstChars.insert(name[0]); } } diff --git a/Telegram/SourceFiles/data/data_peer.h b/Telegram/SourceFiles/data/data_peer.h index 1693191b37..4d3fffa24e 100644 --- a/Telegram/SourceFiles/data/data_peer.h +++ b/Telegram/SourceFiles/data/data_peer.h @@ -204,10 +204,15 @@ public: QString name; Text nameText; - using Names = OrderedSet; - Names names; // for filtering - using NameFirstChars = OrderedSet; - NameFirstChars chars; + + using NameWords = base::flat_set; + using NameFirstChars = base::flat_set; + const NameWords &nameWords() const { + return _nameWords; + } + const NameFirstChars &nameFirstChars() const { + return _nameFirstChars; + } enum LoadedStatus { NotLoaded = 0x00, @@ -292,6 +297,8 @@ private: void fillNames(); ClickHandlerPtr _openLink; + NameWords _nameWords; // for filtering + NameFirstChars _nameFirstChars; int _colorIndex = 0; TimeMs _lastFullUpdate = 0; diff --git a/Telegram/SourceFiles/dialogs/dialogs_common.h b/Telegram/SourceFiles/dialogs/dialogs_common.h index f0f5b336d3..6ef15faffb 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_common.h +++ b/Telegram/SourceFiles/dialogs/dialogs_common.h @@ -20,10 +20,12 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include "base/flat_map.h" + namespace Dialogs { class Row; -using RowsByLetter = QMap; +using RowsByLetter = base::flat_map; enum class SortMode { Date = 0x00, diff --git a/Telegram/SourceFiles/dialogs/dialogs_indexed_list.cpp b/Telegram/SourceFiles/dialogs/dialogs_indexed_list.cpp index 1c84fe4a9e..4ec739d1f8 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_indexed_list.cpp +++ b/Telegram/SourceFiles/dialogs/dialogs_indexed_list.cpp @@ -24,19 +24,22 @@ namespace Dialogs { IndexedList::IndexedList(SortMode sortMode) : _sortMode(sortMode) -, _list(sortMode) { +, _list(sortMode) +, _empty(sortMode) { } RowsByLetter IndexedList::addToEnd(History *history) { RowsByLetter result; if (!_list.contains(history->peer->id)) { - result.insert(0, _list.addToEnd(history)); - for_const (auto ch, history->peer->chars) { + result.emplace(0, _list.addToEnd(history)); + for (auto ch : history->peer->nameFirstChars()) { auto j = _index.find(ch); if (j == _index.cend()) { - j = _index.insert(ch, new List(_sortMode)); + j = _index.emplace( + ch, + std::make_unique(_sortMode)).first; } - result.insert(ch, j.value()->addToEnd(history)); + result.emplace(ch, j->second->addToEnd(history)); } } return result; @@ -48,33 +51,35 @@ Row *IndexedList::addByName(History *history) { } Row *result = _list.addByName(history); - for_const (auto ch, history->peer->chars) { + for (auto ch : history->peer->nameFirstChars()) { auto j = _index.find(ch); if (j == _index.cend()) { - j = _index.insert(ch, new List(_sortMode)); + j = _index.emplace( + ch, + std::make_unique(_sortMode)).first; } - j.value()->addByName(history); + j->second->addByName(history); } return result; } void IndexedList::adjustByPos(const RowsByLetter &links) { - for (auto i = links.cbegin(), e = links.cend(); i != e; ++i) { - if (i.key() == QChar(0)) { - _list.adjustByPos(i.value()); + for (auto [ch, row] : links) { + if (ch == QChar(0)) { + _list.adjustByPos(row); } else { - if (auto list = _index.value(i.key())) { - list->adjustByPos(i.value()); + if (auto it = _index.find(ch); it != _index.cend()) { + it->second->adjustByPos(row); } } } } -void IndexedList::moveToTop(PeerData *peer) { +void IndexedList::moveToTop(not_null peer) { if (_list.moveToTop(peer->id)) { - for_const (auto ch, peer->chars) { - if (auto list = _index.value(ch)) { - list->moveToTop(peer->id); + for (auto ch : peer->nameFirstChars()) { + if (auto it = _index.find(ch); it != _index.cend()) { + it->second->moveToTop(peer->id); } } } @@ -99,62 +104,64 @@ void IndexedList::movePinned(Row *row, int deltaSign) { history2->setPinnedIndex(index1); } -void IndexedList::peerNameChanged(PeerData *peer, const PeerData::Names &oldNames, const PeerData::NameFirstChars &oldChars) { +void IndexedList::peerNameChanged(not_null peer, const PeerData::NameFirstChars &oldChars) { Assert(_sortMode != SortMode::Date); if (_sortMode == SortMode::Name) { - adjustByName(peer, oldNames, oldChars); + adjustByName(peer, oldChars); } else { - adjustNames(Dialogs::Mode::All, peer, oldNames, oldChars); + adjustNames(Dialogs::Mode::All, peer, oldChars); } } -void IndexedList::peerNameChanged(Mode list, PeerData *peer, const PeerData::Names &oldNames, const PeerData::NameFirstChars &oldChars) { +void IndexedList::peerNameChanged(Mode list, not_null peer, const PeerData::NameFirstChars &oldChars) { Assert(_sortMode == SortMode::Date); - adjustNames(list, peer, oldNames, oldChars); + adjustNames(list, peer, oldChars); } -void IndexedList::adjustByName(PeerData *peer, const PeerData::Names &oldNames, const PeerData::NameFirstChars &oldChars) { +void IndexedList::adjustByName(not_null peer, const PeerData::NameFirstChars &oldChars) { Row *mainRow = _list.adjustByName(peer); if (!mainRow) return; History *history = mainRow->history(); PeerData::NameFirstChars toRemove = oldChars, toAdd; - for_const (auto ch, peer->chars) { + for (auto ch : peer->nameFirstChars()) { auto j = toRemove.find(ch); if (j == toRemove.cend()) { toAdd.insert(ch); } else { toRemove.erase(j); - if (auto list = _index.value(ch)) { - list->adjustByName(peer); + if (auto it = _index.find(ch); it != _index.cend()) { + it->second->adjustByName(peer); } } } - for_const (auto ch, toRemove) { - if (auto list = _index.value(ch)) { - list->del(peer->id, mainRow); + for (auto ch : toRemove) { + if (auto it = _index.find(ch); it != _index.cend()) { + it->second->del(peer->id, mainRow); } } - if (!toAdd.isEmpty()) { - for_const (auto ch, toAdd) { + if (!toAdd.empty()) { + for (auto ch : toAdd) { auto j = _index.find(ch); if (j == _index.cend()) { - j = _index.insert(ch, new List(_sortMode)); + j = _index.emplace( + ch, + std::make_unique(_sortMode)).first; } - j.value()->addByName(history); + j->second->addByName(history); } } } -void IndexedList::adjustNames(Mode list, PeerData *peer, const PeerData::Names &oldNames, const PeerData::NameFirstChars &oldChars) { +void IndexedList::adjustNames(Mode list, not_null peer, const PeerData::NameFirstChars &oldChars) { auto mainRow = _list.getRow(peer->id); if (!mainRow) return; - History *history = mainRow->history(); + auto history = mainRow->history(); PeerData::NameFirstChars toRemove = oldChars, toAdd; - for_const (auto ch, peer->chars) { + for (auto ch : peer->nameFirstChars()) { auto j = toRemove.find(ch); if (j == toRemove.cend()) { toAdd.insert(ch); @@ -162,40 +169,40 @@ void IndexedList::adjustNames(Mode list, PeerData *peer, const PeerData::Names & toRemove.erase(j); } } - for_const (auto ch, toRemove) { + for (auto ch : toRemove) { if (_sortMode == SortMode::Date) { history->removeChatListEntryByLetter(list, ch); } - if (auto list = _index.value(ch)) { - list->del(peer->id, mainRow); + if (auto it = _index.find(ch); it != _index.cend()) { + it->second->del(peer->id, mainRow); } } - for_const (auto ch, toAdd) { + for (auto ch : toAdd) { auto j = _index.find(ch); if (j == _index.cend()) { - j = _index.insert(ch, new List(_sortMode)); + j = _index.emplace( + ch, + std::make_unique(_sortMode)).first; } - Row *row = j.value()->addToEnd(history); + auto row = j->second->addToEnd(history); if (_sortMode == SortMode::Date) { history->addChatListEntryByLetter(list, ch, row); } } } -void IndexedList::del(const PeerData *peer, Row *replacedBy) { +void IndexedList::del(not_null peer, Row *replacedBy) { if (_list.del(peer->id, replacedBy)) { - for_const (auto ch, peer->chars) { - if (auto list = _index.value(ch)) { - list->del(peer->id, replacedBy); + for (auto ch : peer->nameFirstChars()) { + if (auto it = _index.find(ch); it != _index.cend()) { + it->second->del(peer->id, replacedBy); } } } } void IndexedList::clear() { - for_const (auto &list, _index) { - delete list; - } + _index.clear(); } IndexedList::~IndexedList() { diff --git a/Telegram/SourceFiles/dialogs/dialogs_indexed_list.h b/Telegram/SourceFiles/dialogs/dialogs_indexed_list.h index f4d95f24c6..524df5de8c 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_indexed_list.h +++ b/Telegram/SourceFiles/dialogs/dialogs_indexed_list.h @@ -34,26 +34,28 @@ public: RowsByLetter addToEnd(History *history); Row *addByName(History *history); void adjustByPos(const RowsByLetter &links); - void moveToTop(PeerData *peer); + void moveToTop(not_null peer); // row must belong to this indexed list all(). void movePinned(Row *row, int deltaSign); // For sortMode != SortMode::Date - void peerNameChanged(PeerData *peer, const PeerData::Names &oldNames, const PeerData::NameFirstChars &oldChars); + void peerNameChanged(not_null peer, const PeerData::NameFirstChars &oldChars); //For sortMode == SortMode::Date - void peerNameChanged(Mode list, PeerData *peer, const PeerData::Names &oldNames, const PeerData::NameFirstChars &oldChars); + void peerNameChanged(Mode list, not_null peer, const PeerData::NameFirstChars &oldChars); - void del(const PeerData *peer, Row *replacedBy = nullptr); + void del(not_null peer, Row *replacedBy = nullptr); void clear(); const List &all() const { return _list; } const List *filtered(QChar ch) const { - static StaticNeverFreedPointer empty(new List(SortMode::Add)); - return _index.value(ch, empty.data()); + if (auto it = _index.find(ch); it != _index.cend()) { + return it->second.get(); + } + return &_empty; } ~IndexedList(); @@ -81,13 +83,12 @@ public: iterator find(int y, int h) { return all().find(y, h); } private: - void adjustByName(PeerData *peer, const PeerData::Names &oldNames, const PeerData::NameFirstChars &oldChars); - void adjustNames(Mode list, PeerData *peer, const PeerData::Names &oldNames, const PeerData::NameFirstChars &oldChars); + void adjustByName(not_null peer, const PeerData::NameFirstChars &oldChars); + void adjustNames(Mode list, not_null peer, const PeerData::NameFirstChars &oldChars); SortMode _sortMode; - List _list; - using Index = QMap; - Index _index; + List _list, _empty; + base::flat_map> _index; }; diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp index f81089ff95..047fae6dbe 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp +++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp @@ -122,7 +122,7 @@ DialogsInner::DialogsInner(QWidget *parent, not_null contro stopReorderPinned(); } if (update.flags & UpdateFlag::NameChanged) { - handlePeerNameChange(update.peer, update.oldNames, update.oldNameFirstChars); + handlePeerNameChange(update.peer, update.oldNameFirstChars); } if (update.flags & UpdateFlag::PhotoChanged) { this->update(); @@ -1271,13 +1271,13 @@ void DialogsInner::onParentGeometryChanged() { } } -void DialogsInner::handlePeerNameChange(not_null peer, const PeerData::Names &oldNames, const PeerData::NameFirstChars &oldChars) { - _dialogs->peerNameChanged(Dialogs::Mode::All, peer, oldNames, oldChars); +void DialogsInner::handlePeerNameChange(not_null peer, const PeerData::NameFirstChars &oldChars) { + _dialogs->peerNameChanged(Dialogs::Mode::All, peer, oldChars); if (_dialogsImportant) { - _dialogsImportant->peerNameChanged(Dialogs::Mode::Important, peer, oldNames, oldChars); + _dialogsImportant->peerNameChanged(Dialogs::Mode::Important, peer, oldChars); } - _contactsNoDialogs->peerNameChanged(peer, oldNames, oldChars); - _contacts->peerNameChanged(peer, oldNames, oldChars); + _contactsNoDialogs->peerNameChanged(peer, oldChars); + _contacts->peerNameChanged(peer, oldChars); update(); } @@ -1323,12 +1323,12 @@ void DialogsInner::onFilterUpdate(QString newFilter, bool force) { _filterResults.reserve((toFilter ? toFilter->size() : 0) + (toFilterContacts ? toFilterContacts->size() : 0)); if (toFilter) { for_const (auto row, *toFilter) { - const PeerData::Names &names(row->history()->peer->names); - PeerData::Names::const_iterator nb = names.cbegin(), ne = names.cend(), ni; + const auto &nameWords = row->history()->peer->nameWords(); + auto nb = nameWords.cbegin(), ne = nameWords.cend(), ni = nb; for (fi = fb; fi != fe; ++fi) { - QString filterName(*fi); + auto filterWord = *fi; for (ni = nb; ni != ne; ++ni) { - if (ni->startsWith(*fi)) { + if (ni->startsWith(filterWord)) { break; } } @@ -1343,12 +1343,12 @@ void DialogsInner::onFilterUpdate(QString newFilter, bool force) { } if (toFilterContacts) { for_const (auto row, *toFilterContacts) { - const PeerData::Names &names(row->history()->peer->names); - PeerData::Names::const_iterator nb = names.cbegin(), ne = names.cend(), ni; + const auto &nameWords = row->history()->peer->nameWords(); + auto nb = nameWords.cbegin(), ne = nameWords.cend(), ni = nb; for (fi = fb; fi != fe; ++fi) { - QString filterName(*fi); + auto filterWord = *fi; for (ni = nb; ni != ne; ++ni) { - if (ni->startsWith(*fi)) { + if (ni->startsWith(filterWord)) { break; } } diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h index c525d0cfb0..0d6398e641 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h +++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h @@ -174,7 +174,7 @@ private: bool isSelected() const { return _importantSwitchSelected || _selected || (_hashtagSelected >= 0) || (_filteredSelected >= 0) || (_peerSearchSelected >= 0) || (_searchedSelected >= 0); } - void handlePeerNameChange(not_null peer, const PeerData::Names &oldNames, const PeerData::NameFirstChars &oldChars); + void handlePeerNameChange(not_null peer, const PeerData::NameFirstChars &oldChars); void itemRemoved(not_null item); enum class UpdateRowSection { diff --git a/Telegram/SourceFiles/history/history.cpp b/Telegram/SourceFiles/history/history.cpp index ee50bc0c37..a481fea23b 100644 --- a/Telegram/SourceFiles/history/history.cpp +++ b/Telegram/SourceFiles/history/history.cpp @@ -2330,7 +2330,7 @@ void History::removeChatListEntryByLetter(Dialogs::Mode list, QChar letter) { void History::addChatListEntryByLetter(Dialogs::Mode list, QChar letter, Dialogs::Row *row) { Assert(letter != 0); if (inChatList(list)) { - chatListLinks(list).insert(letter, row); + chatListLinks(list).emplace(letter, row); } } diff --git a/Telegram/SourceFiles/history/history.h b/Telegram/SourceFiles/history/history.h index 0ce7c63d58..64b91a9839 100644 --- a/Telegram/SourceFiles/history/history.h +++ b/Telegram/SourceFiles/history/history.h @@ -285,7 +285,7 @@ public: }; PositionInChatListChange adjustByPosInChatList(Dialogs::Mode list, Dialogs::IndexedList *indexed); bool inChatList(Dialogs::Mode list) const { - return !chatListLinks(list).isEmpty(); + return !chatListLinks(list).empty(); } int posInChatList(Dialogs::Mode list) const; Dialogs::Row *addToChatList(Dialogs::Mode list, Dialogs::IndexedList *indexed); @@ -576,9 +576,9 @@ private: return _chatListLinks[static_cast(list)]; } Dialogs::Row *mainChatListLink(Dialogs::Mode list) const { - auto it = chatListLinks(list).constFind(0); + auto it = chatListLinks(list).find(0); Assert(it != chatListLinks(list).cend()); - return it.value(); + return it->second; } uint64 _sortKeyInChatList = 0; // like ((unixtime) << 32) | (incremented counter) diff --git a/Telegram/SourceFiles/info/profile/info_profile_cover.cpp b/Telegram/SourceFiles/info/profile/info_profile_cover.cpp index 006dc4f3fa..d8de2cedeb 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_cover.cpp +++ b/Telegram/SourceFiles/info/profile/info_profile_cover.cpp @@ -262,15 +262,15 @@ Cover *Cover::setOnlineCount(rpl::producer &&count) { void Cover::initViewers() { using Flag = Notify::PeerUpdate::Flag; - PeerUpdateValue(_peer, Flag::PhotoChanged) + Notify::PeerUpdateValue(_peer, Flag::PhotoChanged) | rpl::start_with_next( [this] { this->refreshUserpicLink(); }, lifetime()); - PeerUpdateValue(_peer, Flag::NameChanged) + Notify::PeerUpdateValue(_peer, Flag::NameChanged) | rpl::start_with_next( [this] { this->refreshNameText(); }, lifetime()); - PeerUpdateValue(_peer, + Notify::PeerUpdateValue(_peer, Flag::UserOnlineChanged | Flag::MembersChanged) | rpl::start_with_next( [this] { this->refreshStatusText(); }, diff --git a/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp b/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp index 16a354d638..606a9c7955 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp +++ b/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp @@ -416,7 +416,9 @@ object_ptr InnerWidget::setupUserActions( result, st::infoBlockButtonSkip)); - auto text = PeerUpdateValue(user, Notify::PeerUpdate::Flag::UserIsBlocked) + auto text = Notify::PeerUpdateValue( + user, + Notify::PeerUpdate::Flag::UserIsBlocked) | rpl::map([user]() -> rpl::producer { switch (user->blockStatus()) { case UserData::BlockStatus::Blocked: @@ -507,11 +509,16 @@ void InnerWidget::visibleTopBottomUpdated( void InnerWidget::saveState(not_null memento) { memento->setInfoExpanded(_cover->toggled()); - memento->setMediaExpanded(true); + if (_members) { + _members->saveState(memento); + } } void InnerWidget::restoreState(not_null memento) { _cover->toggle(memento->infoExpanded()); + if (_members) { + _members->restoreState(memento); + } if (_infoWrap) { _infoWrap->finishAnimating(); } diff --git a/Telegram/SourceFiles/info/profile/info_profile_members.cpp b/Telegram/SourceFiles/info/profile/info_profile_members.cpp index b5e70d5941..e6e5426e0b 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_members.cpp +++ b/Telegram/SourceFiles/info/profile/info_profile_members.cpp @@ -21,6 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "info/profile/info_profile_members.h" #include +#include "info/profile/info_profile_widget.h" #include "info/profile/info_profile_values.h" #include "info/profile/info_profile_icon.h" #include "info/profile/info_profile_values.h" @@ -92,6 +93,27 @@ rpl::producer Members::onlineCountValue() const { return _listController->onlineCountValue(); } +void Members::saveState(not_null memento) { + if (_searchShown) { + memento->setMembersSearch(_searchField->getLastText()); + } + memento->setMembersState(_listController->saveState()); +} + +void Members::restoreState(not_null memento) { + _listController->restoreState(memento->membersState()); + if (auto text = memento->membersSearch()) { + if (!_searchShown) { + toggleSearch(anim::type::instant); + } + _searchField->setText(*text); + _searchField->updatePlaceholder(); + applySearch(); + } else if (_searchShown) { + toggleSearch(anim::type::instant); + } +} + object_ptr Members::setupHeader() { auto result = object_ptr( _labelWrap, @@ -265,14 +287,20 @@ void Members::showSearch() { } } -void Members::toggleSearch() { +void Members::toggleSearch(anim::type animated) { _searchShown = !_searchShown; - _cancelSearch->toggleAnimated(_searchShown); - _searchShownAnimation.start( - [this] { searchAnimationCallback(); }, - _searchShown ? 0. : 1., - _searchShown ? 1. : 0., - st::slideWrapDuration); + if (animated == anim::type::normal) { + _cancelSearch->toggleAnimated(_searchShown); + _searchShownAnimation.start( + [this] { searchAnimationCallback(); }, + _searchShown ? 0. : 1., + _searchShown ? 1. : 0., + st::slideWrapDuration); + } else { + _cancelSearch->toggleFast(_searchShown); + _searchShownAnimation.finish(); + searchAnimationCallback(); + } _search->setDisabled(_searchShown); if (_searchShown) { _searchField->show(); diff --git a/Telegram/SourceFiles/info/profile/info_profile_members.h b/Telegram/SourceFiles/info/profile/info_profile_members.h index 01ac3d57ff..6902b9bdcf 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_members.h +++ b/Telegram/SourceFiles/info/profile/info_profile_members.h @@ -42,6 +42,8 @@ enum class Wrap; namespace Profile { +class Memento; + class Members : public Ui::RpWidget , private PeerListContentDelegate { @@ -56,6 +58,9 @@ public: return _scrollToRequests.events(); } + void saveState(not_null memento); + void restoreState(not_null memento); + int desiredHeight() const; rpl::producer onlineCountValue() const; @@ -92,7 +97,7 @@ private: void addMember(); void showSearch(); - void toggleSearch(); + void toggleSearch(anim::type animated = anim::type::normal); void cancelSearch(); void applySearch(); void forceSearchSubmit(); diff --git a/Telegram/SourceFiles/info/profile/info_profile_members_controllers.cpp b/Telegram/SourceFiles/info/profile/info_profile_members_controllers.cpp index d3be30031f..7412da98aa 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_members_controllers.cpp +++ b/Telegram/SourceFiles/info/profile/info_profile_members_controllers.cpp @@ -56,6 +56,12 @@ public: return _onlineCount.value(); } + std::unique_ptr createRestoredRow( + not_null peer) override; + + std::unique_ptr saveState() override; + void restoreState(std::unique_ptr state) override; + private: void rebuildRows(); void refreshOnlineCount(); @@ -125,6 +131,24 @@ void ChatMembersController::sortByOnline() { refreshOnlineCount(); } +std::unique_ptr ChatMembersController::saveState() { + auto result = PeerListController::saveState(); + auto lifetime = rpl::lifetime(); + using Flag = Notify::PeerUpdate::Flag; + Notify::PeerUpdateViewer(_chat, Flag::MembersChanged) + | rpl::start_with_next([state = result.get()](auto update) { + state->controllerState = base::unique_any{}; + }, lifetime); + result->controllerState = std::move(lifetime); + return result; +} + +void ChatMembersController::restoreState( + std::unique_ptr state) { + PeerListController::restoreState(std::move(state)); + sortByOnline(); +} + void ChatMembersController::rebuildRows() { if (_chat->participants.empty()) { while (delegate()->peerListFullRowsCount() > 0) { @@ -173,7 +197,16 @@ void ChatMembersController::refreshOnlineCount() { _onlineCount = left; } -std::unique_ptr ChatMembersController::createRow(not_null user) { +std::unique_ptr ChatMembersController::createRestoredRow( + not_null peer) { + if (auto user = peer->asUser()) { + return createRow(user); + } + return nullptr; +} + +std::unique_ptr ChatMembersController::createRow( + not_null user) { return std::make_unique(user); } diff --git a/Telegram/SourceFiles/info/profile/info_profile_values.cpp b/Telegram/SourceFiles/info/profile/info_profile_values.cpp index a9b586afe2..ec8adf381c 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_values.cpp +++ b/Telegram/SourceFiles/info/profile/info_profile_values.cpp @@ -33,40 +33,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org namespace Info { namespace Profile { -rpl::producer PeerUpdateViewer( - Notify::PeerUpdate::Flags flags) { - return [=](const auto &consumer) { - auto lifetime = rpl::lifetime(); - lifetime.make_state( - Notify::PeerUpdated().add_subscription({ flags, [=]( - const Notify::PeerUpdate &update) { - consumer.put_next_copy(update); - }})); - return lifetime; - }; -} - -rpl::producer PeerUpdateViewer( - not_null peer, - Notify::PeerUpdate::Flags flags) { - return PeerUpdateViewer(flags) - | rpl::filter([=](const Notify::PeerUpdate &update) { - return (update.peer == peer); - }); -} - -rpl::producer PeerUpdateValue( - not_null peer, - Notify::PeerUpdate::Flags flags) { - auto initial = Notify::PeerUpdate(peer); - initial.flags = flags; - return rpl::single(initial) - | then(PeerUpdateViewer(peer, flags)); -} - rpl::producer PhoneValue( not_null user) { - return PeerUpdateValue( + return Notify::PeerUpdateValue( user, Notify::PeerUpdate::Flag::UserPhoneChanged) | rpl::map([user] { @@ -77,7 +46,7 @@ rpl::producer PhoneValue( rpl::producer BioValue( not_null user) { - return PeerUpdateValue( + return Notify::PeerUpdateValue( user, Notify::PeerUpdate::Flag::AboutChanged) | rpl::map([user] { return user->about(); }) @@ -86,7 +55,7 @@ rpl::producer BioValue( rpl::producer PlainUsernameViewer( not_null peer) { - return PeerUpdateValue( + return Notify::PeerUpdateValue( peer, Notify::PeerUpdate::Flag::UsernameChanged) | rpl::map([peer] { @@ -108,7 +77,7 @@ rpl::producer UsernameValue( rpl::producer AboutValue( not_null peer) { if (auto channel = peer->asChannel()) { - return PeerUpdateValue( + return Notify::PeerUpdateValue( channel, Notify::PeerUpdate::Flag::AboutChanged) | rpl::map([channel] { return channel->about(); }) @@ -130,7 +99,7 @@ rpl::producer LinkValue( rpl::producer NotificationsEnabledValue( not_null peer) { - return PeerUpdateValue( + return Notify::PeerUpdateValue( peer, Notify::PeerUpdate::Flag::NotificationsEnabled) | rpl::map([peer] { return !peer->isMuted(); }); @@ -138,7 +107,7 @@ rpl::producer NotificationsEnabledValue( rpl::producer IsContactValue( not_null user) { - return PeerUpdateValue( + return Notify::PeerUpdateValue( user, Notify::PeerUpdate::Flag::UserIsContact) | rpl::map([user] { return user->isContact(); }); @@ -146,7 +115,7 @@ rpl::producer IsContactValue( rpl::producer CanShareContactValue( not_null user) { - return PeerUpdateValue( + return Notify::PeerUpdateValue( user, Notify::PeerUpdate::Flag::UserCanShareContact) | rpl::map([user] { @@ -166,7 +135,7 @@ rpl::producer CanAddContactValue( rpl::producer MembersCountValue( not_null peer) { if (auto chat = peer->asChat()) { - return PeerUpdateValue( + return Notify::PeerUpdateValue( peer, Notify::PeerUpdate::Flag::MembersChanged) | rpl::map([chat] { @@ -176,12 +145,12 @@ rpl::producer MembersCountValue( }); } else if (auto channel = peer->asChannel()) { return rpl::combine( - PeerUpdateValue( - channel, - Notify::PeerUpdate::Flag::MembersChanged), - Data::PeerFullFlagValue( - channel, - MTPDchannelFull::Flag::f_can_view_participants)) + Notify::PeerUpdateValue( + channel, + Notify::PeerUpdate::Flag::MembersChanged), + Data::PeerFullFlagValue( + channel, + MTPDchannelFull::Flag::f_can_view_participants)) | rpl::map([channel] { auto canViewCount = channel->canViewMembers() || !channel->isMegagroup(); @@ -219,7 +188,7 @@ rpl::producer SharedMediaCountValue( rpl::producer CommonGroupsCountValue( not_null user) { - return PeerUpdateValue( + return Notify::PeerUpdateValue( user, Notify::PeerUpdate::Flag::UserCommonChatsChanged) | rpl::map([user] { @@ -230,14 +199,14 @@ rpl::producer CommonGroupsCountValue( rpl::producer CanAddMemberValue( not_null peer) { if (auto chat = peer->asChat()) { - return PeerUpdateValue( + return Notify::PeerUpdateValue( chat, Notify::PeerUpdate::Flag::ChatCanEdit) | rpl::map([chat] { return chat->canEdit(); }); } else if (auto channel = peer->asChannel()) { - return PeerUpdateValue( + return Notify::PeerUpdateValue( channel, Notify::PeerUpdate::Flag::ChannelRightsChanged) | rpl::map([channel] { diff --git a/Telegram/SourceFiles/info/profile/info_profile_values.h b/Telegram/SourceFiles/info/profile/info_profile_values.h index 0b5817962a..5d5fc55cbe 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_values.h +++ b/Telegram/SourceFiles/info/profile/info_profile_values.h @@ -45,10 +45,6 @@ inline auto ToUpperValue() { }); } -rpl::producer PeerUpdateValue( - not_null peer, - Notify::PeerUpdate::Flags flags); - rpl::producer PhoneValue( not_null user); rpl::producer BioValue( diff --git a/Telegram/SourceFiles/info/profile/info_profile_widget.h b/Telegram/SourceFiles/info/profile/info_profile_widget.h index 002ad92f61..40b087987d 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_widget.h +++ b/Telegram/SourceFiles/info/profile/info_profile_widget.h @@ -22,6 +22,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include #include "info/info_content_widget.h" +#include "boxes/peer_list_box.h" namespace Info { namespace Profile { @@ -49,16 +50,23 @@ public: bool infoExpanded() const { return _infoExpanded; } - void setMediaExpanded(bool expanded) { - _mediaExpanded = expanded; + void setMembersSearch(QString query) { + _membersSearch = query; } - bool mediaExpanded() const { - return _mediaExpanded; + base::optional membersSearch() const { + return _membersSearch; + } + void setMembersState(std::unique_ptr state) { + _membersState = std::move(state); + } + std::unique_ptr membersState() { + return std::move(_membersState); } private: bool _infoExpanded = false; - bool _mediaExpanded = false; + base::optional _membersSearch; + std::unique_ptr _membersState; }; diff --git a/Telegram/SourceFiles/observer_peer.cpp b/Telegram/SourceFiles/observer_peer.cpp index 51455bf6c9..0ba226a298 100644 --- a/Telegram/SourceFiles/observer_peer.cpp +++ b/Telegram/SourceFiles/observer_peer.cpp @@ -46,7 +46,6 @@ base::Observable PeerUpdatedObservable; void mergePeerUpdate(PeerUpdate &mergeTo, const PeerUpdate &mergeFrom) { if (!(mergeTo.flags & PeerUpdate::Flag::NameChanged)) { if (mergeFrom.flags & PeerUpdate::Flag::NameChanged) { - mergeTo.oldNames = mergeFrom.oldNames; mergeTo.oldNameFirstChars = mergeFrom.oldNameFirstChars; } } diff --git a/Telegram/SourceFiles/observer_peer.h b/Telegram/SourceFiles/observer_peer.h index ec3f1cc461..ea94fc2945 100644 --- a/Telegram/SourceFiles/observer_peer.h +++ b/Telegram/SourceFiles/observer_peer.h @@ -20,6 +20,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include +#include +#include +#include #include "base/observer.h" #include "base/flags.h" @@ -81,7 +85,6 @@ struct PeerUpdate { Flags flags = 0; // NameChanged data - PeerData::Names oldNames; PeerData::NameFirstChars oldNameFirstChars; // SharedMediaChanged data @@ -122,4 +125,36 @@ private: }; base::Observable &PeerUpdated(); +inline auto PeerUpdateViewer( + PeerUpdate::Flags flags) { + return rpl::make_producer([=]( + const auto &consumer) { + auto lifetime = rpl::lifetime(); + lifetime.make_state( + PeerUpdated().add_subscription({ flags, [=]( + const PeerUpdate &update) { + consumer.put_next_copy(update); + }})); + return lifetime; + }); +} + +inline auto PeerUpdateViewer( + not_null peer, + PeerUpdate::Flags flags) { + return PeerUpdateViewer(flags) + | rpl::filter([=](const PeerUpdate &update) { + return (update.peer == peer); + }); +} + +inline auto PeerUpdateValue( + not_null peer, + PeerUpdate::Flags flags) { + auto initial = PeerUpdate(peer); + initial.flags = flags; + return rpl::single(initial) + | rpl::then(PeerUpdateViewer(peer, flags)); +} + } // namespace Notify diff --git a/Telegram/SourceFiles/profile/profile_channel_controllers.cpp b/Telegram/SourceFiles/profile/profile_channel_controllers.cpp index bfc4b2b263..3cd0a00874 100644 --- a/Telegram/SourceFiles/profile/profile_channel_controllers.cpp +++ b/Telegram/SourceFiles/profile/profile_channel_controllers.cpp @@ -230,13 +230,96 @@ void ParticipantsBoxController::peerListSearchAddRow(not_null peer) { } } -std::unique_ptr ParticipantsBoxController::createSearchRow(not_null peer) { +std::unique_ptr ParticipantsBoxController::createSearchRow( + not_null peer) { if (auto user = peer->asUser()) { return createRow(user); } return nullptr; } +std::unique_ptr ParticipantsBoxController::createRestoredRow( + not_null peer) { + if (auto user = peer->asUser()) { + return createRow(user); + } + return nullptr; +} + +std::unique_ptr ParticipantsBoxController::saveState() { + Expects(_role == Role::Profile); + + auto result = PeerListController::saveState(); + + auto my = SavedState(); + my.additional = std::move(_additional); + my.offset = _offset; + my.allLoaded = _allLoaded; + if (auto requestId = base::take(_loadRequestId)) { + request(requestId).cancel(); + my.wasLoading = true; + } + if (auto search = searchController()) { + my.searchState = search->saveState(); + } + + auto weak = result.get(); + Auth().data().megagroupParticipantAdded(_channel) + | rpl::start_with_next([weak](not_null user) { + if (!weak->list.empty()) { + if (weak->list[0] == user) { + return; + } + } + auto pos = base::find(weak->list, user); + if (pos == weak->list.cend()) { + weak->list.push_back(user); + } + base::stable_partition(weak->list, [user](not_null peer) { + return (peer == user); + }); + }, my.lifetime); + Auth().data().megagroupParticipantRemoved(_channel) + | rpl::start_with_next([weak](not_null user) { + weak->list.erase(std::remove( + weak->list.begin(), + weak->list.end(), + user), weak->list.end()); + weak->filterResults.erase(std::remove( + weak->filterResults.begin(), + weak->filterResults.end(), + user), weak->filterResults.end()); + }, my.lifetime); + + result->controllerState = std::move(my); + return result; +} + +void ParticipantsBoxController::restoreState( + std::unique_ptr state) { + auto typeErasedState = &state->controllerState; + if (auto my = base::any_cast(typeErasedState)) { + if (auto requestId = base::take(_loadRequestId)) { + request(requestId).cancel(); + } + + _additional = std::move(my->additional); + _offset = my->offset; + _allLoaded = my->allLoaded; + if (auto search = searchController()) { + search->restoreState(std::move(my->searchState)); + } + if (my->wasLoading) { + loadMoreRows(); + } + PeerListController::restoreState(std::move(state)); + if (!_offset) { + setDescriptionText(QString()); + } + sortByOnline(); + } +} + template void ParticipantsBoxController::HandleParticipant(const MTPChannelParticipant &participant, Role role, not_null additional, Callback callback) { if ((role == Role::Profile @@ -768,6 +851,36 @@ void ParticipantsBoxSearchController::searchQuery(const QString &query) { } } +base::unique_any ParticipantsBoxSearchController::saveState() { + auto result = SavedState(); + result.query = _query; + result.offset = _offset; + result.allLoaded = _allLoaded; + if (auto requestId = base::take(_requestId)) { + request(requestId).cancel(); + result.wasLoading = true; + } + return result; +} + +void ParticipantsBoxSearchController::restoreState( + base::unique_any &&state) { + if (auto my = base::any_cast(&state)) { + if (auto requestId = base::take(_requestId)) { + request(requestId).cancel(); + } + _cache.clear(); + _queries.clear(); + + _allLoaded = my->allLoaded; + _offset = my->offset; + _query = my->query; + if (my->wasLoading) { + searchOnServer(); + } + } +} + void ParticipantsBoxSearchController::searchOnServer() { Expects(!_query.isEmpty()); loadMoreRows(); @@ -1540,7 +1653,7 @@ void AddParticipantBoxSearchController::addChatsContacts() { return; } - auto getSmallestIndex = [&wordList](Dialogs::IndexedList *list) -> const Dialogs::List* { + auto getSmallestIndex = [&](Dialogs::IndexedList *list) -> const Dialogs::List* { if (list->isEmpty()) { return nullptr; } @@ -1560,10 +1673,10 @@ void AddParticipantBoxSearchController::addChatsContacts() { auto dialogsIndex = getSmallestIndex(App::main()->dialogsList()); auto contactsIndex = getSmallestIndex(App::main()->contactsNoDialogsList()); - auto allWordsAreFound = [&wordList](const OrderedSet &names) { - auto hasNamePartStartingWith = [&names](const QString &word) { - for_const (auto &namePart, names) { - if (namePart.startsWith(word)) { + auto allWordsAreFound = [&](const base::flat_set &nameWords) { + auto hasNamePartStartingWith = [&](const QString &word) { + for (auto &nameWord : nameWords) { + if (nameWord.startsWith(word)) { return true; } } @@ -1577,14 +1690,14 @@ void AddParticipantBoxSearchController::addChatsContacts() { } return true; }; - auto filterAndAppend = [this, allWordsAreFound](const Dialogs::List *list) { + auto filterAndAppend = [&](const Dialogs::List *list) { if (!list) { return; } for_const (auto row, *list) { if (auto user = row->history()->peer->asUser()) { - if (allWordsAreFound(user->names)) { + if (allWordsAreFound(user->nameWords())) { delegate()->peerListSearchAddRow(user); } } diff --git a/Telegram/SourceFiles/profile/profile_channel_controllers.h b/Telegram/SourceFiles/profile/profile_channel_controllers.h index f30735ac73..11b7a67e1e 100644 --- a/Telegram/SourceFiles/profile/profile_channel_controllers.h +++ b/Telegram/SourceFiles/profile/profile_channel_controllers.h @@ -78,11 +78,21 @@ public: void loadMoreRows() override; void peerListSearchAddRow(not_null peer) override; - std::unique_ptr createSearchRow(not_null peer) override; + std::unique_ptr createSearchRow( + not_null peer) override; + std::unique_ptr createRestoredRow( + not_null peer) override; + + std::unique_ptr saveState() override; + void restoreState(std::unique_ptr state) override; // Callback(not_null) template - static void HandleParticipant(const MTPChannelParticipant &participant, Role role, not_null additional, Callback callback); + static void HandleParticipant( + const MTPChannelParticipant &participant, + Role role, + not_null additional, + Callback callback); rpl::producer onlineCountValue() const override { return _onlineCount.value(); @@ -92,7 +102,19 @@ protected: virtual std::unique_ptr createRow(not_null user) const; private: - static std::unique_ptr CreateSearchController(not_null channel, Role role, not_null additional); + struct SavedState { + base::unique_any searchState; + int offset = 0; + bool allLoaded = false; + bool wasLoading = false; + Additional additional; + rpl::lifetime lifetime; + }; + + static std::unique_ptr CreateSearchController( + not_null channel, + Role role, + not_null additional); void setupSortByOnline(); void setupListChangeViewers(); @@ -139,7 +161,16 @@ public: bool isLoading() override; bool loadMoreRows() override; + base::unique_any saveState() override; + void restoreState(base::unique_any &&state) override; + private: + struct SavedState { + QString query; + int offset = 0; + bool allLoaded = false; + bool wasLoading = false; + }; struct CacheEntry { MTPchannels_ChannelParticipants result; int requestedCount = 0; @@ -151,7 +182,10 @@ private: void searchOnServer(); bool searchInCache(); - void searchDone(mtpRequestId requestId, const MTPchannels_ChannelParticipants &result, int requestedCount); + void searchDone( + mtpRequestId requestId, + const MTPchannels_ChannelParticipants &result, + int requestedCount); not_null _channel; Role _role = Role::Restricted; diff --git a/Telegram/SourceFiles/stdafx.h b/Telegram/SourceFiles/stdafx.h index 4f793d1110..d8a4746b3e 100644 --- a/Telegram/SourceFiles/stdafx.h +++ b/Telegram/SourceFiles/stdafx.h @@ -84,6 +84,7 @@ namespace func = base::functors; #include "base/flat_set.h" #include "base/flat_map.h" +#include "base/unique_any.h" #include "core/basic_types.h" #include "logs.h" diff --git a/Telegram/SourceFiles/ui/countryinput.cpp b/Telegram/SourceFiles/ui/countryinput.cpp index f261a6523c..52d959b5cd 100644 --- a/Telegram/SourceFiles/ui/countryinput.cpp +++ b/Telegram/SourceFiles/ui/countryinput.cpp @@ -289,17 +289,17 @@ CountrySelectBox::Inner::Inner(QWidget *parent) : TWidget(parent) countriesAll.push_back(ins); } - QStringList namesList = QString::fromUtf8(ins->name).toLower().split(QRegularExpression("[\\s\\-]"), QString::SkipEmptyParts); - CountryNames &names(countriesNames[i]); + auto namesList = QString::fromUtf8(ins->name).toLower().split(QRegularExpression("[\\s\\-]"), QString::SkipEmptyParts); + auto &names = countriesNames[i]; int l = namesList.size(); names.resize(0); names.reserve(l); for (int j = 0, l = namesList.size(); j < l; ++j) { - QString name = namesList[j].trimmed(); + auto name = namesList[j].trimmed(); if (!name.length()) continue; - QChar ch = name[0]; - CountriesIds &v(countriesByLetter[ch]); + auto ch = name[0]; + auto &v = countriesByLetter[ch]; if (v.isEmpty() || v.back() != i) { v.push_back(i); } diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt index c43dc002b2..f43144ab36 100644 --- a/Telegram/gyp/telegram_sources.txt +++ b/Telegram/gyp/telegram_sources.txt @@ -26,6 +26,7 @@ <(src_loc)/base/timer.cpp <(src_loc)/base/timer.h <(src_loc)/base/type_traits.h +<(src_loc)/base/unique_any.h <(src_loc)/base/variant.h <(src_loc)/base/virtual_method.h <(src_loc)/base/weak_unique_ptr.h