From 02357197383adab1cc75d3756f179646e64606f5 Mon Sep 17 00:00:00 2001 From: Tristan Yang Date: Sun, 29 Dec 2024 07:52:41 +0800 Subject: [PATCH] refactor: remove check ip API --- src/app/services/base.query.ts | 1 - src/app/services/server.ts | 26 +------------ src/components/SetEmailMsgTip.tsx | 62 ------------------------------- src/routes/index.tsx | 4 -- 4 files changed, 1 insertion(+), 92 deletions(-) delete mode 100644 src/components/SetEmailMsgTip.tsx diff --git a/src/app/services/base.query.ts b/src/app/services/base.query.ts index f5753827..60430846 100644 --- a/src/app/services/base.query.ts +++ b/src/app/services/base.query.ts @@ -32,7 +32,6 @@ const whiteList = [ ]; const whiteList401 = ["getAgoraVoicingList", "getAgoraChannels"]; const errorWhiteList = [ - "getIfInChina", "preCheckFileFromUrl", "getFavoriteDetails", "getOGInfo", diff --git a/src/app/services/server.ts b/src/app/services/server.ts index d93d6677..00cb1a7f 100644 --- a/src/app/services/server.ts +++ b/src/app/services/server.ts @@ -65,29 +65,6 @@ export const serverApi = createApi({ responseHandler: "text" }) }), - getIfInChina: builder.query({ - query: () => ({ - url: `https://cf-props.ihacker.dev` - }), - transformResponse: (resp: IPData) => { - if (!("error" in resp)) { - return resp.country.toUpperCase() == "CN"; - } - return false; - } - // async onQueryStarted(data, { dispatch, queryFulfilled }) { - // try { - // const {data:{status}} = await queryFulfilled; - // if(status=="success"){ - - // } - // localStorage.setItem(KEY_SERVER_VERSION, resp.data); - // dispatch(updateInfo({ version: resp.data })); - // } catch { - // console.error("get server version error"); - // } - // } - }), getServerVersion: builder.query({ query: () => ({ headers: { @@ -508,6 +485,5 @@ export const { useLazyGetAgoraUsersByChannelQuery, useLazyClearAllFilesQuery, useLazyClearAllMessagesQuery, - useLazyGetFilesQuery, - useGetIfInChinaQuery + useLazyGetFilesQuery } = serverApi; diff --git a/src/components/SetEmailMsgTip.tsx b/src/components/SetEmailMsgTip.tsx deleted file mode 100644 index 9cc79cde..00000000 --- a/src/components/SetEmailMsgTip.tsx +++ /dev/null @@ -1,62 +0,0 @@ -import { FC, useEffect } from "react"; -import toast from "react-hot-toast"; -import { useTranslation } from "react-i18next"; - -// import { KEY_SET_EMAIL_MSG_TIP } from "@/app/config"; -import Button from "./styled/Button"; -import { useGetIfInChinaQuery } from "@/app/services/server"; -import { useAppSelector } from "@/app/store"; - -interface ContainerProps { - id: string; -} -const Container = (props: ContainerProps) => { - const { id } = props; - const { t } = useTranslation(); - const handleUpgrade = () => { - // localStorage.removeItem(KEY_SET_EMAIL_MSG_TIP); - toast.dismiss(id); - location.href = "/#/setting/license"; - }; - const handleClose = () => { - // localStorage.removeItem(KEY_SET_EMAIL_MSG_TIP); - toast.dismiss(id); - }; - return ( -
-
{t("tip.email_msg_tip")}
-
- - -
-
- ); -}; -// 免费用户,admin,特定版本,在国内,提醒 -interface Props {} -const Index: FC = () => { - const isAdmin = useAppSelector((store) => store.authData.user?.is_admin); - const isUpgraded = useAppSelector((store) => store.server.upgraded); - const { data: isInChina } = useGetIfInChinaQuery(); - // const [visible, setVisible] = useState(false); - // useEffect(() => { - // setVisible(!!localStorage.getItem(KEY_SET_EMAIL_MSG_TIP)); - // }, []); - const showToast = isAdmin && isInChina && !isUpgraded; - useEffect(() => { - if (showToast) { - toast((t) => , { - duration: Infinity, - position: "top-right" - }); - } - }, [showToast]); - - return null; -}; - -export default Index; diff --git a/src/routes/index.tsx b/src/routes/index.tsx index 4bdbb4a8..529f6986 100644 --- a/src/routes/index.tsx +++ b/src/routes/index.tsx @@ -16,7 +16,6 @@ import InvitePrivate from "./invitePrivate"; import LazyIt from "./lazy"; import InviteInMobile from "./reg/InviteInMobile"; import usePrefetchData from "@/hooks/usePrefetchData"; -import SetEmailMsgTip from "@/components/SetEmailMsgTip"; import ServerVersionChecker from "@/components/ServerVersionChecker"; const RegBasePage = lazy(() => import("./reg")); @@ -297,9 +296,6 @@ function ReduxRoutes() { - - - ); }