mirror of
https://github.com/stoatchat/for-legacy-web.git
synced 2026-03-06 17:11:55 +00:00
Merge branch 'master' into rollback/https_on_invite
This commit is contained in:
@@ -85,4 +85,5 @@ export default function CreateInvite({
|
|||||||
]}
|
]}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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);
|
||||||
|
|||||||
Reference in New Issue
Block a user