diff --git a/src/components/AddEntriesMenu.tsx b/src/components/AddEntriesMenu.tsx index 5d03891d..2f23b9f5 100644 --- a/src/components/AddEntriesMenu.tsx +++ b/src/components/AddEntriesMenu.tsx @@ -10,7 +10,6 @@ import ChannelIcon from "./ChannelIcon"; import ChannelModal from "./ChannelModal"; import InviteModal from "./InviteModal"; import SearchUser from "./SearchUser"; -import ServerVersionChecker from "./ServerVersionChecker"; import UsersModal from "./UsersModal"; export default function AddEntriesMenu() { @@ -79,12 +78,10 @@ export default function AddEntriesMenu() { {t("action.invite_people")} - -
  • - - {t("action.search_people")} -
  • -
    +
  • + + {t("action.search_people")} +
  • {channelModalVisible && } {usersModalVisible && } diff --git a/src/hooks/usePreload.ts b/src/hooks/usePreload.ts index d6eebb37..924da20a 100644 --- a/src/hooks/usePreload.ts +++ b/src/hooks/usePreload.ts @@ -10,7 +10,6 @@ import { } from "@/app/services/server"; import { useLazyGetContactsQuery, useLazyGetUsersQuery } from "@/app/services/user"; import { useAppSelector } from "@/app/store"; -import { compareVersion } from "../utils"; import useLicense from "./useLicense"; import useStreaming from "./useStreaming"; @@ -28,7 +27,8 @@ export default function usePreload() { isGuest, expireTime = +new Date(), channelMessageData, - channelIds + channelIds, + enableContacts } = useAppSelector((store) => { return { channelIds: store.channels.ids, @@ -36,7 +36,8 @@ export default function usePreload() { loginUid: store.authData.user?.uid, isGuest: store.authData.guest, token: store.authData.token, - expireTime: store.authData.expireTime + expireTime: store.authData.expireTime, + enableContacts: store.server.contact_verification_enable }; }); const { setStreamingReady } = useStreaming(); @@ -95,17 +96,11 @@ export default function usePreload() { useEffect(() => { if (rehydrated && serverVersion) { getUsers().then(() => { - if (compareVersion(serverVersion, "0.3.7") >= 0 && !isGuest) { - // 根据版本号判断是否需要初始化contact - getContacts(); - } + getContacts(); }); getServer(); getFavorites(); - if (compareVersion(serverVersion, "0.3.4") >= 0) { - // 根据版本号判断是否需要调用system common api - getSystemCommon(); - } + getSystemCommon(); } }, [rehydrated, serverVersion, isGuest]); const tokenAlmostExpire = dayjs().isAfter(new Date(expireTime - 20 * 1000)); @@ -115,7 +110,6 @@ export default function usePreload() { useEffect(() => { setStreamingReady(canStreaming); }, [canStreaming]); - const enableContact = serverVersion ? compareVersion(serverVersion, "0.3.7") >= 0 : false; return { loading: usersLoading || @@ -127,7 +121,7 @@ export default function usePreload() { error: usersError && serverError && favoritesError, success: usersSuccess && serverSuccess && favoritesSuccess && serverVersionSuccess, data: { - users: enableContact ? contacts : users, + users: enableContacts ? contacts : users, server, favorites } diff --git a/src/routes/chat/ChannelChat/index.tsx b/src/routes/chat/ChannelChat/index.tsx index 8726a7e2..5745314c 100644 --- a/src/routes/chat/ChannelChat/index.tsx +++ b/src/routes/chat/ChannelChat/index.tsx @@ -9,7 +9,6 @@ import { updateRememberedNavs } from "@/app/slices/ui"; import { useAppSelector } from "@/app/store"; import ChannelIcon from "@/components/ChannelIcon"; import GoBackNav from "@/components/GoBackNav"; -import ServerVersionChecker from "@/components/ServerVersionChecker"; import Tooltip from "@/components/Tooltip"; import IconFav from "@/assets/icons/bookmark.svg"; import IconPeople from "@/assets/icons/people.svg"; @@ -93,9 +92,7 @@ function ChannelChat({ cid = 0, dropFiles = [] }: Props) { - - - + = ({ uid = 0, dropFiles }) => { dropFiles={dropFiles} aside={
      - - - + = ({ const dispatch = useDispatch(); const navigateTo = useNavigate(); const { pathname } = useLocation(); - const { channelMuted, serverVersion } = useAppSelector((store) => { + const { channelMuted } = useAppSelector((store) => { return { - serverVersion: store.server.version, channelMuted: context == "channel" ? store.footprint.muteChannels[id] : false }; }); @@ -95,11 +93,10 @@ const SessionContextMenu: FC = ({ }; const pinTxt = t(pinned ? "unpin_chat" : "pin_chat", { ns: "chat" }); - const pinVisible = compareVersion(serverVersion, "0.3.7") >= 0; const items = context == "dm" ? [ - pinVisible && { + { title: pinTxt, handler: handlePinChat }, @@ -122,7 +119,7 @@ const SessionContextMenu: FC = ({ } ] : [ - pinVisible && { + { title: pinTxt, handler: handlePinChat }, diff --git a/src/routes/home/index.tsx b/src/routes/home/index.tsx index 91e3abdb..b3f4b457 100644 --- a/src/routes/home/index.tsx +++ b/src/routes/home/index.tsx @@ -9,7 +9,6 @@ import Loading from "@/components/Loading"; import Manifest from "@/components/Manifest"; import Notification from "@/components/Notification"; import ReLoginModal from "@/components/ReLoginModal"; -import ServerVersionChecker from "@/components/ServerVersionChecker"; import Tooltip from "@/components/Tooltip"; import UnreadTabTip from "@/components/UnreadTabTip"; import Voice from "@/components/Voice"; @@ -68,11 +67,7 @@ function HomePage() { <> {roleChanged && } {!guest && } - {!guest && ( - - - - )} + {!guest && } {!guest && }
      diff --git a/src/routes/onboarding/steps/invite-link.tsx b/src/routes/onboarding/steps/invite-link.tsx index 9edae477..6ee27d5d 100644 --- a/src/routes/onboarding/steps/invite-link.tsx +++ b/src/routes/onboarding/steps/invite-link.tsx @@ -1,7 +1,6 @@ import { useTranslation } from "react-i18next"; import { useWizard } from "react-use-wizard"; -import ServerVersionChecker from "@/components/ServerVersionChecker"; import StyledButton from "@/components/styled/Button"; import StyledInput from "@/components/styled/Input"; import useInviteLink from "@/hooks/useInviteLink"; @@ -35,9 +34,7 @@ export default function InviteLink() { {t("done")} - - - +
      ); } diff --git a/src/routes/setting/Overview/index.tsx b/src/routes/setting/Overview/index.tsx index c57edd71..f7931030 100644 --- a/src/routes/setting/Overview/index.tsx +++ b/src/routes/setting/Overview/index.tsx @@ -3,7 +3,6 @@ import { useTranslation } from "react-i18next"; import { useAppSelector } from "@/app/store"; import { LoginConfig, WhoCanSignUp } from "@/types/server"; -import ServerVersionChecker from "@/components/ServerVersionChecker"; import StyledRadio from "@/components/styled/Radio"; import useConfig from "@/hooks/useConfig"; import ChatLayout from "./ChatLayout"; @@ -37,9 +36,7 @@ export default function Overview() {
      {/* 设置前端url */} - - - + {isAdmin && ( <>
      @@ -68,17 +65,11 @@ export default function Overview() { /> {/* 是否显示在线提示 */} - - - + {/* 会话布局 */} - - - + {/* 联系人验证模式 */} - - - + )} diff --git a/src/routes/setting/navs.tsx b/src/routes/setting/navs.tsx index 7fc53558..6f9a5973 100644 --- a/src/routes/setting/navs.tsx +++ b/src/routes/setting/navs.tsx @@ -2,7 +2,6 @@ import { useTranslation } from "react-i18next"; import { useAppSelector } from "@/app/store"; import ManageMembers from "@/components/ManageMembers"; -import ServerVersionChecker from "@/components/ServerVersionChecker"; import Version from "@/components/Version"; import APIConfig from "./APIConfig"; import APIDocument from "./APIDocument"; @@ -40,11 +39,7 @@ const navs = [ items: [ { name: "bot", - component: ( - - - - ), + component: , admin: true }, { @@ -53,11 +48,7 @@ const navs = [ }, { name: "agora", - component: ( - - - - ) + component: }, { name: "smtp", diff --git a/src/routes/users/Search.tsx b/src/routes/users/Search.tsx index a54a2cc3..6cca9796 100644 --- a/src/routes/users/Search.tsx +++ b/src/routes/users/Search.tsx @@ -5,7 +5,6 @@ import Tippy from "@tippyjs/react"; import { useAppSelector } from "@/app/store"; import AddEntriesMenu from "@/components/AddEntriesMenu"; import Tooltip from "@/components/Tooltip"; -import { compareVersion } from "@/utils"; import IconAdd from "@/assets/icons/add.svg"; import IconSearch from "@/assets/icons/search.svg"; @@ -15,12 +14,11 @@ type Props = { updateInput: (input: string) => void; }; const Search: FC = ({ input, updateInput, openModal }) => { - const serverVersion = useAppSelector((store) => store.server.version); + const enableContact = useAppSelector((store) => store.server.contact_verification_enable); const { t } = useTranslation(); const handleInput = (evt: ChangeEvent) => { updateInput(evt.target.value); }; - const enableContact = compareVersion(serverVersion, "0.3.7") >= 0; return (