prevent navigating to non-text channels

spacebarchat · Jun 1, 2023 · eb962bd · eb962bd
1 parent dd81402
commit eb962bd
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/src/components/ChannelList.tsx b/src/components/ChannelList.tsx
@@ -67,7 +67,12 @@ function ChannelList() {
 						key={channel.id}
 						isCategory={isCategory}
 						onClick={() =>
-							navigate(`/channels/${guild.id}/${channel.id}`)
+							{
+								// prevent navigating to non-text channels
+								if (!channel.isTextChannel) return;
+
+								navigate(`/channels/${guild.id}/${channel.id}`)
+							}
 						}
 					>
 						<FirstWrapper isCategory={isCategory} active={active}>

diff --git a/src/stores/objects/Channel.ts b/src/stores/objects/Channel.ts
@@ -14,7 +14,7 @@ import type {
 	Snowflake as SnowflakeType,
 } from "@spacebarchat/spacebar-api-types/v9";
 import { ChannelType, Routes } from "@spacebarchat/spacebar-api-types/v9";
-import { action, makeObservable, observable } from "mobx";
+import { action, computed, makeObservable, observable } from "mobx";
 import AppStore from "../AppStore";
 import MessageStore from "../MessageStore";
 import { APIError } from "../../utils/interfaces/api";
@@ -208,4 +208,20 @@ export default class Channel {
 
 		return true;
 	}
+
+	@computed
+	get isTextChannel() {
+		return (
+			this.type === ChannelType.GuildText ||
+			this.type === ChannelType.GuildStore ||
+			this.type === ChannelType.GuildForum ||
+			this.type === ChannelType.AnnouncementThread ||
+			this.type === ChannelType.Encrypted ||
+			this.type === ChannelType.EncryptedThread ||
+			this.type === ChannelType.PrivateThread ||
+			this.type === ChannelType.PublicThread ||
+			this.type === ChannelType.GroupDM ||
+			this.type === ChannelType.DM
+		);
+	}
 }