Zero error milestone.

src/components/common/AutoComplete.tsx

@@ -187,8 +187,9 @@ export function useAutoComplete(
             if (type === "channel" && searchClues?.channels) {
                 const channels = client.servers
                     .get(searchClues.channels.server)
-                    ?.channels.map((x) => client.channels.get(x))
-                    .filter((x) => typeof x !== "undefined") as Channel[];
+                    ?.channels.filter(
+                        (x) => typeof x !== "undefined",
+                    ) as Channel[];
 
                 const matches = (
                     search.length > 0

src/components/common/ChannelIcon.tsx

@@ -1,11 +1,9 @@
 import { Hash, VolumeFull } from "@styled-icons/boxicons-regular";
 import { observer } from "mobx-react-lite";
-import { Channels } from "revolt.js/dist/api/objects";
+import { Channel } from "revolt.js/dist/maps/Channels";
 
 import { useContext } from "preact/hooks";
 
-import { Channel } from "../../mobx";
-
 import { AppContext } from "../../context/revoltjs/RevoltClient";
 
 import { ImageIconBase, IconBaseProps } from "./IconBase";

src/components/common/IconBase.tsx

@@ -1,4 +1,4 @@
-import { Attachment } from "revolt.js/dist/api/objects";
+import { Attachment } from "revolt-api/types/Autumn";
 import styled, { css } from "styled-components";
 
 export interface IconBaseProps<T> {

src/components/common/ServerHeader.tsx

@@ -2,13 +2,9 @@ import { Cog } from "@styled-icons/boxicons-solid";
 import { observer } from "mobx-react-lite";
 import { Link } from "react-router-dom";
 import { ServerPermission } from "revolt.js/dist/api/permissions";
+import { Server } from "revolt.js/dist/maps/Servers";
 import styled from "styled-components";
 
-import { Server } from "../../mobx";
-
-import { useClient } from "../../context/revoltjs/RevoltClient";
-import { useServerPermission } from "../../context/revoltjs/hooks";
-
 import Header from "../ui/Header";
 import IconButton from "../ui/IconButton";
 
@@ -21,14 +17,7 @@ const ServerName = styled.div`
 `;
 
 export default observer(({ server }: Props) => {
-    const permissions = useServerPermission(server._id);
-    const client = useClient();
-
-    const bannerURL = client.servers.getBannerURL(
-        server._id,
-        { width: 480 },
-        true,
-    );
+    const bannerURL = server.generateBannerURL({ width: 480 });
 
     return (
         <Header
@@ -39,7 +28,7 @@ export default observer(({ server }: Props) => {
                 background: bannerURL ? `url('${bannerURL}')` : undefined,
             }}>
             <ServerName>{server.name}</ServerName>
-            {(permissions & ServerPermission.ManageServer) > 0 && (
+            {(server.permission & ServerPermission.ManageServer) > 0 && (
                 <div className="actions">
                     <Link to={`/server/${server._id}/settings`}>
                         <IconButton>

src/components/common/ServerIcon.tsx

@@ -1,10 +1,9 @@
 import { observer } from "mobx-react-lite";
+import { Server } from "revolt.js/dist/maps/Servers";
 import styled from "styled-components";
 
 import { useContext } from "preact/hooks";
 
-import { Server } from "../../mobx";
-
 import { AppContext } from "../../context/revoltjs/RevoltClient";
 
 import { IconBaseProps, ImageIconBase } from "./IconBase";

src/components/common/messaging/MessageBase.tsx

@@ -1,3 +1,5 @@
+import { observer } from "mobx-react-lite";
+import { Message } from "revolt.js/dist/maps/Messages";
 import styled, { css, keyframes } from "styled-components";
 import { decodeTime } from "ulid";
 
@@ -6,7 +8,6 @@ import { Text } from "preact-i18n";
 import { useDictionary } from "../../../lib/i18n";
 
 import { dayjs } from "../../../context/Locale";
-import { MessageObject } from "../../../context/revoltjs/util";
 
 import Tooltip from "../Tooltip";
 
@@ -192,57 +193,54 @@ export const DetailBase = styled.div`
     }
 `;
 
-export function MessageDetail({
-    message,
-    position,
-}: {
-    message: MessageObject;
-    position: "left" | "top";
-}) {
-    const dict = useDictionary();
+export const MessageDetail = observer(
+    ({ message, position }: { message: Message; position: "left" | "top" }) => {
+        const dict = useDictionary();
 
-    if (position === "left") {
-        if (message.edited) {
+        if (position === "left") {
+            if (message.edited) {
+                return (
+                    <>
+                        <time className="copyTime">
+                            <i className="copyBracket">[</i>
+                            {dayjs(decodeTime(message._id)).format(
+                                dict.dayjs.timeFormat,
+                            )}
+                            <i className="copyBracket">]</i>
+                        </time>
+                        <span className="edited">
+                            <Tooltip
+                                content={dayjs(message.edited).format("LLLL")}>
+                                <Text id="app.main.channel.edited" />
+                            </Tooltip>
+                        </span>
+                    </>
+                );
+            }
             return (
                 <>
-                    <time className="copyTime">
+                    <time>
                         <i className="copyBracket">[</i>
                         {dayjs(decodeTime(message._id)).format(
                             dict.dayjs.timeFormat,
                         )}
                         <i className="copyBracket">]</i>
                     </time>
-                    <span className="edited">
-                        <Tooltip content={dayjs(message.edited).format("LLLL")}>
-                            <Text id="app.main.channel.edited" />
-                        </Tooltip>
-                    </span>
                 </>
             );
         }
-        return (
-            <>
-                <time>
-                    <i className="copyBracket">[</i>
-                    {dayjs(decodeTime(message._id)).format(
-                        dict.dayjs.timeFormat,
-                    )}
-                    <i className="copyBracket">]</i>
-                </time>
-            </>
-        );
-    }
 
-    return (
-        <DetailBase>
-            <time>{dayjs(decodeTime(message._id)).calendar()}</time>
-            {message.edited && (
-                <Tooltip content={dayjs(message.edited).format("LLLL")}>
-                    <span className="edited">
-                        <Text id="app.main.channel.edited" />
-                    </span>
-                </Tooltip>
-            )}
-        </DetailBase>
-    );
-}
+        return (
+            <DetailBase>
+                <time>{dayjs(decodeTime(message._id)).calendar()}</time>
+                {message.edited && (
+                    <Tooltip content={dayjs(message.edited).format("LLLL")}>
+                        <span className="edited">
+                            <Text id="app.main.channel.edited" />
+                        </span>
+                    </Tooltip>
+                )}
+            </DetailBase>
+        );
+    },
+);

src/components/common/messaging/MessageBox.tsx

@@ -1,7 +1,7 @@
-import { Send, HappyAlt, ShieldX } from "@styled-icons/boxicons-solid";
-import { Styleshare } from "@styled-icons/simple-icons";
+import { Send, ShieldX } from "@styled-icons/boxicons-solid";
 import Axios, { CancelTokenSource } from "axios";
 import { ChannelPermission } from "revolt.js/dist/api/permissions";
+import { Channel } from "revolt.js/dist/maps/Channels";
 import styled from "styled-components";
 import { ulid } from "ulid";
 
@@ -19,7 +19,6 @@ import {
     SMOOTH_SCROLL_ON_RECEIVE,
 } from "../../../lib/renderer/Singleton";
 
-import { Channel } from "../../../mobx";
 import { dispatch, getState } from "../../../redux";
 import { Reply } from "../../../redux/reducers/queue";
 
@@ -31,7 +30,6 @@ import {
     uploadFile,
 } from "../../../context/revoltjs/FileUploads";
 import { AppContext } from "../../../context/revoltjs/RevoltClient";
-import { useChannelPermission } from "../../../context/revoltjs/hooks";
 import { takeError } from "../../../context/revoltjs/util";
 
 import IconButton from "../../ui/IconButton";
@@ -123,8 +121,7 @@ export default function MessageBox({ channel }: Props) {
     const client = useContext(AppContext);
     const translate = useTranslation();
 
-    const permissions = useChannelPermission(channel._id);
-    if (!(permissions & ChannelPermission.SendMessage)) {
+    if (!(channel.permission & ChannelPermission.SendMessage)) {
         return (
             <Base>
                 <Blocked>
@@ -194,7 +191,8 @@ export default function MessageBox({ channel }: Props) {
         playSound("outbound");
 
         const nonce = ulid();
-        dispatch({
+        // ! FIXME: queued
+        /*dispatch({
             type: "QUEUE_ADD",
             nonce,
             channel: channel._id,
@@ -206,7 +204,7 @@ export default function MessageBox({ channel }: Props) {
                 content,
                 replies,
             },
-        });
+        });*/
 
         defer(() =>
             SingletonMessageRenderer.jumpToBottom(
@@ -216,7 +214,7 @@ export default function MessageBox({ channel }: Props) {
         );
 
         try {
-            await client.channels.sendMessage(channel._id, {
+            await channel.sendMessage({
                 content,
                 nonce,
                 replies,
@@ -290,7 +288,7 @@ export default function MessageBox({ channel }: Props) {
 
         const nonce = ulid();
         try {
-            await client.channels.sendMessage(channel._id, {
+            await channel.sendMessage({
                 content,
                 nonce,
                 replies,
@@ -360,7 +358,7 @@ export default function MessageBox({ channel }: Props) {
         users: { type: "channel", id: channel._id },
         channels:
             channel.channel_type === "TextChannel"
-                ? { server: channel.server! }
+                ? { server: channel.server_id! }
                 : undefined,
     });
 
@@ -403,7 +401,7 @@ export default function MessageBox({ channel }: Props) {
                 setReplies={setReplies}
             />
             <Base>
-                {permissions & ChannelPermission.UploadFiles ? (
+                {channel.permission & ChannelPermission.UploadFiles ? (
                     <Action>
                         <FileUploader
                             size={24}
@@ -475,9 +473,7 @@ export default function MessageBox({ channel }: Props) {
                     placeholder={
                         channel.channel_type === "DirectMessage"
                             ? translate("app.main.channel.message_who", {
-                                  person: client.users.get(
-                                      client.channels.getRecipient(channel._id),
-                                  )?.username,
+                                  person: channel.recipient?.username,
                               })
                             : channel.channel_type === "SavedMessages"
                             ? translate("app.main.channel.message_saved")

src/components/common/messaging/SystemMessage.tsx

@@ -1,14 +1,13 @@
 import { observer } from "mobx-react-lite";
+import { Message } from "revolt.js/dist/maps/Messages";
+import { User } from "revolt.js/dist/maps/Users";
 import styled from "styled-components";
 
 import { attachContextMenu } from "preact-context-menu";
 
 import { TextReact } from "../../../lib/i18n";
 
-import { User } from "../../../mobx";
-import { useData } from "../../../mobx/State";
-
-import { MessageObject } from "../../../context/revoltjs/util";
+import { useClient } from "../../../context/revoltjs/RevoltClient";
 
 import UserShort from "../user/UserShort";
 import MessageBase, { MessageDetail, MessageInfo } from "./MessageBase";
@@ -36,14 +35,14 @@ type SystemMessageParsed =
 
 interface Props {
     attachContext?: boolean;
-    message: MessageObject;
+    message: Message;
     highlight?: boolean;
     hideInfo?: boolean;
 }
 
 export const SystemMessage = observer(
     ({ attachContext, message, highlight, hideInfo }: Props) => {
-        const store = useData();
+        const client = useClient();
 
         let data: SystemMessageParsed;
         const content = message.content;
@@ -56,8 +55,8 @@ export const SystemMessage = observer(
                 case "user_remove":
                     data = {
                         type: content.type,
-                        user: store.users.get(content.id)!,
-                        by: store.users.get(content.by)!,
+                        user: client.users.get(content.id)!,
+                        by: client.users.get(content.by)!,
                     };
                     break;
                 case "user_joined":
@@ -66,21 +65,21 @@ export const SystemMessage = observer(
                 case "user_banned":
                     data = {
                         type: content.type,
-                        user: store.users.get(content.id)!,
+                        user: client.users.get(content.id)!,
                     };
                     break;
                 case "channel_renamed":
                     data = {
                         type: "channel_renamed",
                         name: content.name,
-                        by: store.users.get(content.by)!,
+                        by: client.users.get(content.by)!,
                     };
                     break;
                 case "channel_description_changed":
                 case "channel_icon_changed":
                     data = {
                         type: content.type,
-                        by: store.users.get(content.by)!,
+                        by: client.users.get(content.by)!,
                     };
                     break;
                 default:

src/components/common/messaging/attachments/Attachment.tsx

@@ -1,4 +1,4 @@
-import { Attachment as AttachmentRJS } from "revolt.js/dist/api/objects";
+import { Attachment as AttachmentI } from "revolt-api/types/Autumn";
 
 import styles from "./Attachment.module.scss";
 import classNames from "classnames";
@@ -13,7 +13,7 @@ import Spoiler from "./Spoiler";
 import TextFile from "./TextFile";
 
 interface Props {
-    attachment: AttachmentRJS;
+    attachment: AttachmentI;
     hasContent: boolean;
 }
 

src/components/common/messaging/attachments/AttachmentActions.tsx

@@ -5,7 +5,7 @@ import {
     Headphone,
     Video,
 } from "@styled-icons/boxicons-regular";
-import { Attachment } from "revolt.js/dist/api/objects";
+import { Attachment } from "revolt-api/types/Autumn";
 
 import styles from "./AttachmentActions.module.scss";
 import classNames from "classnames";

src/components/common/messaging/attachments/TextFile.tsx

@@ -1,5 +1,5 @@
 import axios from "axios";
-import { Attachment } from "revolt.js/dist/api/objects";
+import { Attachment } from "revolt-api/types/Autumn";
 
 import styles from "./Attachment.module.scss";
 import { useContext, useEffect, useState } from "preact/hooks";

src/components/common/messaging/bars/ReplyBar.tsx

@@ -14,7 +14,6 @@ import { StateUpdater, useEffect } from "preact/hooks";
 import { internalSubscribe } from "../../../../lib/eventEmitter";
 import { useRenderState } from "../../../../lib/renderer/Singleton";
 
-import { useData } from "../../../../mobx/State";
 import { Reply } from "../../../../redux/reducers/queue";
 
 import IconButton from "../../../ui/IconButton";
@@ -74,9 +73,6 @@ export default observer(({ channel, replies, setReplies }: Props) => {
     const ids = replies.map((x) => x.id);
     const messages = view.messages.filter((x) => ids.includes(x._id));
 
-    const store = useData();
-    const users = messages.map((x) => store.users.get(x.author));
-
     return (
         <div>
             {replies.map((reply, index) => {
@@ -92,17 +88,16 @@ export default observer(({ channel, replies, setReplies }: Props) => {
                         </span>
                     );
 
-                const user = users[index];
                 return (
                     <Base key={reply.id}>
                         <ReplyBase preview>
                             <ReplyIcon size={22} />
-                            <UserShort user={user} size={16} />
+                            <UserShort user={message.author} size={16} />
                             {message.attachments &&
                                 message.attachments.length > 0 && (
                                     <File size={16} />
                                 )}
-                            {message.author === SYSTEM_USER_ID ? (
+                            {message.author_id === SYSTEM_USER_ID ? (
                                 <SystemMessage message={message} />
                             ) : (
                                 <Markdown

src/components/common/messaging/bars/TypingIndicator.tsx

@@ -1,22 +1,12 @@
 import { observer } from "mobx-react-lite";
-import { User } from "revolt.js";
 import styled from "styled-components";
 
 import { Text } from "preact-i18n";
-import { useContext } from "preact/hooks";
 
-import { TextReact } from "../../../../lib/i18n";
-
-import { useData } from "../../../../mobx/State";
 import { connectState } from "../../../../redux/connector";
 import { TypingUser } from "../../../../redux/reducers/typing";
 
-import {
-    AppContext,
-    useClient,
-} from "../../../../context/revoltjs/RevoltClient";
-
-import { Username } from "../../user/UserShort";
+import { useClient } from "../../../../context/revoltjs/RevoltClient";
 
 interface Props {
     typing?: TypingUser[];
@@ -68,9 +58,8 @@ const Base = styled.div`
 export const TypingIndicator = observer(({ typing }: Props) => {
     if (typing && typing.length > 0) {
         const client = useClient();
-        const store = useData();
         const users = typing
-            .map((x) => store.users.get(x.id)!)
+            .map((x) => client.users.get(x.id)!)
             .filter((x) => typeof x !== "undefined");
 
         users.sort((a, b) =>
@@ -113,11 +102,7 @@ export const TypingIndicator = observer(({ typing }: Props) => {
                         {users.map((user) => (
                             <img
                                 loading="eager"
-                                src={client.users.getAvatarURL(
-                                    user._id,
-                                    { max_side: 256 },
-                                    true,
-                                )}
+                                src={user.generateAvatarURL({ max_side: 256 })}
                             />
                         ))}
                     </div>

src/components/common/messaging/embed/Embed.tsx

@@ -1,4 +1,4 @@
-import { Embed as EmbedRJS } from "revolt.js/dist/api/objects";
+import { Embed as EmbedI } from "revolt-api/types/January";
 
 import styles from "./Embed.module.scss";
 import classNames from "classnames";
@@ -11,7 +11,7 @@ import { MessageAreaWidthContext } from "../../../../pages/channels/messaging/Me
 import EmbedMedia from "./EmbedMedia";
 
 interface Props {
-    embed: EmbedRJS;
+    embed: EmbedI;
 }
 
 const MAX_EMBED_WIDTH = 480;

src/components/common/messaging/embed/EmbedMedia.tsx

@@ -1,4 +1,4 @@
-import { Embed } from "revolt.js/dist/api/objects";
+import { Embed } from "revolt-api/types/January";
 
 import styles from "./Embed.module.scss";
 

src/components/common/messaging/embed/EmbedMediaActions.tsx

@@ -1,5 +1,5 @@
 import { LinkExternal } from "@styled-icons/boxicons-regular";
-import { EmbedImage } from "revolt.js/dist/api/objects";
+import { EmbedImage } from "revolt-api/types/January";
 
 import styles from "./Embed.module.scss";
 

src/components/common/user/UserCheckbox.tsx

@@ -1,4 +1,4 @@
-import { User } from "../../../mobx";
+import { User } from "revolt.js/dist/maps/Users";
 
 import Checkbox, { CheckboxProps } from "../../ui/Checkbox";
 

src/components/common/user/UserHeader.tsx

@@ -1,6 +1,7 @@
 import { Cog } from "@styled-icons/boxicons-solid";
 import { observer } from "mobx-react-lite";
 import { Link } from "react-router-dom";
+import { User } from "revolt.js/dist/maps/Users";
 import styled from "styled-components";
 
 import { openContextMenu } from "preact-context-menu";
@@ -9,15 +10,12 @@ import { Localizer } from "preact-i18n";
 
 import { isTouchscreenDevice } from "../../../lib/isTouchscreenDevice";
 
-import { User } from "../../../mobx";
-
 import { useIntermediate } from "../../../context/intermediate/Intermediate";
 
 import Header from "../../ui/Header";
 import IconButton from "../../ui/IconButton";
 
 import Tooltip from "../Tooltip";
-import UserIcon from "./UserIcon";
 import UserStatus from "./UserStatus";
 
 const HeaderBase = styled.div`

src/components/common/user/UserHover.tsx

@@ -1,7 +1,6 @@
+import { User } from "revolt.js/dist/maps/Users";
 import styled from "styled-components";
 
-import { User } from "../../../mobx";
-
 import { Children } from "../../../types/Preact";
 import Tooltip from "../Tooltip";
 import { Username } from "./UserShort";

src/components/common/user/UserIcon.tsx

@@ -1,6 +1,7 @@
 import { MicrophoneOff } from "@styled-icons/boxicons-regular";
 import { observer } from "mobx-react-lite";
-import { Users } from "revolt.js/dist/api/objects";
+import { Presence } from "revolt-api/types/Users";
+import { User } from "revolt.js/dist/maps/Users";
 import styled, { css } from "styled-components";
 
 import { useContext } from "preact/hooks";
@@ -8,7 +9,6 @@ import { useContext } from "preact/hooks";
 import { ThemeContext } from "../../../context/Theme";
 import { AppContext } from "../../../context/revoltjs/RevoltClient";
 
-import { User } from "../../../mobx";
 import IconBase, { IconBaseProps } from "../IconBase";
 import fallback from "../assets/user.png";
 
@@ -22,10 +22,10 @@ interface Props extends IconBaseProps<User> {
 export function useStatusColour(user?: User) {
     const theme = useContext(ThemeContext);
 
-    return user?.online && user?.status?.presence !== Users.Presence.Invisible
-        ? user?.status?.presence === Users.Presence.Idle
+    return user?.online && user?.status?.presence !== Presence.Invisible
+        ? user?.status?.presence === Presence.Idle
             ? theme["status-away"]
-            : user?.status?.presence === Users.Presence.Busy
+            : user?.status?.presence === Presence.Busy
             ? theme["status-busy"]
             : theme["status-online"]
         : theme["status-invisible"];
@@ -72,8 +72,7 @@ export default observer(
                 target?.avatar ?? attachment,
                 { max_side: 256 },
                 animate,
-            ) ??
-            (target ? client.users.getDefaultAvatarURL(target._id) : fallback);
+            ) ?? (target ? target.defaultAvatarURL : fallback);
 
         return (
             <IconBase

src/components/common/user/UserShort.tsx

@@ -1,9 +1,8 @@
 import { observer } from "mobx-react-lite";
+import { User } from "revolt.js/dist/maps/Users";
 
 import { Text } from "preact-i18n";
 
-import { User } from "../../../mobx";
-
 import UserIcon from "./UserIcon";
 
 export const Username = observer(

src/components/common/user/UserStatus.tsx

@@ -1,9 +1,9 @@
 import { observer } from "mobx-react-lite";
-import { Users } from "revolt.js/dist/api/objects";
+import { Presence } from "revolt-api/types/Users";
+import { User } from "revolt.js/dist/maps/Users";
 
 import { Text } from "preact-i18n";
 
-import { User } from "../../../mobx";
 import Tooltip from "../Tooltip";
 
 interface Props {
@@ -25,15 +25,15 @@ export default observer(({ user, tooltip }: Props) => {
             return <>{user.status.text}</>;
         }
 
-        if (user.status?.presence === Users.Presence.Busy) {
+        if (user.status?.presence === Presence.Busy) {
             return <Text id="app.status.busy" />;
         }
 
-        if (user.status?.presence === Users.Presence.Idle) {
+        if (user.status?.presence === Presence.Idle) {
             return <Text id="app.status.idle" />;
         }
 
-        if (user.status?.presence === Users.Presence.Invisible) {
+        if (user.status?.presence === Presence.Invisible) {
             return <Text id="app.status.offline" />;
         }