chore: clean up

src/components/common/IconBase.tsx

@@ -1,5 +1,5 @@
 import { API } from "revolt.js";
-import { Nullable } from "revolt.js/esm/util/null";
+import { Nullable } from "revolt.js";
 import styled, { css } from "styled-components/macro";
 
 export interface IconBaseProps<T> {

src/components/navigation/items/ConnectionStatus.tsx

@@ -23,7 +23,9 @@ export default function ConnectionStatus() {
         return (
             <Banner>
                 <Text id="app.special.status.disconnected" /> <br />
-                <a onClick={() => client.websocket.connect()}>Reconnect</a>
+                <a onClick={() => client.websocket.connect()}>
+                    <Text id="app.special.status.reconnect" />
+                </a>
             </Banner>
         );
     } else if (status === ClientStatus.CONNECTING) {

src/context/Theme.tsx

@@ -1,3 +1,4 @@
+// @ts-expect-error No typings.
 import rgba from "color-rgba";
 import { observer } from "mobx-react-lite";
 import { Helmet } from "react-helmet";

src/context/revoltjs/SyncManager.tsx

@@ -1,7 +1,7 @@
 /**
  * This file monitors changes to settings and syncs them to the server.
  */
-import { ClientboundNotification } from "revolt.js/esm/websocket/notifications";
+import { ClientboundNotification } from "revolt.js";
 
 import { useEffect } from "preact/hooks";
 

src/lib/ContextMenus.tsx

@@ -13,7 +13,7 @@ import {
 import { Cog, UserVoice } from "@styled-icons/boxicons-solid";
 import { useHistory } from "react-router-dom";
 import { Channel, Message, Server, User, API } from "revolt.js";
-import { Permission, UserPermission } from "revolt.js/esm/api/permissions";
+import { Permission, UserPermission } from "revolt.js";
 
 import {
     ContextMenuWithData,

src/lib/contextmenu/CMNotifications.tsx

@@ -9,8 +9,8 @@ import {
     LeftArrowAlt,
 } from "@styled-icons/boxicons-regular";
 import { observer } from "mobx-react-lite";
-import { Channel } from "revolt.js/esm/maps/Channels";
-import { Server } from "revolt.js/esm/maps/Servers";
+import { Channel } from "revolt.js";
+import { Server } from "revolt.js";
 
 import { ContextMenuWithData, MenuItem } from "preact-context-menu";
 import { Text } from "preact-i18n";

src/lib/renderer/Singleton.ts

@@ -1,8 +1,8 @@
 /* eslint-disable react-hooks/rules-of-hooks */
 import { action, makeAutoObservable } from "mobx";
-import { Channel } from "revolt.js/esm/maps/Channels";
-import { Message } from "revolt.js/esm/maps/Messages";
-import { Nullable } from "revolt.js/esm/util/null";
+import { Channel } from "revolt.js";
+import { Message } from "revolt.js";
+import { Nullable } from "revolt.js";
 
 import { SimpleRenderer } from "./simple/SimpleRenderer";
 import { RendererRoutines, ScrollState } from "./types";

src/lib/renderer/types.ts

@@ -1,4 +1,4 @@
-import { Message } from "revolt.js/esm/maps/Messages";
+import { Message } from "revolt.js";
 
 import { ChannelRenderer } from "./Singleton";
 

src/lib/vortex/VoiceState.ts

@@ -1,6 +1,6 @@
 import { action, makeAutoObservable, runInAction } from "mobx";
-import { Channel } from "revolt.js/esm/maps/Channels";
-import { Nullable, toNullable } from "revolt.js/esm/util/null";
+import { Channel } from "revolt.js";
+import { Nullable, toNullable } from "revolt.js";
 
 import type { ProduceType, VoiceUser } from "./Types";
 import type VoiceClient from "./VoiceClient";

src/mobx/stores/Auth.ts

@@ -1,6 +1,6 @@
 import { action, computed, makeAutoObservable, ObservableMap } from "mobx";
 import { API } from "revolt.js";
-import { Nullable } from "revolt.js/esm/util/null";
+import { Nullable } from "revolt.js";
 
 import { mapToRecord } from "../../lib/conversion";
 

src/mobx/stores/NotificationOptions.ts

@@ -1,7 +1,7 @@
 import { action, computed, makeAutoObservable, ObservableMap } from "mobx";
-import { Channel } from "revolt.js/esm/maps/Channels";
-import { Message } from "revolt.js/esm/maps/Messages";
-import { Server } from "revolt.js/esm/maps/Servers";
+import { Channel } from "revolt.js";
+import { Message } from "revolt.js";
+import { Server } from "revolt.js";
 
 import { mapToRecord } from "../../lib/conversion";
 

src/mobx/stores/ServerConfig.ts

@@ -1,7 +1,7 @@
 import { action, computed, makeAutoObservable } from "mobx";
 import { API } from "revolt.js";
 import { Client } from "revolt.js";
-import { Nullable } from "revolt.js/esm/util/null";
+import { Nullable } from "revolt.js";
 
 import { isDebug } from "../../revision";
 import Persistent from "../interfaces/Persistent";

src/mobx/stores/helpers/STheme.ts

@@ -1,3 +1,4 @@
+// @ts-expect-error No typings.
 import rgba from "color-rgba";
 import { makeAutoObservable, computed, action } from "mobx";
 

src/pages/channels/Channel.tsx

@@ -3,7 +3,7 @@ import { Ghost } from "@styled-icons/boxicons-solid";
 import { reaction } from "mobx";
 import { observer } from "mobx-react-lite";
 import { Redirect, useParams } from "react-router-dom";
-import { Channel as ChannelI } from "revolt.js/esm/maps/Channels";
+import { Channel as ChannelI } from "revolt.js";
 import styled from "styled-components/macro";
 
 import { Text } from "preact-i18n";

src/pages/channels/ChannelHeader.tsx

@@ -6,8 +6,8 @@ import {
 } from "@styled-icons/boxicons-regular";
 import { Notepad, Group } from "@styled-icons/boxicons-solid";
 import { observer } from "mobx-react-lite";
-import { Channel } from "revolt.js/esm/maps/Channels";
-import { User } from "revolt.js/esm/maps/Users";
+import { Channel } from "revolt.js";
+import { User } from "revolt.js";
 import styled, { css } from "styled-components/macro";
 
 import { isTouchscreenDevice } from "../../lib/isTouchscreenDevice";

src/pages/channels/messaging/ConversationStart.tsx

@@ -1,5 +1,5 @@
 import { observer } from "mobx-react-lite";
-import { Channel } from "revolt.js/esm/maps/Channels";
+import { Channel } from "revolt.js";
 import styled from "styled-components/macro";
 
 import { Text } from "preact-i18n";

src/pages/channels/messaging/MessageArea.tsx

@@ -2,7 +2,7 @@ import { runInAction } from "mobx";
 import { observer } from "mobx-react-lite";
 import { useHistory, useParams } from "react-router-dom";
 import { animateScroll } from "react-scroll";
-import { Channel } from "revolt.js/esm/maps/Channels";
+import { Channel } from "revolt.js";
 import styled from "styled-components/macro";
 import useResizeObserver from "use-resize-observer";
 

src/pages/channels/messaging/MessageEditor.tsx

@@ -1,4 +1,4 @@
-import { Message } from "revolt.js/esm/maps/Messages";
+import { Message } from "revolt.js";
 import styled from "styled-components/macro";
 
 import { useContext, useEffect, useState } from "preact/hooks";

src/pages/channels/messaging/MessageRenderer.tsx

@@ -3,8 +3,8 @@ import { X } from "@styled-icons/boxicons-regular";
 import isEqual from "lodash.isequal";
 import { observer } from "mobx-react-lite";
 import { API } from "revolt.js";
-import { Message as MessageI } from "revolt.js/esm/maps/Messages";
-import { Nullable } from "revolt.js/esm/util/null";
+import { Message as MessageI } from "revolt.js";
+import { Nullable } from "revolt.js";
 import styled from "styled-components/macro";
 import { decodeTime } from "ulid";
 

src/pages/friends/Friend.tsx

@@ -2,7 +2,7 @@ import { X, Plus } from "@styled-icons/boxicons-regular";
 import { PhoneCall, Envelope, UserX } from "@styled-icons/boxicons-solid";
 import { observer } from "mobx-react-lite";
 import { useHistory } from "react-router-dom";
-import { User } from "revolt.js/esm/maps/Users";
+import { User } from "revolt.js";
 
 import styles from "./Friend.module.scss";
 import classNames from "classnames";

src/pages/friends/Friends.tsx

@@ -1,7 +1,7 @@
 import { ChevronRight } from "@styled-icons/boxicons-regular";
 import { UserDetail, MessageAdd, UserPlus } from "@styled-icons/boxicons-solid";
 import { observer } from "mobx-react-lite";
-import { User } from "revolt.js/esm/maps/Users";
+import { User } from "revolt.js";
 
 import styles from "./Friend.module.scss";
 import classNames from "classnames";

src/pages/settings/channel/Overview.tsx

@@ -1,5 +1,5 @@
 import { observer } from "mobx-react-lite";
-import { Channel } from "revolt.js/esm/maps/Channels";
+import { Channel } from "revolt.js";
 import styled from "styled-components/macro";
 
 import { Text } from "preact-i18n";

src/pages/settings/channel/Permissions.tsx

@@ -1,10 +1,13 @@
 import isEqual from "lodash.isequal";
 import { observer } from "mobx-react-lite";
 import { Channel, API } from "revolt.js";
-import { DEFAULT_PERMISSION_DIRECT_MESSAGE } from "revolt.js/esm/api/permissions";
+import { DEFAULT_PERMISSION_DIRECT_MESSAGE } from "revolt.js";
 
+import { Text } from "preact-i18n";
 import { useState } from "preact/hooks";
 
+import { TextReact } from "../../../lib/i18n";
+
 import { PermissionsLayout, Button, SpaceBetween, H1 } from "@revoltchat/ui";
 
 import { PermissionList } from "../../../components/settings/roles/PermissionList";
@@ -75,7 +78,12 @@ export default observer(({ channel }: Props) => {
                 return (
                     <div>
                         <SpaceBetween>
-                            <H1>Permissions for {currentRole.name}</H1>
+                            <H1>
+                                <TextReact
+                                    id="app.settings.permissions.title"
+                                    fields={{ role: currentRole.name }}
+                                />
+                            </H1>
                             <Button
                                 palette="secondary"
                                 disabled={isEqual(
@@ -83,7 +91,7 @@ export default observer(({ channel }: Props) => {
                                     currentValue,
                                 )}
                                 onClick={save}>
-                                Save
+                                <Text id="app.special.modals.actions.save" />
                             </Button>
                         </SpaceBetween>
                         <PermissionList

src/pages/settings/panes/MyBots.tsx

@@ -4,7 +4,7 @@ import { LockAlt, HelpCircle } from "@styled-icons/boxicons-solid";
 import type { AxiosError } from "axios";
 import { observer } from "mobx-react-lite";
 import { API } from "revolt.js";
-import { User } from "revolt.js/esm/maps/Users";
+import { User } from "revolt.js";
 import styled from "styled-components/macro";
 
 import styles from "./Panes.module.scss";

src/pages/settings/server/Bans.tsx

@@ -2,7 +2,7 @@ import { XCircle } from "@styled-icons/boxicons-regular";
 import { observer } from "mobx-react-lite";
 import { Virtuoso } from "react-virtuoso";
 import { API } from "revolt.js";
-import { Server } from "revolt.js/esm/maps/Servers";
+import { Server } from "revolt.js";
 
 import styles from "./Panes.module.scss";
 import { Text } from "preact-i18n";

src/pages/settings/server/Members.tsx

@@ -2,8 +2,8 @@ import { ChevronDown } from "@styled-icons/boxicons-regular";
 import { isEqual } from "lodash";
 import { observer } from "mobx-react-lite";
 import { Virtuoso } from "react-virtuoso";
-import { Member } from "revolt.js/esm/maps/Members";
-import { Server } from "revolt.js/esm/maps/Servers";
+import { Member } from "revolt.js";
+import { Server } from "revolt.js";
 
 import styles from "./Panes.module.scss";
 import { Text } from "preact-i18n";

src/pages/settings/server/Overview.tsx

@@ -1,7 +1,7 @@
 import { Markdown } from "@styled-icons/boxicons-logos";
 import isEqual from "lodash.isequal";
 import { observer } from "mobx-react-lite";
-import { Server } from "revolt.js/esm/maps/Servers";
+import { Server } from "revolt.js";
 
 import styles from "./Panes.module.scss";
 import { Text } from "preact-i18n";

src/pages/settings/server/Roles.tsx

@@ -1,6 +1,6 @@
 import isEqual from "lodash.isequal";
 import { observer } from "mobx-react-lite";
-import { Server } from "revolt.js/esm/maps/Servers";
+import { Server } from "revolt.js";
 
 import { useMemo, useState } from "preact/hooks";