From c6e116ee5080da6e0f6742c88c9884332c3d653f Mon Sep 17 00:00:00 2001
From: Liam Fitzgerald <liam.fitzgerald@tlon.io>
Date: Mon, 7 Jun 2021 16:25:23 +1000
Subject: [PATCH] SidebarList: fix shortcuts

The SidebarList refactor that occurred to accomodate new-style DMs
inadvertently broke the keyboard shortcuts to switch between channels.
Revives this, and adds support for switching between DMs as well.
---
 .../components/Sidebar/SidebarList.tsx          | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/pkg/interface/src/views/landscape/components/Sidebar/SidebarList.tsx b/pkg/interface/src/views/landscape/components/Sidebar/SidebarList.tsx
index 1b1749ea0..aba43303e 100644
--- a/pkg/interface/src/views/landscape/components/Sidebar/SidebarList.tsx
+++ b/pkg/interface/src/views/landscape/components/Sidebar/SidebarList.tsx
@@ -108,14 +108,19 @@ export function SidebarList(props: {
     const offset = backward ? -1 : 1;
 
     const newIdx = modulo(idx+offset, ordered.length - 1);
-    const { metadata, resource } = associations[ordered[newIdx]];
-    const joined = graphKeys.has(resource.slice(7));
-    let path = '/~landscape/home';
-    if ('graph' in metadata.config) {
-      path = getResourcePath(workspace, resource, joined, metadata.config.graph);
+    const newChannel = ordered[newIdx];
+    let path = '';
+    if(newChannel.startsWith('~')) {
+      path = `/~landscape/messages/dm/${newChannel}`;
+    } else {
+      const { metadata, resource } = associations.graph[ordered[newIdx]];
+      const joined = graphKeys.has(resource.slice(7));
+      if ('graph' in metadata.config) {
+        path = getResourcePath(workspace, resource, joined, metadata.config.graph);
+      }
     }
     history.push(path);
-  }, [selected, history.push]);
+  }, [ordered, selected, history.push]);
 
   useShortcut('cycleForward', useCallback((e: KeyboardEvent) => {
     cycleChannels(false);