feat: switch to revolt.js@6.0.0 + new revolt-api

src/pages/settings/server/Bans.tsx

@@ -1,9 +1,7 @@
 import { XCircle } from "@styled-icons/boxicons-regular";
 import { observer } from "mobx-react-lite";
 import { Virtuoso } from "react-virtuoso";
-import { Ban } from "revolt-api/types/Servers";
-import { User } from "revolt-api/types/Users";
-import { Route } from "revolt.js/dist/api/routes";
+import { API } from "revolt.js";
 import { Server } from "revolt.js/dist/maps/Servers";
 
 import styles from "./Panes.module.scss";
@@ -15,8 +13,8 @@ import IconButton from "../../../components/ui/IconButton";
 import Preloader from "../../../components/ui/Preloader";
 
 interface InnerProps {
-    ban: Ban;
-    users: Pick<User, "username" | "avatar" | "_id">[];
+    ban: API.ServerBan;
+    users: Pick<API.User, "username" | "avatar" | "_id">[];
     server: Server;
     removeSelf: () => void;
 }
@@ -53,9 +51,7 @@ interface Props {
 }
 
 export const Bans = observer(({ server }: Props) => {
-    const [data, setData] = useState<
-        Route<"GET", "/servers/id/bans">["response"] | undefined
-    >(undefined);
+    const [data, setData] = useState<API.BanListResult | undefined>(undefined);
 
     useEffect(() => {
         server.fetchBans().then(setData);

src/pages/settings/server/Categories.tsx

@@ -1,9 +1,7 @@
 import { Plus, X } from "@styled-icons/boxicons-regular";
 import { observer } from "mobx-react-lite";
 import { DragDropContext } from "react-beautiful-dnd";
-import { TextChannel, VoiceChannel } from "revolt-api/types/Channels";
-import { Category } from "revolt-api/types/Servers";
-import { Server } from "revolt.js/dist/maps/Servers";
+import { Channel, Server, API } from "revolt.js";
 import styled, { css } from "styled-components/macro";
 import { ulid } from "ulid";
 
@@ -135,7 +133,7 @@ interface Props {
 
 export const Categories = observer(({ server }: Props) => {
     const [status, setStatus] = useState<EditStatus>("saved");
-    const [categories, setCategories] = useState<Category[]>(
+    const [categories, setCategories] = useState<API.Category[]>(
         server.categories ?? [],
     );
 
@@ -327,12 +325,14 @@ function ListElement({
     addChannel,
     draggable,
 }: {
-    category: Category;
+    category: API.Category;
     server: Server;
     index: number;
     setTitle?: (title: string) => void;
     deleteSelf?: () => void;
-    addChannel: (channel: TextChannel | VoiceChannel) => void;
+    addChannel: (
+        channel: Channel & { channel_type: "TextChannel" | "VoiceChannel" },
+    ) => void;
     draggable?: boolean;
 }) {
     const { openScreen } = useIntermediate();

src/pages/settings/server/Invites.tsx

@@ -1,8 +1,7 @@
 import { XCircle } from "@styled-icons/boxicons-regular";
 import { observer } from "mobx-react-lite";
 import { Virtuoso } from "react-virtuoso";
-import { Invite, ServerInvite } from "revolt-api/types/Invites";
-import { Server } from "revolt.js/dist/maps/Servers";
+import { API, Server } from "revolt.js";
 
 import styles from "./Panes.module.scss";
 import { Text } from "preact-i18n";
@@ -16,7 +15,7 @@ import IconButton from "../../../components/ui/IconButton";
 import Preloader from "../../../components/ui/Preloader";
 
 interface InnerProps {
-    invite: Invite;
+    invite: API.Invite;
     server: Server;
     removeSelf: () => void;
 }
@@ -52,12 +51,10 @@ interface Props {
 }
 
 export const Invites = ({ server }: Props) => {
-    const [invites, setInvites] = useState<ServerInvite[] | undefined>(
-        undefined,
-    );
+    const [invites, setInvites] = useState<API.Invite[] | undefined>(undefined);
 
     useEffect(() => {
-        server.fetchInvites().then(setInvites);
+        server.fetchInvites().then((v) => setInvites(v));
     }, [server, setInvites]);
 
     return (

src/pages/settings/server/Overview.tsx

@@ -8,6 +8,7 @@ import { Text } from "preact-i18n";
 import { useEffect, useState } from "preact/hooks";
 
 import TextAreaAutoSize from "../../../lib/TextAreaAutoSize";
+import { noop } from "../../../lib/js";
 
 import { FileUploader } from "../../../context/revoltjs/FileUploads";
 import { getChannelName } from "../../../context/revoltjs/util";
@@ -60,9 +61,9 @@ export const Overview = observer(({ server }: Props) => {
                     fileType="icons"
                     behaviour="upload"
                     maxFileSize={2_500_000}
-                    onUpload={(icon) => server.edit({ icon })}
+                    onUpload={(icon) => server.edit({ icon }).then(noop)}
                     previewURL={server.generateIconURL({ max_side: 256 }, true)}
-                    remove={() => server.edit({ remove: "Icon" })}
+                    remove={() => server.edit({ remove: ["Icon"] }).then(noop)}
                 />
                 <div className={styles.name}>
                     <h3>
@@ -117,9 +118,9 @@ export const Overview = observer(({ server }: Props) => {
                 fileType="banners"
                 behaviour="upload"
                 maxFileSize={6_000_000}
-                onUpload={(banner) => server.edit({ banner })}
+                onUpload={(banner) => server.edit({ banner }).then(noop)}
                 previewURL={server.generateBannerURL({ width: 1000 }, true)}
-                remove={() => server.edit({ remove: "Banner" })}
+                remove={() => server.edit({ remove: ["Banner"] }).then(noop)}
             />
             <hr />
             <h3>