From 12b97160433151c188b077bd3e85fc2ee35bbd99 Mon Sep 17 00:00:00 2001
From: Paul Makles <paulmakles@gmail.com>
Date: Fri, 27 May 2022 22:32:06 +0100
Subject: [PATCH] fix: open last opened server channel instead of first

---
 src/pages/channels/Channel.tsx | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/pages/channels/Channel.tsx b/src/pages/channels/Channel.tsx
index f27f5317..49d4028f 100644
--- a/src/pages/channels/Channel.tsx
+++ b/src/pages/channels/Channel.tsx
@@ -23,9 +23,8 @@ import MessageBox from "../../components/common/messaging/MessageBox";
 import JumpToBottom from "../../components/common/messaging/bars/JumpToBottom";
 import NewMessages from "../../components/common/messaging/bars/NewMessages";
 import TypingIndicator from "../../components/common/messaging/bars/TypingIndicator";
-import { PageHeader } from "../../components/ui/Header";
-
 import RightSidebar from "../../components/navigation/RightSidebar";
+import { PageHeader } from "../../components/ui/Header";
 import ChannelHeader from "./ChannelHeader";
 import { MessageArea } from "./messaging/MessageArea";
 import VoiceHeader from "./voice/VoiceHeader";
@@ -100,14 +99,23 @@ const PlaceholderBase = styled.div`
 export const Channel = observer(
     ({ id, server_id }: { id: string; server_id: string }) => {
         const client = useClient();
+        const state = useApplicationState();
 
         if (!client.channels.exists(id)) {
             if (server_id) {
                 const server = client.servers.get(server_id);
                 if (server && server.channel_ids.length > 0) {
+                    let target_id = server.channel_ids[0];
+                    const last_id = state.layout.getLastOpened(server_id);
+                    if (last_id) {
+                        if (client.channels.has(last_id)) {
+                            target_id = last_id;
+                        }
+                    }
+
                     return (
                         <Redirect
-                            to={`/server/${server_id}/channel/${server.channel_ids[0]}`}
+                            to={`/server/${server_id}/channel/${target_id}`}
                         />
                     );
                 }