Remove useServer and useServers.

src/pages/settings/ServerSettings.tsx

@@ -5,7 +5,6 @@ import { Route, useHistory, useParams } from "react-router-dom";
 import { Text } from "preact-i18n";
 
 import RequiresOnline from "../../context/revoltjs/RequiresOnline";
-import { useServer } from "../../context/revoltjs/hooks";
 
 import Category from "../../components/ui/Category";
 
@@ -16,10 +15,12 @@ import { Invites } from "./server/Invites";
 import { Members } from "./server/Members";
 import { Overview } from "./server/Overview";
 import { Roles } from "./server/Roles";
+import { useData } from "../../mobx/State";
 
 export default function ServerSettings() {
     const { server: sid } = useParams<{ server: string }>();
-    const server = useServer(sid);
+    const store = useData();
+    const server = store.servers.get(sid);
     if (!server) return null;
 
     const history = useHistory();

src/pages/settings/channel/Permissions.tsx

@@ -5,9 +5,9 @@ import { ChannelPermission } from "revolt.js/dist/api/permissions";
 import { useContext, useEffect, useState } from "preact/hooks";
 
 import { Channel } from "../../../mobx";
+import { useData } from "../../../mobx/State";
 
 import { AppContext } from "../../../context/revoltjs/RevoltClient";
-import { useServer } from "../../../context/revoltjs/hooks";
 
 import Button from "../../../components/ui/Button";
 import Checkbox from "../../../components/ui/Checkbox";
@@ -31,11 +31,12 @@ interface Props {
 export default observer(({ channel }: Props) => {
     const [selected, setSelected] = useState("default");
     const client = useContext(AppContext);
+    const store = useData();
 
     type R = { name: string; permissions: number };
     const roles: { [key: string]: R } = {};
     if (channel.channel_type !== "Group") {
-        const server = useServer(channel.server!);
+        const server = store.servers.get(channel.server!);
         const a = server?.roles ?? {};
         for (const b of Object.keys(a)) {
             roles[b] = {

src/pages/settings/server/Bans.tsx

@@ -1,4 +1,5 @@
 import { XCircle } from "@styled-icons/boxicons-regular";
+import { observer } from "mobx-react-lite";
 import { Servers, Users } from "revolt.js/dist/api/objects";
 import { Route } from "revolt.js/dist/api/routes";
 
@@ -6,6 +7,8 @@ import styles from "./Panes.module.scss";
 import { Text } from "preact-i18n";
 import { useContext, useEffect, useState } from "preact/hooks";
 
+import { Server } from "../../../mobx";
+
 import { AppContext } from "../../../context/revoltjs/RevoltClient";
 
 import UserIcon from "../../../components/common/user/UserIcon";
@@ -13,10 +16,10 @@ import IconButton from "../../../components/ui/IconButton";
 import Preloader from "../../../components/ui/Preloader";
 
 interface Props {
-    server: Servers.Server;
+    server: Server;
 }
 
-export function Bans({ server }: Props) {
+export const Bans = observer(({ server }: Props) => {
     const client = useContext(AppContext);
     const [deleting, setDelete] = useState<string[]>([]);
     const [data, setData] = useState<
@@ -81,4 +84,4 @@ export function Bans({ server }: Props) {
             })}
         </div>
     );
-}
+});

src/pages/settings/server/Categories.tsx

@@ -9,6 +9,7 @@ import styles from "./Panes.module.scss";
 import { Text } from "preact-i18n";
 import { useContext, useEffect, useState } from "preact/hooks";
 
+import { Server } from "../../../mobx";
 import { useData } from "../../../mobx/State";
 
 import { AppContext } from "../../../context/revoltjs/RevoltClient";
@@ -23,7 +24,7 @@ import Preloader from "../../../components/ui/Preloader";
 import Tip from "../../../components/ui/Tip";
 
 interface Props {
-    server: Servers.Server;
+    server: Server;
 }
 
 // ! FIXME: really bad code

src/pages/settings/server/Invites.tsx

@@ -6,6 +6,7 @@ import styles from "./Panes.module.scss";
 import { Text } from "preact-i18n";
 import { useEffect, useState } from "preact/hooks";
 
+import { Server } from "../../../mobx";
 import { useData } from "../../../mobx/State";
 
 import { useClient } from "../../../context/revoltjs/RevoltClient";
@@ -16,7 +17,7 @@ import IconButton from "../../../components/ui/IconButton";
 import Preloader from "../../../components/ui/Preloader";
 
 interface Props {
-    server: Servers.Server;
+    server: Server;
 }
 
 export const Invites = observer(({ server }: Props) => {

src/pages/settings/server/Members.tsx

@@ -7,6 +7,7 @@ import styles from "./Panes.module.scss";
 import { Text } from "preact-i18n";
 import { useEffect, useState } from "preact/hooks";
 
+import { Server } from "../../../mobx";
 import { useData } from "../../../mobx/State";
 
 import { useClient } from "../../../context/revoltjs/RevoltClient";
@@ -18,7 +19,7 @@ import IconButton from "../../../components/ui/IconButton";
 import Overline from "../../../components/ui/Overline";
 
 interface Props {
-    server: Servers.Server;
+    server: Server;
 }
 
 export const Members = observer(({ server }: Props) => {

src/pages/settings/server/Overview.tsx

@@ -1,6 +1,6 @@
 import isEqual from "lodash.isequal";
 import { observer } from "mobx-react-lite";
-import { Servers, Server } from "revolt.js/dist/api/objects";
+import { Servers } from "revolt.js/dist/api/objects";
 
 import styles from "./Panes.module.scss";
 import { Text } from "preact-i18n";
@@ -8,6 +8,7 @@ import { useContext, useEffect, useState } from "preact/hooks";
 
 import TextAreaAutoSize from "../../../lib/TextAreaAutoSize";
 
+import { Server } from "../../../mobx";
 import { useData } from "../../../mobx/State";
 
 import { FileUploader } from "../../../context/revoltjs/FileUploads";
@@ -19,7 +20,7 @@ import ComboBox from "../../../components/ui/ComboBox";
 import InputBox from "../../../components/ui/InputBox";
 
 interface Props {
-    server: Servers.Server;
+    server: Server;
 }
 
 export const Overview = observer(({ server }: Props) => {
@@ -51,7 +52,7 @@ export const Overview = observer(({ server }: Props) => {
         if (description !== server.description)
             changes.description = description;
         if (!isEqual(systemMessages, server.system_messages))
-            changes.system_messages = systemMessages;
+            changes.system_messages = systemMessages ?? undefined;
 
         client.servers.edit(server._id, changes);
         setChanged(false);

src/pages/settings/server/Roles.tsx

@@ -1,5 +1,6 @@
 import { Plus } from "@styled-icons/boxicons-regular";
 import isEqual from "lodash.isequal";
+import { observer } from "mobx-react-lite";
 import { Servers } from "revolt.js/dist/api/objects";
 import {
     ChannelPermission,
@@ -10,6 +11,8 @@ import styles from "./Panes.module.scss";
 import { Text } from "preact-i18n";
 import { useContext, useEffect, useState } from "preact/hooks";
 
+import { Server } from "../../../mobx";
+
 import { useIntermediate } from "../../../context/intermediate/Intermediate";
 import { AppContext } from "../../../context/revoltjs/RevoltClient";
 
@@ -24,13 +27,13 @@ import Tip from "../../../components/ui/Tip";
 import ButtonItem from "../../../components/navigation/items/ButtonItem";
 
 interface Props {
-    server: Servers.Server;
+    server: Server;
 }
 
 const I32ToU32 = (arr: number[]) => arr.map((x) => x >>> 0);
 
 // ! FIXME: bad code :)
-export function Roles({ server }: Props) {
+export const Roles = observer(({ server }: Props) => {
     const [role, setRole] = useState("default");
     const { openScreen } = useIntermediate();
     const client = useContext(AppContext);
@@ -227,4 +230,4 @@ export function Roles({ server }: Props) {
             </div>
         </div>
     );
-}
+});