diff --git a/Telegram/SourceFiles/core/shortcuts.cpp b/Telegram/SourceFiles/core/shortcuts.cpp index 76bc4bd0d..f8c10e4ee 100644 --- a/Telegram/SourceFiles/core/shortcuts.cpp +++ b/Telegram/SourceFiles/core/shortcuts.cpp @@ -113,7 +113,7 @@ public: void fill(); void clear(); - std::optional lookup(int shortcutId) const; + [[nodiscard]] std::vector lookup(int shortcutId) const; void toggleMedia(bool toggled); void toggleSupport(bool toggled); @@ -124,14 +124,14 @@ private: void writeDefaultFile(); bool readCustomFile(); - void set(const QString &keys, Command command); + void set(const QString &keys, Command command, bool replace = false); void remove(const QString &keys); void unregister(base::unique_qptr shortcut); QStringList _errors; base::flat_map> _shortcuts; - base::flat_map _commandByShortcutId; + base::flat_multi_map _commandByShortcutId; base::flat_set _mediaShortcuts; base::flat_set _supportShortcuts; @@ -206,11 +206,14 @@ const QStringList &Manager::errors() const { return _errors; } -std::optional Manager::lookup(int shortcutId) const { - const auto i = _commandByShortcutId.find(shortcutId); - return (i != end(_commandByShortcutId)) - ? base::make_optional(i->second) - : std::nullopt; +std::vector Manager::lookup(int shortcutId) const { + auto result = std::vector(); + auto i = _commandByShortcutId.findFirst(shortcutId); + const auto end = _commandByShortcutId.end(); + for (; i != end && (i->first == shortcutId); ++i) { + result.push_back(i->second); + } + return result; } void Manager::toggleMedia(bool toggled) { @@ -278,7 +281,7 @@ bool Manager::readCustomFile() { const auto name = (*command).toString(); const auto i = CommandByName.find(name); if (i != end(CommandByName)) { - set((*keys).toString(), i->second); + set((*keys).toString(), i->second, true); } else { LOG(("Shortcut Warning: " "could not find shortcut command handler '%1'" @@ -343,7 +346,7 @@ void Manager::fillDefaults() { ranges::view::ints(1, ranges::unreachable)); for (const auto [command, index] : folders) { - set(qsl("%1+shift+%2").arg(ctrl).arg(index > 9 ? 0 : index), command); + set(qsl("%1+%2").arg(ctrl).arg(index), command); } set(qsl("%1+shift+down").arg(ctrl), Command::FolderNext); @@ -373,10 +376,12 @@ void Manager::writeDefaultFile() { shortcuts.push_back(version); for (const auto &[sequence, shortcut] : _shortcuts) { - const auto i = _commandByShortcutId.find(shortcut->id()); - if (i != end(_commandByShortcutId)) { + const auto shortcutId = shortcut->id(); + auto i = _commandByShortcutId.findFirst(shortcutId); + const auto end = _commandByShortcutId.end(); + for (; i != end && i->first == shortcutId; ++i) { const auto j = CommandNames.find(i->second); - if (j != end(CommandNames)) { + if (j != CommandNames.end()) { QJsonObject entry; entry.insert(qsl("keys"), sequence.toString().toLower()); entry.insert(qsl("command"), j->second); @@ -390,7 +395,7 @@ void Manager::writeDefaultFile() { file.write(document.toJson(QJsonDocument::Indented)); } -void Manager::set(const QString &keys, Command command) { +void Manager::set(const QString &keys, Command command, bool replace) { if (keys.isEmpty()) { return; } @@ -415,22 +420,25 @@ void Manager::set(const QString &keys, Command command) { if (isMediaShortcut || isSupportShortcut) { shortcut->setEnabled(false); } - const auto id = shortcut->id(); + auto id = shortcut->id(); + auto i = _shortcuts.find(result); + if (i == end(_shortcuts)) { + i = _shortcuts.emplace(result, std::move(shortcut)).first; + } else if (replace) { + unregister(std::exchange(i->second, std::move(shortcut))); + } else { + shortcut = nullptr; + id = i->second->id(); + } if (!id) { _errors.push_back(qsl("Could not create shortcut '%1'!").arg(keys)); return; } - auto i = _shortcuts.find(result); - if (i == end(_shortcuts)) { - i = _shortcuts.emplace(result, std::move(shortcut)).first; - } else { - unregister(std::exchange(i->second, std::move(shortcut))); - } _commandByShortcutId.emplace(id, command); - if (isMediaShortcut) { + if (shortcut && isMediaShortcut) { _mediaShortcuts.emplace(i->second.get()); } - if (isSupportShortcut) { + if (shortcut && isSupportShortcut) { _supportShortcuts.emplace(i->second.get()); } } @@ -465,11 +473,13 @@ Manager Data; } // namespace -Request::Request(Command command) : _command(command) { +Request::Request(std::vector commands) +: _commands(std::move(commands)) { } bool Request::check(Command command, int priority) { - if (_command == command && priority > _handlerPriority) { + if (ranges::contains(_commands, command) + && priority > _handlerPriority) { _handlerPriority = priority; return true; } @@ -481,12 +491,16 @@ bool Request::handle(FnMut handler) { return true; } -FnMut RequestHandler(Command command) { - auto request = Request(command); +FnMut RequestHandler(std::vector commands) { + auto request = Request(std::move(commands)); RequestsStream.fire(&request); return std::move(request._handler); } +FnMut RequestHandler(Command command) { + return RequestHandler(std::vector{ command }); +} + bool Launch(Command command) { if (auto handler = RequestHandler(command)) { return handler(); @@ -494,6 +508,13 @@ bool Launch(Command command) { return false; } +bool Launch(std::vector commands) { + if (auto handler = RequestHandler(std::move(commands))) { + return handler(); + } + return false; +} + rpl::producer> Requests() { return RequestsStream.events(); } @@ -509,10 +530,7 @@ const QStringList &Errors() { } bool HandleEvent(not_null event) { - if (const auto command = Data.lookup(event->shortcutId())) { - return Launch(*command); - } - return false; + return Launch(Data.lookup(event->shortcutId())); } void ToggleMediaShortcuts(bool toggled) { diff --git a/Telegram/SourceFiles/core/shortcuts.h b/Telegram/SourceFiles/core/shortcuts.h index fbce7c9ce..4bdf9bca4 100644 --- a/Telegram/SourceFiles/core/shortcuts.h +++ b/Telegram/SourceFiles/core/shortcuts.h @@ -35,16 +35,14 @@ enum class Command { ChatPinned4, ChatPinned5, + ShowAllChats, ShowFolder1, ShowFolder2, ShowFolder3, ShowFolder4, ShowFolder5, ShowFolder6, - ShowFolder7, - ShowFolder8, - ShowFolder9, - ShowFolder10, + ShowFolderLast, FolderNext, FolderPrevious, @@ -63,16 +61,14 @@ enum class Command { }; constexpr auto kShowFolder = { + Command::ShowAllChats, Command::ShowFolder1, Command::ShowFolder2, Command::ShowFolder3, Command::ShowFolder4, Command::ShowFolder5, Command::ShowFolder6, - Command::ShowFolder7, - Command::ShowFolder8, - Command::ShowFolder9, - Command::ShowFolder10, + Command::ShowFolderLast, }; [[nodiscard]] FnMut RequestHandler(Command command); @@ -83,13 +79,13 @@ public: bool handle(FnMut handler); private: - explicit Request(Command command); + explicit Request(std::vector commands); - Command _command; + std::vector _commands; int _handlerPriority = -1; FnMut _handler; - friend FnMut RequestHandler(Command command); + friend FnMut RequestHandler(std::vector commands); }; diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp index 6ad29fc53..c1e30d385 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp +++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp @@ -3008,6 +3008,27 @@ void InnerWidget::setupShortcuts() { return false; }); + const auto filters = &session().data().chatsFilters().list(); + if (const auto filtersCount = int(filters->size())) { + auto &&folders = ranges::view::zip( + Shortcuts::kShowFolder, + ranges::view::ints(0, ranges::unreachable)); + + for (const auto [command, index] : folders) { + const auto select = (command == Command::ShowFolderLast) + ? filtersCount + : std::clamp(index, 0, filtersCount); + request->check(command) && request->handle([=] { + if (select <= filtersCount) { + _controller->setActiveChatsFilter((select > 0) + ? (*filters)[select - 1].id() + : 0); + } + return true; + }); + } + } + static const auto kPinned = { Command::ChatPinned1, Command::ChatPinned2, @@ -3036,42 +3057,23 @@ void InnerWidget::setupShortcuts() { }); } - auto &&folders = ranges::view::zip( - Shortcuts::kShowFolder, - ranges::view::ints(0, ranges::unreachable)); - - for (const auto [command, index] : folders) { - request->check(command) && request->handle([=, index = index] { - const auto list = &session().data().chatsFilters().list(); - if (index >= list->size()) { - return false; - } - const auto filterId = list->at(index).id(); - _controller->setActiveChatsFilter((filterId == _filterId) - ? 0 - : filterId); - return true; - }); - } - const auto nearFolder = [=](bool isNext) { const auto id = _controller->activeChatsFilterCurrent(); const auto list = &session().data().chatsFilters().list(); - const auto it = (id == 0) - ? begin(*list) - 1 - : ranges::find(*list, id, &Data::ChatFilter::id); - if (it == end(*list) && id != 0) { + const auto index = (id != 0) + ? int(ranges::find(*list, id, &Data::ChatFilter::id) + - begin(*list)) + : -1; + if (index == list->size() && id != 0) { return false; } - const auto i = isNext ? 1 : -1; - const auto index = it - begin(*list) + i; - if (index >= (int)list->size() || index < -1) { + const auto changed = index + (isNext ? 1 : -1); + if (changed >= int(list->size()) || changed < -1) { return false; } - const auto filterId = (index == -1) - ? 0 - : list->at(index).id(); - _controller->setActiveChatsFilter(filterId); + _controller->setActiveChatsFilter((changed >= 0) + ? (*list)[changed].id() + : 0); return true; };