Merge branch 'master' into rollback/https_on_invite

pull/1154/head
teamabron 2025-01-25 17:11:38 +03:30 committed by GitHub
commit 21d9d696dd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
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 }) => {
const client = useClient();
const state = useApplicationState();
if (!client.channels.exists(id)) {
if (server_id && !client.channels.exists(id)) {
const server = client.servers.get(server_id);
if (!client.channels.get(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);