From 56126fa303c428bcad0e673a1815d7d9a690e828 Mon Sep 17 00:00:00 2001
From: Paul <paulmakles@gmail.com>
Date: Sat, 25 Dec 2021 13:20:20 +0000
Subject: [PATCH] fix: handle invalid channels even when sidebar is closed

---
 .../navigation/left/ServerSidebar.tsx         |  9 --------
 src/pages/channels/Channel.tsx                | 22 +++++++++++++++----
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/components/navigation/left/ServerSidebar.tsx b/src/components/navigation/left/ServerSidebar.tsx
index 6481caf8..e42b39b6 100644
--- a/src/components/navigation/left/ServerSidebar.tsx
+++ b/src/components/navigation/left/ServerSidebar.tsx
@@ -59,15 +59,6 @@ export default observer(() => {
 
     const channel = channel_id ? client.channels.get(channel_id) : undefined;
 
-    // The user selected no channel, let's see if there's a channel available
-    if (!channel && server.channel_ids.length > 0)
-        return (
-            <Redirect
-                to={`/server/${server_id}/channel/${server.channel_ids[0]}`}
-            />
-        );
-    if (channel_id && !channel) return <Redirect to={`/server/${server_id}`} />;
-
     // ! FIXME: move this globally
     // Track which channel the user was last on.
     useEffect(() => {
diff --git a/src/pages/channels/Channel.tsx b/src/pages/channels/Channel.tsx
index dbf1fc7c..b177463f 100644
--- a/src/pages/channels/Channel.tsx
+++ b/src/pages/channels/Channel.tsx
@@ -2,7 +2,7 @@ import { Hash } from "@styled-icons/boxicons-regular";
 import { Ghost } from "@styled-icons/boxicons-solid";
 import { reaction } from "mobx";
 import { observer } from "mobx-react-lite";
-import { useParams } from "react-router-dom";
+import { Redirect, useParams } from "react-router-dom";
 import { Channel as ChannelI } from "revolt.js/dist/maps/Channels";
 import styled from "styled-components";
 
@@ -93,9 +93,21 @@ const PlaceholderBase = styled.div`
     }
 `;
 
-export function Channel({ id }: { id: string }) {
+export function Channel({ id, server_id }: { id: string; server_id: string }) {
     const client = useClient();
     const channel = client.channels.get(id);
+
+    if (server_id && !channel) {
+        const server = client.servers.get(server_id);
+        if (server && server.channel_ids.length > 0) {
+            return (
+                <Redirect
+                    to={`/server/${server_id}/channel/${server.channel_ids[0]}`}
+                />
+            );
+        }
+    }
+
     if (!channel) return <ChannelPlaceholder />;
 
     if (channel.channel_type === "VoiceChannel") {
@@ -198,6 +210,8 @@ function ChannelPlaceholder() {
 }
 
 export default function ChannelComponent() {
-    const { channel } = useParams<{ channel: string }>();
-    return <Channel id={channel} key={channel} />;
+    const { channel, server } =
+        useParams<{ channel: string; server: string }>();
+
+    return <Channel id={channel} server_id={server} key={channel} />;
 }