refactor: remove server version checker

This commit is contained in:
Tristan Yang
2023-05-19 17:50:02 +08:00
parent abe49bcb3c
commit dc8a42c338
10 changed files with 25 additions and 71 deletions
+1 -4
View File
@@ -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) {
</li>
</Tippy>
</Tooltip>
<ServerVersionChecker version="0.3.5" empty={true}>
<VoiceChat context={`channel`} id={cid} />
</ServerVersionChecker>
<VoiceChat context={`channel`} id={cid} />
<Tooltip tip={t("fav")} placement="left">
<Tippy
placement="left-start"
+1 -4
View File
@@ -4,7 +4,6 @@ import Tippy from "@tippyjs/react";
import { useAppSelector } from "@/app/store";
import GoBackNav from "@/components/GoBackNav";
import ServerVersionChecker from "@/components/ServerVersionChecker";
import Tooltip from "@/components/Tooltip";
import User from "@/components/User";
import FavIcon from "@/assets/icons/bookmark.svg";
@@ -37,9 +36,7 @@ const DMChat: FC<Props> = ({ uid = 0, dropFiles }) => {
dropFiles={dropFiles}
aside={
<ul className="flex flex-col gap-6">
<ServerVersionChecker version="0.3.7" empty={true}>
<VoiceChat context={`dm`} id={uid} />
</ServerVersionChecker>
<VoiceChat context={`dm`} id={uid} />
<Tooltip tip="Saved Items" placement="left">
<Tippy
placement="left-start"
+3 -6
View File
@@ -15,7 +15,6 @@ import { useAppSelector } from "@/app/store";
import { ChatContext } from "@/types/common";
import ContextMenu, { Item } from "@/components/ContextMenu";
import useUserOperation from "@/hooks/useUserOperation";
import { compareVersion } from "@/utils";
type Props = {
context: ChatContext;
@@ -52,9 +51,8 @@ const SessionContextMenu: FC<Props> = ({
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<Props> = ({
};
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<Props> = ({
}
]
: [
pinVisible && {
{
title: pinTxt,
handler: handlePinChat
},
+1 -6
View File
@@ -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 && <ReLoginModal />}
{!guest && <UnreadTabTip />}
{!guest && (
<ServerVersionChecker empty={true} version="0.3.5">
<Voice />
</ServerVersionChecker>
)}
{!guest && <Voice />}
<Manifest />
{!guest && <Notification />}
<div className={`vocechat-container flex w-screen h-screen bg-gray-200 dark:bg-gray-900`}>
+1 -4
View File
@@ -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() {
<StyledButton className="w-32 h-11 mt-6" onClick={nextStep}>
{t("done")}
</StyledButton>
<ServerVersionChecker version="0.3.3" empty={true}>
<UpdateFrontendURL refreshInviteLink={generateNewLink} />
</ServerVersionChecker>
<UpdateFrontendURL refreshInviteLink={generateNewLink} />
</div>
);
}
+4 -13
View File
@@ -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() {
<div className="relative w-full md:w-[512px] flex flex-col gap-6">
<Server />
{/* 设置前端url */}
<ServerVersionChecker version="0.3.3" empty={true}>
<FrontendURL />
</ServerVersionChecker>
<FrontendURL />
{isAdmin && (
<>
<div className="flex flex-col">
@@ -68,17 +65,11 @@ export default function Overview() {
/>
</SettingBlock>
{/* 是否显示在线提示 */}
<ServerVersionChecker version="0.3.4" empty={true}>
<OnlineStatus />
</ServerVersionChecker>
<OnlineStatus />
{/* 会话布局 */}
<ServerVersionChecker version="0.3.7" empty={true}>
<ChatLayout />
</ServerVersionChecker>
<ChatLayout />
{/* 联系人验证模式 */}
<ServerVersionChecker version="0.3.7" empty={true}>
<ContactVerification />
</ServerVersionChecker>
<ContactVerification />
</>
)}
+2 -11
View File
@@ -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: (
<ServerVersionChecker version="0.3.2">
<BotConfig />
</ServerVersionChecker>
),
component: <BotConfig />,
admin: true
},
{
@@ -53,11 +48,7 @@ const navs = [
},
{
name: "agora",
component: (
<ServerVersionChecker version="0.3.5">
<ConfigAgora />
</ServerVersionChecker>
)
component: <ConfigAgora />
},
{
name: "smtp",
+1 -3
View File
@@ -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<Props> = ({ 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<HTMLInputElement>) => {
updateInput(evt.target.value);
};
const enableContact = compareVersion(serverVersion, "0.3.7") >= 0;
return (
<div className="hidden md:flex relative min-h-[56px] px-2 py-3 items-center justify-between gap-2 shadow-[rgb(0_0_0_/_10%)_0px_1px_0px] dark:border-b-gray-500">
<div className="flex items-center gap-1">