diff --git a/desktop/main-app/src/utils/URLProtocol.ts b/desktop/main-app/src/utils/URLProtocol.ts index fa5b4b3663c..be65bfa2e61 100644 --- a/desktop/main-app/src/utils/URLProtocol.ts +++ b/desktop/main-app/src/utils/URLProtocol.ts @@ -1,31 +1,17 @@ import { app } from "electron"; -import closeAPP from "./CloseAPP"; import runtime from "./Runtime"; +import closeAPP from "./CloseAPP"; import { windowManager } from "./WindowManager"; const actionHandler = { // eslint-disable-next-line @typescript-eslint/no-unused-vars - active(_arg: URLSearchParams) { - const mainWindow = windowManager.getMainWindow()?.window; - if (mainWindow) { - if (mainWindow.isMinimized()) { - mainWindow.restore(); - } - mainWindow.focus(); - } - }, - - open(arg: URLSearchParams) { + active: (_arg: URLSearchParams) => { const mainWindow = windowManager.getMainWindow()?.window; if (mainWindow) { if (mainWindow.isMinimized()) { mainWindow.restore(); } mainWindow.focus(); - // x-agora-flat-client://open?join=room-uuid - if (arg.has("join")) { - mainWindow.webContents.send("join-room", { roomUUID: arg.get("join") }); - } } }, }; @@ -68,9 +54,6 @@ const win = () => { }); }; -const actions = ["active", "open"] as const; -type Actions = typeof actions[number]; - const parseURL = ( url: string, ): { @@ -95,3 +78,6 @@ const parseURL = ( }; export const URLProtocol = runtime.isMac ? mac : win; + +const actions = ["active"] as const; +type Actions = typeof actions[number]; diff --git a/desktop/renderer-app/src/pages/HomePage/index.tsx b/desktop/renderer-app/src/pages/HomePage/index.tsx index 9b5836d079d..c058dbfd45b 100644 --- a/desktop/renderer-app/src/pages/HomePage/index.tsx +++ b/desktop/renderer-app/src/pages/HomePage/index.tsx @@ -1,28 +1,26 @@ -import { differenceInHours } from "date-fns"; -import { constants } from "flat-types"; -import { observer } from "mobx-react-lite"; +import "./HomePage.less"; + import React, { useEffect, useState } from "react"; +import { observer } from "mobx-react-lite"; +import { ipcAsyncByMainWindow, ipcSyncByApp } from "../../utils/ipc"; +import { MainRoomMenu } from "./MainRoomMenu"; +import { MainRoomListPanel } from "./MainRoomListPanel"; +import { MainRoomHistoryPanel } from "./MainRoomHistoryPanel"; import { useLastLocation } from "react-router-last-location"; -import { AppUpgradeModal } from "../../components/AppUpgradeModal"; +import { shouldWindowCenter } from "./utils"; +import { constants } from "flat-types"; import { MainPageLayoutContainer } from "../../components/MainPageLayoutContainer"; -import { globalStore } from "../../stores/GlobalStore"; +import { AppUpgradeModal } from "../../components/AppUpgradeModal"; import { useSafePromise } from "../../utils/hooks/lifecycle"; -import { ipcAsyncByMainWindow, ipcReceive, ipcReceiveRemove, ipcSyncByApp } from "../../utils/ipc"; -import { usePushHistory } from "../../utils/routes"; import { runtime } from "../../utils/runtime"; -import { joinRoomHandler } from "../utils/joinRoomHandler"; -import "./HomePage.less"; -import { MainRoomHistoryPanel } from "./MainRoomHistoryPanel"; -import { MainRoomListPanel } from "./MainRoomListPanel"; -import { MainRoomMenu } from "./MainRoomMenu"; -import { shouldWindowCenter } from "./utils"; +import { globalStore } from "../../stores/GlobalStore"; +import { differenceInHours } from "date-fns"; export type HomePageProps = {}; export const HomePage = observer(function HomePage() { const lastLocation = useLastLocation(); const [newVersion, setNewVersion] = useState(); - const pushHistory = usePushHistory(); const sp = useSafePromise(); useEffect(() => { @@ -32,16 +30,6 @@ export const HomePage = observer(function HomePage() { }); }, [lastLocation]); - useEffect(() => { - ipcReceive("join-room", ({ roomUUID }) => { - void joinRoomHandler(roomUUID, pushHistory); - }); - - return () => { - ipcReceiveRemove("join-room"); - }; - }, [pushHistory]); - useEffect(() => { // check for updates only here const checkUpdateVisible = diff --git a/packages/flat-types/src/ipc/index.ts b/packages/flat-types/src/ipc/index.ts index 90295160d41..c1a0dee35d5 100644 --- a/packages/flat-types/src/ipc/index.ts +++ b/packages/flat-types/src/ipc/index.ts @@ -45,5 +45,4 @@ export interface EmitEvents { | { status: false; }; - "join-room": { roomUUID: string }; }