Merge branch 'master' into rollback/https_on_invite

This commit is contained in:
teamabron
2025-01-25 17:11:38 +03:30
committed by GitHub
2 changed files with 5 additions and 5 deletions

View File

@@ -85,4 +85,5 @@ export default function CreateInvite({
]} ]}
/> />
); );
} }

View File

@@ -98,10 +98,9 @@ export const Channel = observer(
({ id, server_id }: { id: string; server_id: string }) => { ({ id, server_id }: { id: string; server_id: string }) => {
const client = useClient(); const client = useClient();
const state = useApplicationState(); const state = useApplicationState();
if (!client.channels.get(id)) {
if (!client.channels.exists(id)) { if (server_id) {
if (server_id && !client.channels.exists(id)) { const server = client.servers.get(server_id);
const server = client.servers.get(server_id);
if (server && server.channel_ids.length > 0) { if (server && server.channel_ids.length > 0) {
let target_id = server.channel_ids[0]; let target_id = server.channel_ids[0];
const last_id = state.layout.getLastOpened(server_id); const last_id = state.layout.getLastOpened(server_id);