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

src/pages/settings/panes/Account.tsx

@@ -1,4 +1,4 @@
-import { At, Key, Block, ListOl } from "@styled-icons/boxicons-regular";
+import { At, Key, Block } from "@styled-icons/boxicons-regular";
 import {
     Envelope,
     HelpCircle,
@@ -8,7 +8,7 @@ import {
 } from "@styled-icons/boxicons-solid";
 import { observer } from "mobx-react-lite";
 import { useHistory } from "react-router-dom";
-import { Profile } from "revolt-api/types/Users";
+import { API } from "revolt.js";
 
 import styles from "./Panes.module.scss";
 import { Text } from "preact-i18n";
@@ -37,7 +37,9 @@ export const Account = observer(() => {
 
     const [email, setEmail] = useState("...");
     const [revealEmail, setRevealEmail] = useState(false);
-    const [profile, setProfile] = useState<undefined | Profile>(undefined);
+    const [profile, setProfile] = useState<undefined | API.UserProfile>(
+        undefined,
+    );
     const history = useHistory();
 
     function switchPage(to: string) {
@@ -46,8 +48,8 @@ export const Account = observer(() => {
 
     useEffect(() => {
         if (email === "..." && status === ClientStatus.ONLINE) {
-            client
-                .req("GET", "/auth/account")
+            client.api
+                .get("/auth/account/")
                 .then((account) => setEmail(account.email));
         }
 

src/pages/settings/panes/MyBots.tsx

@@ -1,9 +1,9 @@
+// ! FIXME: this code is garbage, need to replace
 import { Key, Clipboard, Globe, Plus } from "@styled-icons/boxicons-regular";
 import { LockAlt, HelpCircle } from "@styled-icons/boxicons-solid";
 import type { AxiosError } from "axios";
 import { observer } from "mobx-react-lite";
-import { Bot } from "revolt-api/types/Bots";
-import { Profile as ProfileI } from "revolt-api/types/Users";
+import { API } from "revolt.js";
 import { User } from "revolt.js/dist/maps/Users";
 import styled from "styled-components/macro";
 
@@ -43,7 +43,7 @@ interface Changes {
     name?: string;
     public?: boolean;
     interactions_url?: string;
-    remove?: "InteractionsURL";
+    remove?: "InteractionsURL"[];
 }
 
 const BotBadge = styled.div`
@@ -62,7 +62,7 @@ const BotBadge = styled.div`
 `;
 
 interface Props {
-    bot: Bot;
+    bot: API.Bot;
     onDelete(): void;
     onUpdate(changes: Changes): void;
 }
@@ -75,7 +75,7 @@ function BotCard({ bot, onDelete, onUpdate }: Props) {
         _id: bot._id,
         username: user.username,
         public: bot.public,
-        interactions_url: bot.interactions_url,
+        interactions_url: bot.interactions_url as any,
     });
     const [error, setError] = useState<string | JSX.Element>("");
     const [saving, setSaving] = useState(false);
@@ -87,23 +87,21 @@ function BotCard({ bot, onDelete, onUpdate }: Props) {
         useState<HTMLInputElement | null>(null);
     const { writeClipboard, openScreen } = useIntermediate();
 
-    const [profile, setProfile] = useState<undefined | ProfileI>(undefined);
+    const [profile, setProfile] = useState<undefined | API.UserProfile>(
+        undefined,
+    );
 
     const refreshProfile = useCallback(() => {
-        client
-            .request(
-                "GET",
-                `/users/${bot._id}/profile` as "/users/id/profile",
-                {
-                    headers: { "x-bot-token": bot.token },
-                    transformRequest: (data, headers) => {
-                        // Remove user headers for this request
-                        delete headers["x-user-id"];
-                        delete headers["x-session-token"];
-                        return data;
-                    },
+        client.api
+            .get(`/users/${bot._id as ""}/profile`, undefined, {
+                headers: { "x-bot-token": bot.token },
+                transformRequest: (data, headers) => {
+                    // Remove user headers for this request
+                    delete headers?.["x-user-id"];
+                    delete headers?.["x-session-token"];
+                    return data;
                 },
-            )
+            })
             .then((profile) => setProfile(profile ?? {}));
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [user, setProfile]);
@@ -122,14 +120,14 @@ function BotCard({ bot, onDelete, onUpdate }: Props) {
         const changes: Changes = {};
         if (data.username !== user!.username) changes.name = data.username;
         if (data.public !== bot.public) changes.public = data.public;
-        if (data.interactions_url === "") changes.remove = "InteractionsURL";
+        if (data.interactions_url === "") changes.remove = ["InteractionsURL"];
         else if (data.interactions_url !== bot.interactions_url)
             changes.interactions_url = data.interactions_url;
         setSaving(true);
         setError("");
         try {
             await client.bots.edit(bot._id, changes);
-            if (changed) await editBotContent(profile?.content);
+            if (changed) await editBotContent(profile?.content ?? undefined);
             onUpdate(changes);
             setChanged(false);
             setEditMode(false);
@@ -152,19 +150,22 @@ function BotCard({ bot, onDelete, onUpdate }: Props) {
     async function editBotAvatar(avatar?: string) {
         setSaving(true);
         setError("");
-        await client.request("PATCH", "/users/id", {
-            headers: { "x-bot-token": bot.token },
-            transformRequest: (data, headers) => {
-                // Remove user headers for this request
-                delete headers["x-user-id"];
-                delete headers["x-session-token"];
-                return data;
+        await client.api.patch(
+            "/users/@me",
+            avatar ? { avatar } : { remove: ["Avatar"] },
+            {
+                headers: { "x-bot-token": bot.token },
+                transformRequest: (data, headers) => {
+                    // Remove user headers for this request
+                    delete headers?.["x-user-id"];
+                    delete headers?.["x-session-token"];
+                    return data;
+                },
             },
-            data: JSON.stringify(avatar ? { avatar } : { remove: "Avatar" }),
-        });
+        );
 
         const res = await client.bots.fetch(bot._id);
-        if (!avatar) res.user.update({}, "Avatar");
+        if (!avatar) res.user.update({}, ["Avatar"]);
         setUser(res.user);
         setSaving(false);
     }
@@ -172,20 +173,21 @@ function BotCard({ bot, onDelete, onUpdate }: Props) {
     async function editBotBackground(background?: string) {
         setSaving(true);
         setError("");
-        await client.request("PATCH", "/users/id", {
-            headers: { "x-bot-token": bot.token },
-            transformRequest: (data, headers) => {
-                // Remove user headers for this request
-                delete headers["x-user-id"];
-                delete headers["x-session-token"];
-                return data;
+        await client.api.patch(
+            "/users/@me",
+            background
+                ? { profile: { background } }
+                : { remove: ["ProfileBackground"] },
+            {
+                headers: { "x-bot-token": bot.token },
+                transformRequest: (data, headers) => {
+                    // Remove user headers for this request
+                    delete headers?.["x-user-id"];
+                    delete headers?.["x-session-token"];
+                    return data;
+                },
             },
-            data: JSON.stringify(
-                background
-                    ? { profile: { background } }
-                    : { remove: "ProfileBackground" },
-            ),
-        });
+        );
 
         if (!background) setProfile({ ...profile, background: undefined });
         else refreshProfile();
@@ -195,20 +197,19 @@ function BotCard({ bot, onDelete, onUpdate }: Props) {
     async function editBotContent(content?: string) {
         setSaving(true);
         setError("");
-        await client.request("PATCH", "/users/id", {
-            headers: { "x-bot-token": bot.token },
-            transformRequest: (data, headers) => {
-                // Remove user headers for this request
-                delete headers["x-user-id"];
-                delete headers["x-session-token"];
-                return data;
+        await client.api.patch(
+            "/users/@me",
+            content ? { profile: { content } } : { remove: ["ProfileContent"] },
+            {
+                headers: { "x-bot-token": bot.token },
+                transformRequest: (data, headers) => {
+                    // Remove user headers for this request
+                    delete headers?.["x-user-id"];
+                    delete headers?.["x-session-token"];
+                    return data;
+                },
             },
-            data: JSON.stringify(
-                content
-                    ? { profile: { content } }
-                    : { remove: "ProfileContent" },
-            ),
-        });
+        );
 
         if (!content) setProfile({ ...profile, content: undefined });
         else refreshProfile();
@@ -333,7 +334,7 @@ function BotCard({ bot, onDelete, onUpdate }: Props) {
                                 _id: bot._id,
                                 username: user!.username,
                                 public: bot.public,
-                                interactions_url: bot.interactions_url,
+                                interactions_url: bot.interactions_url as any,
                             });
                             usernameRef!.value = user!.username;
                             interactionsRef!.value = bot.interactions_url || "";
@@ -521,7 +522,7 @@ function BotCard({ bot, onDelete, onUpdate }: Props) {
 
 export const MyBots = observer(() => {
     const client = useClient();
-    const [bots, setBots] = useState<Bot[] | undefined>(undefined);
+    const [bots, setBots] = useState<API.Bot[] | undefined>(undefined);
 
     useEffect(() => {
         client.bots.fetchOwned().then(({ bots }) => setBots(bots));
@@ -582,7 +583,7 @@ export const MyBots = observer(() => {
                                                     changes.interactions_url;
                                             if (
                                                 changes.remove ===
-                                                "InteractionsURL"
+                                                ["InteractionsURL"]
                                             )
                                                 x.interactions_url = undefined;
                                         }

src/pages/settings/panes/Notifications.tsx

@@ -81,7 +81,7 @@ export const Notifications = observer(() => {
                                 // tell the server we just subscribed
                                 const json = sub.toJSON();
                                 if (json.keys) {
-                                    client.req("POST", "/push/subscribe", {
+                                    client.api.post("/push/subscribe", {
                                         endpoint: sub.endpoint,
                                         ...(json.keys as {
                                             p256dh: string;
@@ -96,7 +96,7 @@ export const Notifications = observer(() => {
                                 sub?.unsubscribe();
                                 setPushEnabled(false);
 
-                                client.req("POST", "/push/unsubscribe");
+                                client.api.post("/push/unsubscribe");
                             }
                         }
                     } catch (err) {

src/pages/settings/panes/Profile.tsx

@@ -1,7 +1,7 @@
 import { Markdown } from "@styled-icons/boxicons-logos";
 import { observer } from "mobx-react-lite";
 import { useHistory } from "react-router-dom";
-import { Profile as ProfileI } from "revolt-api/types/Users";
+import { API } from "revolt.js";
 
 import styles from "./Panes.module.scss";
 import { Text } from "preact-i18n";
@@ -30,7 +30,9 @@ export const Profile = observer(() => {
     const client = useClient();
     const history = useHistory();
 
-    const [profile, setProfile] = useState<undefined | ProfileI>(undefined);
+    const [profile, setProfile] = useState<undefined | API.UserProfile>(
+        undefined,
+    );
 
     // ! FIXME: temporary solution
     // ! we should just announce profile changes through WS
@@ -103,7 +105,7 @@ export const Profile = observer(() => {
                         behaviour="upload"
                         maxFileSize={4_000_000}
                         onUpload={(avatar) => client.users.edit({ avatar })}
-                        remove={() => client.users.edit({ remove: "Avatar" })}
+                        remove={() => client.users.edit({ remove: ["Avatar"] })}
                         defaultPreview={client.user!.generateAvatarURL(
                             { max_side: 256 },
                             true,
@@ -132,7 +134,7 @@ export const Profile = observer(() => {
                         }}
                         remove={async () => {
                             await client.users.edit({
-                                remove: "ProfileBackground",
+                                remove: ["ProfileBackground"],
                             });
                             setProfile({ ...profile, background: undefined });
                         }}

src/pages/settings/panes/Sessions.tsx

@@ -11,7 +11,7 @@ import {
 } from "@styled-icons/simple-icons";
 import relativeTime from "dayjs/plugin/relativeTime";
 import { useHistory } from "react-router-dom";
-import { SessionInfo } from "revolt-api/types/Auth";
+import { API } from "revolt.js";
 import { decodeTime } from "ulid";
 
 import styles from "./Panes.module.scss";
@@ -33,7 +33,7 @@ export function Sessions() {
     const deviceId =
         typeof client.session === "object" ? client.session._id : undefined;
 
-    const [sessions, setSessions] = useState<SessionInfo[] | undefined>(
+    const [sessions, setSessions] = useState<API.SessionInfo[] | undefined>(
         undefined,
     );
     const [attemptingDelete, setDelete] = useState<string[]>([]);
@@ -44,7 +44,7 @@ export function Sessions() {
     }
 
     useEffect(() => {
-        client.req("GET", "/auth/session/all").then((data) => {
+        client.api.get("/auth/session/all").then((data) => {
             data.sort(
                 (a, b) =>
                     (b._id === deviceId ? 1 : 0) - (a._id === deviceId ? 1 : 0),
@@ -61,7 +61,7 @@ export function Sessions() {
         );
     }
 
-    function getIcon(session: SessionInfo) {
+    function getIcon(session: API.SessionInfo) {
         const name = session.name;
         switch (true) {
             case /firefox/i.test(name):
@@ -83,7 +83,7 @@ export function Sessions() {
         }
     }
 
-    function getSystemIcon(session: SessionInfo) {
+    function getSystemIcon(session: API.SessionInfo) {
         const name = session.name;
         switch (true) {
             case /linux/i.test(name):
@@ -187,9 +187,10 @@ export function Sessions() {
                                             ...attemptingDelete,
                                             session._id,
                                         ]);
-                                        await client.req(
-                                            "DELETE",
-                                            `/auth/session/${session._id}` as "/auth/session/id",
+                                        await client.api.delete(
+                                            `/auth/session/${
+                                                session._id as ""
+                                            }`,
                                         );
                                         setSessions(
                                             sessions?.filter(
@@ -222,10 +223,7 @@ export function Sessions() {
                     setDelete(del);
 
                     for (const id of del) {
-                        await client.req(
-                            "DELETE",
-                            `/auth/session/${id}` as "/auth/session/id",
-                        );
+                        await client.api.delete(`/auth/session/${id as ""}`);
                     }
 
                     setSessions(sessions.filter((x) => x._id === deviceId));