From df290605f4f40c9a36d10015ca1b57a4c27136da Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 29 Mar 2020 02:04:20 +0300
Subject: [PATCH] Added ability to switch between folders with shortcuts.

---
 Telegram/SourceFiles/core/shortcuts.cpp       |  3 ++
 Telegram/SourceFiles/core/shortcuts.h         |  3 ++
 .../dialogs/dialogs_inner_widget.cpp          | 29 +++++++++++++++++++
 3 files changed, 35 insertions(+)

diff --git a/Telegram/SourceFiles/core/shortcuts.cpp b/Telegram/SourceFiles/core/shortcuts.cpp
index 2a97f61ce..76bc4bd0d 100644
--- a/Telegram/SourceFiles/core/shortcuts.cpp
+++ b/Telegram/SourceFiles/core/shortcuts.cpp
@@ -346,6 +346,9 @@ void Manager::fillDefaults() {
 		set(qsl("%1+shift+%2").arg(ctrl).arg(index > 9 ? 0 : index), command);
 	}
 
+	set(qsl("%1+shift+down").arg(ctrl), Command::FolderNext);
+	set(qsl("%1+shift+up").arg(ctrl), Command::FolderPrevious);
+
 	set(qsl("ctrl+0"), Command::ChatSelf);
 
 	set(qsl("ctrl+9"), Command::ShowArchive);
diff --git a/Telegram/SourceFiles/core/shortcuts.h b/Telegram/SourceFiles/core/shortcuts.h
index 178433665..fbce7c9ce 100644
--- a/Telegram/SourceFiles/core/shortcuts.h
+++ b/Telegram/SourceFiles/core/shortcuts.h
@@ -46,6 +46,9 @@ enum class Command {
 	ShowFolder9,
 	ShowFolder10,
 
+	FolderNext,
+	FolderPrevious,
+
 	ShowArchive,
 
 	JustSendMessage,
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index 53d1a7ec0..b719ac56a 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -3053,6 +3053,35 @@ void InnerWidget::setupShortcuts() {
 			});
 		}
 
+		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) {
+				return false;
+			}
+			const auto i = isNext ? 1 : -1;
+			const auto index = it - begin(*list) + i;
+			if (index >= (int)list->size() || index < -1) {
+				return false;
+			}
+			const auto filterId = (index == -1)
+				? 0
+				: list->at(index).id();
+			_controller->setActiveChatsFilter(filterId);
+			return true;
+		};
+
+		request->check(Command::FolderNext) && request->handle([=] {
+			return nearFolder(true);
+		});
+
+		request->check(Command::FolderPrevious) && request->handle([=] {
+			return nearFolder(false);
+		});
+
 		if (session().supportMode() && row.key.history()) {
 			request->check(
 				Command::SupportScrollToCurrent