chore: delete intermediate

2022-07-05 21:13:42 +01:00
parent f7ff7d0dfe
commit f9c6f5cd9d
35 changed files with 129 additions and 1104 deletions
--- a/src/components/common/messaging/Message.tsx
+++ b/src/components/common/messaging/Message.tsx
@@ -13,7 +13,6 @@ import { isTouchscreenDevice } from "../../../lib/isTouchscreenDevice";
 import { QueuedMessage } from "../../../mobx/stores/MessageQueue";

 import { I18nError } from "../../../context/Locale";
-import { useIntermediate } from "../../../context/intermediate/Intermediate";

 import { modalController } from "../../../controllers/modals/ModalController";
 import Markdown from "../../markdown/Markdown";
@@ -55,8 +54,6 @@ const Message = observer(
        const client = message.client;
        const user = message.author;

-        const { openScreen } = useIntermediate();
-
        const content = message.content;
        const head =
            preferHead || (message.reply_ids && message.reply_ids.length > 0);
--- a/src/components/common/messaging/bars/MessageOverlayBar.tsx
+++ b/src/components/common/messaging/bars/MessageOverlayBar.tsx
@@ -19,12 +19,6 @@ import { getRenderer } from "../../../../lib/renderer/Singleton";

 import { QueuedMessage } from "../../../../mobx/stores/MessageQueue";

-import {
-    Screen,
-    useIntermediate,
-} from "../../../../context/intermediate/Intermediate";
-
-import { useClient } from "../../../../controllers/client/ClientController";
 import { modalController } from "../../../../controllers/modals/ModalController";
 import Tooltip from "../../../common/Tooltip";

@@ -89,7 +83,6 @@ const Divider = styled.div`

 export const MessageOverlayBar = observer(({ message, queued }: Props) => {
    const client = message.client;
-    const { openScreen, writeClipboard } = useIntermediate();
    const isAuthor = message.author_id === client.user!._id;

    const [copied, setCopied] = useState<"link" | "id">(null!);
@@ -189,7 +182,7 @@ export const MessageOverlayBar = observer(({ message, queued }: Props) => {
                        <Entry
                            onClick={() => {
                                setCopied("link");
-                                writeClipboard(message.url);
+                                modalController.writeText(message.url);
                            }}>
                            <LinkAlt size={18} />
                        </Entry>
@@ -200,7 +193,7 @@ export const MessageOverlayBar = observer(({ message, queued }: Props) => {
                        <Entry
                            onClick={() => {
                                setCopied("id");
-                                writeClipboard(message._id);
+                                modalController.writeText(message._id);
                            }}>
                            <InfoSquare size={18} />
                        </Entry>
--- a/src/components/common/messaging/embed/Embed.tsx
+++ b/src/components/common/messaging/embed/Embed.tsx
@@ -4,8 +4,6 @@ import styles from "./Embed.module.scss";
 import classNames from "classnames";
 import { useContext } from "preact/hooks";

-import { useIntermediate } from "../../../../context/intermediate/Intermediate";
-
 import { useClient } from "../../../../controllers/client/ClientController";
 import { modalController } from "../../../../controllers/modals/ModalController";
 import { MessageAreaWidthContext } from "../../../../pages/channels/messaging/MessageArea";
@@ -25,7 +23,6 @@ const MAX_PREVIEW_SIZE = 150;
 export default function Embed({ embed }: Props) {
    const client = useClient();

-    const { openLink } = useIntermediate();
    const maxWidth = Math.min(
        useContext(MessageAreaWidthContext) - CONTAINER_PADDING,
        MAX_EMBED_WIDTH,
@@ -144,7 +141,7 @@ export default function Embed({ embed }: Props) {
                                <a
                                    onMouseDown={(ev) =>
                                        (ev.button === 0 || ev.button === 1) &&
-                                        openLink(embed.url!)
+                                        modalController.openLink(embed.url!)
                                    }
                                    className={styles.title}>
                                    {embed.title}
@@ -195,7 +192,9 @@ export default function Embed({ embed }: Props) {
                    onClick={() =>
                        modalController.push({ type: "image_viewer", embed })
                    }
-                    onMouseDown={(ev) => ev.button === 1 && openLink(embed.url)}
+                    onMouseDown={(ev) =>
+                        ev.button === 1 && modalController.openLink(embed.url)
+                    }
                />
            );
        }
--- a/src/components/common/user/UserHeader.tsx
+++ b/src/components/common/user/UserHeader.tsx
@@ -11,8 +11,7 @@ import { Header, IconButton } from "@revoltchat/ui";

 import { isTouchscreenDevice } from "../../../lib/isTouchscreenDevice";

-import { useIntermediate } from "../../../context/intermediate/Intermediate";
-
+import { modalController } from "../../../controllers/modals/ModalController";
 import Tooltip from "../Tooltip";
 import UserStatus from "./UserStatus";

@@ -48,8 +47,6 @@ interface Props {
 }

 export default observer(({ user }: Props) => {
-    const { writeClipboard } = useIntermediate();
-
    return (
        <Header topBorder palette="secondary">
            <HeaderBase>
@@ -57,7 +54,9 @@ export default observer(({ user }: Props) => {
                    <Tooltip content={<Text id="app.special.copy_username" />}>
                        <span
                            className="username"
-                            onClick={() => writeClipboard(user.username)}>
+                            onClick={() =>
+                                modalController.writeText(user.username)
+                            }>
                            @{user.username}
                        </span>
                    </Tooltip>
--- a/src/components/markdown/Renderer.tsx
+++ b/src/components/markdown/Renderer.tsx
@@ -14,10 +14,10 @@ import { internalEmit } from "../../lib/eventEmitter";
 import { determineLink } from "../../lib/links";

 import { dayjs } from "../../context/Locale";
-import { useIntermediate } from "../../context/intermediate/Intermediate";

 import { emojiDictionary } from "../../assets/emojis";
 import { useClient } from "../../controllers/client/ClientController";
+import { modalController } from "../../controllers/modals/ModalController";
 import { generateEmoji } from "../common/Emoji";
 import { MarkdownProps } from "./Markdown";
 import Prism from "./prism";
@@ -119,7 +119,6 @@ const RE_TIME = /<t:([0-9]+):(\w)>/g;

 export default function Renderer({ content, disallowBigEmoji }: MarkdownProps) {
    const client = useClient();
-    const { openLink } = useIntermediate();

    if (typeof content === "undefined") return null;
    if (!content || content.length === 0) return null;
@@ -191,43 +190,40 @@ export default function Renderer({ content, disallowBigEmoji }: MarkdownProps) {
        }
    }, []);

-    const handleLink = useCallback(
-        (ev: MouseEvent) => {
-            if (ev.currentTarget) {
-                const element = ev.currentTarget as HTMLAnchorElement;
+    const handleLink = useCallback((ev: MouseEvent) => {
+        if (ev.currentTarget) {
+            const element = ev.currentTarget as HTMLAnchorElement;

-                if (ev.shiftKey) {
-                    switch (element.dataset.type) {
-                        case "mention": {
-                            internalEmit(
-                                "MessageBox",
-                                "append",
-                                `<@${element.dataset.mentionId}>`,
-                                "mention",
-                            );
-                            ev.preventDefault();
-                            return;
-                        }
-                        case "channel_mention": {
-                            internalEmit(
-                                "MessageBox",
-                                "append",
-                                `<#${element.dataset.mentionId}>`,
-                                "channel_mention",
-                            );
-                            ev.preventDefault();
-                            return;
-                        }
+            if (ev.shiftKey) {
+                switch (element.dataset.type) {
+                    case "mention": {
+                        internalEmit(
+                            "MessageBox",
+                            "append",
+                            `<@${element.dataset.mentionId}>`,
+                            "mention",
+                        );
+                        ev.preventDefault();
+                        return;
+                    }
+                    case "channel_mention": {
+                        internalEmit(
+                            "MessageBox",
+                            "append",
+                            `<#${element.dataset.mentionId}>`,
+                            "channel_mention",
+                        );
+                        ev.preventDefault();
+                        return;
                    }
                }
-
-                if (openLink(element.href)) {
-                    ev.preventDefault();
-                }
            }
-        },
-        [openLink],
-    );
+
+            if (modalController.openLink(element.href)) {
+                ev.preventDefault();
+            }
+        }
+    }, []);

    return (
        <span
--- a/src/components/navigation/items/ButtonItem.tsx
+++ b/src/components/navigation/items/ButtonItem.tsx
@@ -13,8 +13,6 @@ import { IconButton } from "@revoltchat/ui";
 import { isTouchscreenDevice } from "../../../lib/isTouchscreenDevice";
 import { stopPropagation } from "../../../lib/stopPropagation";

-import { useIntermediate } from "../../../context/intermediate/Intermediate";
-
 import { modalController } from "../../../controllers/modals/ModalController";
 import ChannelIcon from "../../common/ChannelIcon";
 import Tooltip from "../../common/Tooltip";
@@ -51,7 +49,6 @@ export const UserButton = observer((props: UserProps) => {
        channel,
        ...divProps
    } = props;
-    const { openScreen } = useIntermediate();

    return (
        <div
@@ -149,7 +146,6 @@ export const ChannelButton = observer((props: ChannelProps) => {
        return <UserButton {...{ active, alert, channel, user }} />;
    }

-    const { openScreen } = useIntermediate();
    const alerting = alert && !muted && !active;

    return (
--- a/src/components/navigation/left/HomeSidebar.tsx
+++ b/src/components/navigation/left/HomeSidebar.tsx
@@ -20,8 +20,6 @@ import { isTouchscreenDevice } from "../../../lib/isTouchscreenDevice";

 import { useApplicationState } from "../../../mobx/State";

-import { useIntermediate } from "../../../context/intermediate/Intermediate";
-
 import placeholderSVG from "../items/placeholder.svg";

 import { useClient } from "../../../controllers/client/ClientController";
@@ -50,7 +48,6 @@ export default observer(() => {
    const client = useClient();
    const state = useApplicationState();
    const { channel: channel_id } = useParams<{ channel: string }>();
-    const { openScreen } = useIntermediate();

    const channels = [...client.channels.values()].filter(
        (x) =>
--- a/src/components/settings/appearance/legacy/ThemeTools.tsx
+++ b/src/components/settings/appearance/legacy/ThemeTools.tsx
@@ -7,8 +7,7 @@ import { Button } from "@revoltchat/ui";

 import { useApplicationState } from "../../../../mobx/State";

-import { useIntermediate } from "../../../../context/intermediate/Intermediate";
-
+import { modalController } from "../../../../controllers/modals/ModalController";
 import Tooltip from "../../../common/Tooltip";

 const Actions = styled.div`
@@ -38,7 +37,6 @@ const Actions = styled.div`
 `;

 export default function ThemeTools() {
-    const { writeClipboard, openScreen } = useIntermediate();
    const theme = useApplicationState().settings.theme;

    return (
@@ -56,7 +54,9 @@ export default function ThemeTools() {
            </Tooltip>
            <div
                className="code"
-                onClick={() => writeClipboard(JSON.stringify(theme))}>
+                onClick={() =>
+                    modalController.writeText(JSON.stringify(theme))
+                }>
                <Tooltip content={<Text id="app.special.copy" />}>
                    {" "}
                    {JSON.stringify(theme)}
@@ -72,16 +72,8 @@ export default function ThemeTools() {
                            const text = await navigator.clipboard.readText();
                            theme.hydrate(JSON.parse(text));
                        } catch (err) {
-                            openScreen({
-                                id: "_input",
-                                question: (
-                                    <Text id="app.settings.pages.appearance.import_theme" />
-                                ),
-                                field: (
-                                    <Text id="app.settings.pages.appearance.theme_data" />
-                                ),
-                                callback: async (text) =>
-                                    theme.hydrate(JSON.parse(text)),
+                            modalController.push({
+                                type: "import_theme",
                            });
                        }
                    }}>