From e58f2d535129825a6530862e367dcca6bede702c Mon Sep 17 00:00:00 2001 From: Harish Vishwakarma Date: Wed, 11 Dec 2024 20:13:01 +0530 Subject: [PATCH 1/8] prefix https:// with invite code copied --- src/controllers/modals/components/CreateInvite.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/controllers/modals/components/CreateInvite.tsx b/src/controllers/modals/components/CreateInvite.tsx index 28e7a7d1..0efa3be4 100644 --- a/src/controllers/modals/components/CreateInvite.tsx +++ b/src/controllers/modals/components/CreateInvite.tsx @@ -7,10 +7,10 @@ import { ModalForm } from "@revoltchat/ui"; import { noopAsync } from "../../../lib/js"; +import { IS_REVOLT } from "../../../version"; import { takeError } from "../../client/jsx/error"; import { modalController } from "../ModalController"; import { ModalProps } from "../types"; -import { IS_REVOLT } from "../../../version"; /** * Code block which displays invite @@ -79,7 +79,9 @@ export default function CreateInvite({ children: , onClick: () => modalController.writeText( - IS_REVOLT ? `https://rvlt.gg/${code}` : `${window.location.host}/invite/${code}` + IS_REVOLT + ? `https://rvlt.gg/${code}` + : `https://${window.location.host}/invite/${code}`, ), }, ]} From 95facd635668284d2382b7c68ee53b2d5344efdc Mon Sep 17 00:00:00 2001 From: TeamAbronDev Date: Sun, 19 Jan 2025 11:40:11 +0330 Subject: [PATCH 2/8] url added to code box --- src/controllers/modals/components/CreateInvite.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/controllers/modals/components/CreateInvite.tsx b/src/controllers/modals/components/CreateInvite.tsx index 0efa3be4..bfa0a846 100644 --- a/src/controllers/modals/components/CreateInvite.tsx +++ b/src/controllers/modals/components/CreateInvite.tsx @@ -65,7 +65,7 @@ export default function CreateInvite({ ) : ( - {code} + https://{window.location.host}/invite/{code} ), }, From 27fd04f5e7ea25246a8ce967ebfab45ed2b90bbb Mon Sep 17 00:00:00 2001 From: TeamAbronDev Date: Sun, 19 Jan 2025 11:42:05 +0330 Subject: [PATCH 3/8] url added to code box --- src/controllers/modals/components/CreateInvite.tsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/controllers/modals/components/CreateInvite.tsx b/src/controllers/modals/components/CreateInvite.tsx index bfa0a846..3ef57a79 100644 --- a/src/controllers/modals/components/CreateInvite.tsx +++ b/src/controllers/modals/components/CreateInvite.tsx @@ -79,9 +79,7 @@ export default function CreateInvite({ children: , onClick: () => modalController.writeText( - IS_REVOLT - ? `https://rvlt.gg/${code}` - : `https://${window.location.host}/invite/${code}`, + `https://${window.location.host}/invite/${code}`, ), }, ]} From 51b1dd0f47189b0ca08042870fae42dfbccffe6a Mon Sep 17 00:00:00 2001 From: TeamAbronDev Date: Sun, 19 Jan 2025 13:00:52 +0330 Subject: [PATCH 4/8] url removed from res --- src/controllers/modals/components/CreateInvite.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/controllers/modals/components/CreateInvite.tsx b/src/controllers/modals/components/CreateInvite.tsx index 10927a5e..ae4d34ef 100644 --- a/src/controllers/modals/components/CreateInvite.tsx +++ b/src/controllers/modals/components/CreateInvite.tsx @@ -46,7 +46,6 @@ export default function CreateInvite({ target .createInvite() .then((res) => { - setUrl(res.url || "default_url"); setCode(res._id || "default_code"); }) .catch((err) => From 5b8127ebfec473f5db04ec20138191c72137f2e9 Mon Sep 17 00:00:00 2001 From: TeamAbronDev Date: Sun, 19 Jan 2025 14:33:15 +0330 Subject: [PATCH 5/8] url removed --- src/controllers/modals/components/CreateInvite.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/controllers/modals/components/CreateInvite.tsx b/src/controllers/modals/components/CreateInvite.tsx index 1487ce52..4fb7abe0 100644 --- a/src/controllers/modals/components/CreateInvite.tsx +++ b/src/controllers/modals/components/CreateInvite.tsx @@ -37,7 +37,6 @@ export default function CreateInvite({ }: ModalProps<"create_invite">) { const [processing, setProcessing] = useState(false); const [code, setCode] = useState("abcdef"); - const [url, setUrl] = useState("abcdef"); // Generate an invite code useEffect(() => { From e26158e3c88bc359edc9c08aa728bf4490aadaf7 Mon Sep 17 00:00:00 2001 From: TeamAbronDev Date: Mon, 20 Jan 2025 09:55:01 +0330 Subject: [PATCH 6/8] changed if statement --- src/pages/channels/Channel.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/channels/Channel.tsx b/src/pages/channels/Channel.tsx index 7e561976..4d575f9e 100644 --- a/src/pages/channels/Channel.tsx +++ b/src/pages/channels/Channel.tsx @@ -99,8 +99,8 @@ export const Channel = observer( const client = useClient(); const state = useApplicationState(); - if (!client.channels.exists(id) && server_id) { - if (server_id) { + if (!client.channels.exists(id)) { + if (server_id && !client.channels.exists(id)) { const server = client.servers.get(server_id); if (server && server.channel_ids.length > 0) { let target_id = server.channel_ids[0]; From 29e4198d44bb336d6fcf8b6e094f616c1a9c3d27 Mon Sep 17 00:00:00 2001 From: TeamAbronDev Date: Mon, 20 Jan 2025 16:26:35 +0330 Subject: [PATCH 7/8] changed if --- src/pages/channels/Channel.tsx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/pages/channels/Channel.tsx b/src/pages/channels/Channel.tsx index 4d575f9e..bc2d96b7 100644 --- a/src/pages/channels/Channel.tsx +++ b/src/pages/channels/Channel.tsx @@ -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); From 31f0c282de0cfedc563d84a97ba5a674b198750e Mon Sep 17 00:00:00 2001 From: ramin Date: Mon, 20 Jan 2025 21:39:02 +0330 Subject: [PATCH 8/8] Changed to back --- src/controllers/modals/components/CreateInvite.tsx | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/controllers/modals/components/CreateInvite.tsx b/src/controllers/modals/components/CreateInvite.tsx index 4fb7abe0..d9901a84 100644 --- a/src/controllers/modals/components/CreateInvite.tsx +++ b/src/controllers/modals/components/CreateInvite.tsx @@ -7,10 +7,10 @@ import { ModalForm } from "@revoltchat/ui"; import { noopAsync } from "../../../lib/js"; -import { IS_REVOLT } from "../../../version"; import { takeError } from "../../client/jsx/error"; import { modalController } from "../ModalController"; import { ModalProps } from "../types"; +import { IS_REVOLT } from "../../../version"; /** * Code block which displays invite @@ -44,9 +44,7 @@ export default function CreateInvite({ target .createInvite() - .then((res) => { - setCode(res._id || "default_code"); - }) + .then(({ _id }) => setCode(_id)) .catch((err) => modalController.push({ type: "error", error: takeError(err) }), ) @@ -81,10 +79,11 @@ export default function CreateInvite({ children: , onClick: () => modalController.writeText( - `https://${window.location.host}/invite/${code}`, + `https://${window.location.host}/invite/${code}` ), }, ]} /> ); } +