+ {website && (
+
+ )
+ }
>
- {!!plugins.length && (
-
- {plugins.map(p =>
- showToast("Restart to apply changes!")}
- />
- )}
-
- )}
-
- {hasLinks && (
-
- {website && (
-
- )}
+
+ {!!plugins.length && (
+
);
}
diff --git a/src/equicordplugins/baseDecoder/index.tsx b/src/equicordplugins/baseDecoder/index.tsx
index 9ecb51a9e..0c6466e84 100644
--- a/src/equicordplugins/baseDecoder/index.tsx
+++ b/src/equicordplugins/baseDecoder/index.tsx
@@ -17,16 +17,13 @@
*/
import { definePluginSettings } from "@api/Settings";
-import { BaseText } from "@components/BaseText";
import { CodeBlock } from "@components/CodeBlock";
import ErrorBoundary from "@components/ErrorBoundary";
-import { Flex } from "@components/Flex";
import { Heading } from "@components/Heading";
import { EquicordDevs } from "@utils/constants";
import { copyWithToast } from "@utils/discord";
-import { closeModal, ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalRoot, ModalSize, openModal } from "@utils/modal";
import definePlugin, { OptionType } from "@utils/types";
-import { Button, ChannelStore } from "@webpack/common";
+import { ChannelStore, Modal, openModal } from "@webpack/common";
function DecodeIcon() {
return (
@@ -64,32 +61,26 @@ function decodeBase64Strings(base64Strings) {
}
function openDecodedBase64Modal(decodedContent) {
- const key = openModal(props => (
+ openModal(props => (
+ {plugins.map(p =>
+ showToast("Restart to apply changes!")}
+ />
+ )}
+
+ )}
+
- Decoded Content
- {decodedContent.map((content, index) => (
-
-
+ Decoded Content
+ {decodedContent.map((content, index) => (
+
+
- {
- const nextColor = intToColor(value);
- setLocalColor(nextColor);
- onColorChange(nextColor);
- }}
- showEyeDropper={false}
- />
-
-
+ {
+ const nextColor = intToColor(value);
+ setLocalColor(nextColor);
+ onColorChange(nextColor);
+ }}
+ showEyeDropper={false}
/>
-
-
-
-
+
+
- {filteredIconNames.map(name => (
-
- ))}
-
-
-
+ {filteredIconNames.map(name => (
+
+ ))}
+
+
);
}
@@ -263,7 +262,7 @@ function FolderAppearanceFields({
}
export function EditModal({ modalProps, modalKey, bookmark, onSave }: {
- modalProps: ModalProps,
+ modalProps: RenderModalProps,
modalKey: string,
bookmark: Bookmark | BookmarkFolder,
onSave: (name: string, color: string, iconName?: string) => void;
@@ -274,46 +273,47 @@ export function EditModal({ modalProps, modalKey, bookmark, onSave }: {
const placeholder = bookmarkPlaceholderName(bookmark);
return (
-
+
+
-
+
);
}
diff --git a/src/equicordplugins/commandPalette/ui.tsx b/src/equicordplugins/commandPalette/ui.tsx
index 1ddf1233e..7f1ad3f32 100644
--- a/src/equicordplugins/commandPalette/ui.tsx
+++ b/src/equicordplugins/commandPalette/ui.tsx
@@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-import { closeModal, openModal } from "@utils/modal";
+import { closeModal, openModal } from "@webpack/common";
import { CommandPaletteModal } from "./ui/CommandPaletteModal";
diff --git a/src/equicordplugins/commandPalette/ui/CommandPaletteModal.tsx b/src/equicordplugins/commandPalette/ui/CommandPaletteModal.tsx
index d531a8c18..e6d442f6d 100644
--- a/src/equicordplugins/commandPalette/ui/CommandPaletteModal.tsx
+++ b/src/equicordplugins/commandPalette/ui/CommandPaletteModal.tsx
@@ -11,8 +11,8 @@ import { classNameFactory, classNameToSelector } from "@utils/css";
import { copyWithToast } from "@utils/discord";
import { Logger } from "@utils/Logger";
import { classes } from "@utils/misc";
-import { type ModalProps, ModalRoot, ModalSize } from "@utils/modal";
-import { TextInput, Toasts, useEffect, useMemo, useRef, useState } from "@webpack/common";
+import { RenderModalProps } from "@vencord/discord-types";
+import { Modal,TextInput, Toasts, useEffect, useMemo, useRef, useState } from "@webpack/common";
import type { KeyboardEvent as ReactKeyboardEvent } from "react";
import { buildQueryResolution } from "../actions/executors";
@@ -282,7 +282,7 @@ function createInitialPageState(ref: PalettePageRef): PalettePageValuesState {
};
}
-export function CommandPaletteModal({ modalProps, instanceKey }: { modalProps: ModalProps; instanceKey: number; }) {
+export function CommandPaletteModal({ modalProps, instanceKey }: { modalProps: RenderModalProps; instanceKey: number; }) {
const {
compactStartEnabled = true,
closeAfterExecute = true
@@ -1469,12 +1469,12 @@ export function CommandPaletteModal({ modalProps, instanceKey }: { modalProps: M
}, [activePage, activePageFieldKey, activePageSpec, activePageState, activePageSuggestions]);
return (
-
-
-
-
+
-
-
-
-
+ }
+ >
+
));
}
diff --git a/src/equicordplugins/ghosted/GhostedUsersModal.tsx b/src/equicordplugins/ghosted/GhostedUsersModal.tsx
index eb85658b5..ade418e6a 100644
--- a/src/equicordplugins/ghosted/GhostedUsersModal.tsx
+++ b/src/equicordplugins/ghosted/GhostedUsersModal.tsx
@@ -5,10 +5,9 @@
*/
import { classNameFactory } from "@utils/css";
-import { ModalCloseButton, ModalContent, ModalHeader, ModalRoot, ModalSize } from "@utils/modal";
-import { Channel } from "@vencord/discord-types";
+import { Channel, RenderModalProps } from "@vencord/discord-types";
import { findByPropsLazy, findComponentByCodeLazy } from "@webpack";
-import { Avatar, Button, ChannelStore, MessageStore, React, Text, UserStore } from "@webpack/common";
+import { Avatar, Button, ChannelStore, MessageStore, Modal,React, Text, UserStore } from "@webpack/common";
const cl = classNameFactory("vc-boo-");
@@ -37,9 +36,8 @@ function GroupDmsIcon({ channel }: { channel: Channel; }) {
}
interface GhostedUsersModalProps {
- modalProps: any;
+ modalProps: RenderModalProps;
ghostedChannels: string[];
- onClose: () => void;
onClearGhost: (channelId: string) => void;
}
@@ -57,14 +55,14 @@ export function getChannelDisplayName(channelId: string): string {
return user?.username || "Unknown User";
}
-export function GhostedUsersModal({ modalProps, ghostedChannels: initialChannels, onClose, onClearGhost }: GhostedUsersModalProps) {
+export function GhostedUsersModal({ modalProps, ghostedChannels: initialChannels, onClearGhost }: GhostedUsersModalProps) {
const [ghostedChannels, setGhostedChannels] = React.useState(initialChannels);
const handleChannelClick = (channelId: string) => {
const channel = ChannelStore.getChannel(channelId);
if (channel) {
SelectedChannelActionCreators.selectPrivateChannel(channelId);
- onClose();
+ modalProps.onClose();
}
};
@@ -83,77 +81,67 @@ export function GhostedUsersModal({ modalProps, ghostedChannels: initialChannels
};
return (
-
-
-
- Ghosted Users ({ghostedChannels.length})
-
- {ghostedChannels.length > 0 && (
-
- )}
-
-
-
+
-
-
-
-
+
+
+
);
},
{
diff --git a/src/equicordplugins/customUserColors/SetColorModal.tsx b/src/equicordplugins/customUserColors/SetColorModal.tsx
index ba51afa70..c57ce4b63 100644
--- a/src/equicordplugins/customUserColors/SetColorModal.tsx
+++ b/src/equicordplugins/customUserColors/SetColorModal.tsx
@@ -5,17 +5,17 @@
*/
import { set } from "@api/DataStore";
-import { HeadingPrimary, HeadingSecondary } from "@components/Heading";
+import { HeadingSecondary } from "@components/Heading";
import { classNameFactory } from "@utils/css";
import { Margins } from "@utils/margins";
-import { ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot } from "@utils/modal";
-import { Button, ColorPicker, useState } from "@webpack/common";
+import { RenderModalProps } from "@vencord/discord-types";
+import { ColorPicker, Modal, React, useState } from "@webpack/common";
import { colors, DATASTORE_KEY } from "./index";
const cl = classNameFactory("vc-customColors-");
-export function SetColorModal({ id, modalProps }: { id: string, modalProps: ModalProps; }) {
+export function SetColorModal({ id, modalProps }: { id: string, modalProps: RenderModalProps; }) {
const initialColor = parseInt(colors[id], 16) || 372735;
// color picker default to current color set for user (if null it's 0x05afff :3 )
@@ -26,7 +26,7 @@ export function SetColorModal({ id, modalProps }: { id: string, modalProps: Moda
setColorPickerColor(color);
}
- function handleKey(e: KeyboardEvent) {
+ function handleKey(e: React.KeyboardEvent) {
if (e.key === "Enter")
saveUserColor();
}
@@ -44,14 +44,24 @@ export function SetColorModal({ id, modalProps }: { id: string, modalProps: Moda
}
return (
-
-
-
- Custom Color
-
-
-
+
+
Pick a Color
@@ -62,22 +72,7 @@ export function SetColorModal({ id, modalProps }: { id: string, modalProps: Moda
showEyeDropper={false}
/>
-
-
-
-
-
-
-
+
+
);
}
diff --git a/src/equicordplugins/customUserColors/index.tsx b/src/equicordplugins/customUserColors/index.tsx
index 55f92cf3f..92cc03da8 100644
--- a/src/equicordplugins/customUserColors/index.tsx
+++ b/src/equicordplugins/customUserColors/index.tsx
@@ -10,11 +10,10 @@ import { NavContextMenuPatchCallback } from "@api/ContextMenu";
import { get } from "@api/DataStore";
import { definePluginSettings, Settings } from "@api/Settings";
import { EquicordDevs } from "@utils/constants";
-import { openModal } from "@utils/modal";
import definePlugin, { OptionType } from "@utils/types";
import { Channel, User } from "@vencord/discord-types";
import { extractAndLoadChunksLazy } from "@webpack";
-import { ChannelStore, Menu, SelectedChannelStore } from "@webpack/common";
+import { ChannelStore, Menu, openModal,SelectedChannelStore } from "@webpack/common";
import { SetColorModal } from "./SetColorModal";
diff --git a/src/equicordplugins/findReply/ReplyNavigator.tsx b/src/equicordplugins/findReply/ReplyNavigator.tsx
index 1c656d1ce..c5aa6b158 100644
--- a/src/equicordplugins/findReply/ReplyNavigator.tsx
+++ b/src/equicordplugins/findReply/ReplyNavigator.tsx
@@ -8,10 +8,11 @@ import "./styles.css";
import ErrorBoundary from "@components/ErrorBoundary";
import { Paginator, requirePaginator } from "@plugins/reviewDB/components/ReviewModal";
-import { ModalCloseButton } from "@utils/modal";
import { Message } from "@vencord/discord-types";
-import { findCssClassesLazy } from "@webpack";
+import { findComponentByCodeLazy, findCssClassesLazy } from "@webpack";
import { React, useRef, useState } from "@webpack/common";
+
+const CloseButton = findComponentByCodeLazy("CLOSE_BUTTON_LABEL");
import { MutableRefObject } from "react";
import { jumper } from "./index";
@@ -53,7 +54,7 @@ export default function ReplyNavigator({ replies }: { replies: Message[]; }) {
totalCount={replies.length}
onPageChange={processPageChange}
/>
- setVisible(false)} />
+ setVisible(false)} />
);
diff --git a/src/equicordplugins/friendshipRanks/index.tsx b/src/equicordplugins/friendshipRanks/index.tsx
index c33b57b9e..5b777f009 100644
--- a/src/equicordplugins/friendshipRanks/index.tsx
+++ b/src/equicordplugins/friendshipRanks/index.tsx
@@ -13,9 +13,9 @@ import { Flex } from "@components/Flex";
import { Paragraph } from "@components/Paragraph";
import { Devs } from "@utils/constants";
import { classNameFactory } from "@utils/css";
-import { ModalContent, ModalHeader, ModalRoot, ModalSize, openModal } from "@utils/modal";
import definePlugin from "@utils/types";
-import { Forms, RelationshipStore } from "@webpack/common";
+import { RenderModalProps } from "@vencord/discord-types";
+import { Forms, Modal,openModal, RelationshipStore } from "@webpack/common";
interface rankInfo {
title: string;
@@ -84,10 +84,12 @@ const ranks: rankInfo[] =
];
function openRankModal(rank: rankInfo) {
- openModal(props => (
+ openModal((props: RenderModalProps) => (
{!isPageOpen && (
-
+
);
}
diff --git a/src/equicordplugins/customFolderIcons/components.tsx b/src/equicordplugins/customFolderIcons/components.tsx
index b5feb52a7..1509e2288 100644
--- a/src/equicordplugins/customFolderIcons/components.tsx
+++ b/src/equicordplugins/customFolderIcons/components.tsx
@@ -4,8 +4,7 @@
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-import { closeModal, ModalContent, ModalHeader, ModalRoot, openModalLazy } from "@utils/modal";
-import { Button, Menu, Slider, TextInput, useState } from "@webpack/common";
+import { Button, closeModal, Menu, Modal,openModalLazy, Slider, TextInput, useState } from "@webpack/common";
import { folderIconsData, settings } from "./settings";
import { folderProp, int2rgba, setFolderData } from "./util";
@@ -95,17 +94,12 @@ export function makeContextItem(a: folderProp) {
action={() => {
openModalLazy(async () => {
return props => (
-
- Set a New Icon.
-
-
You might have to hover the folder after setting in order for it to refresh.
-
-
- {rank.description}
-
-
-
+
+ {rank.description}
+
+
+
- {ghostedChannels.length === 0 ? (
- No ghosts here!
- ) : (
- ghostedChannels.map(channelId => {
- const channel = ChannelStore.getChannel(channelId);
- if (!channel) return null;
+ 0 ? [
+ {
+ text: "Clear All",
+ variant: "primary",
+ onClick: handleClearAll
+ }
+ ] : []}
+ >
+
);
}
diff --git a/src/equicordplugins/ghosted/index.tsx b/src/equicordplugins/ghosted/index.tsx
index ca2b504d9..092316212 100644
--- a/src/equicordplugins/ghosted/index.tsx
+++ b/src/equicordplugins/ghosted/index.tsx
@@ -12,10 +12,9 @@ import { definePluginSettings } from "@api/Settings";
import ErrorBoundary from "@components/ErrorBoundary";
import { Devs, EquicordDevs } from "@utils/constants";
import { classNameFactory } from "@utils/css";
-import { closeModal, openModal } from "@utils/modal";
import definePlugin, { OptionType } from "@utils/types";
import { Channel } from "@vencord/discord-types";
-import { Menu, Tooltip, useEffect, useState } from "@webpack/common";
+import { Menu, openModal,Tooltip, useEffect, useState } from "@webpack/common";
import { Boo, clearChannelFromGhost, getBooCount, getGhostedChannels, onBooCountChange } from "./Boo";
import { getChannelDisplayName, GhostedUsersModal } from "./GhostedUsersModal";
@@ -85,12 +84,11 @@ function BooIndicator() {
const handleClick = () => {
const ghostedChannels = getGhostedChannels();
- const modalKey = openModal(modalProps => (
+ openModal(modalProps => (
closeModal(modalKey)}
onClearGhost={clearChannelFromGhost}
/>
diff --git a/src/equicordplugins/gifCollections/components/modals.tsx b/src/equicordplugins/gifCollections/components/modals.tsx
index 3e36e52b6..7647544ff 100644
--- a/src/equicordplugins/gifCollections/components/modals.tsx
+++ b/src/equicordplugins/gifCollections/components/modals.tsx
@@ -8,8 +8,8 @@ import { Flex } from "@components/Flex";
import { Heading } from "@components/Heading";
import { Paragraph } from "@components/Paragraph";
import { classes } from "@utils/misc";
-import { ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot, ModalSize, openModal } from "@utils/modal";
-import { Button, FluxDispatcher, TextInput, useCallback, useState } from "@webpack/common";
+import { RenderModalProps } from "@vencord/discord-types";
+import { Button, FluxDispatcher, Modal, openModal, TextInput, useCallback, useState } from "@webpack/common";
import { settings } from "../settings";
import { Collection, Gif } from "../types";
@@ -49,124 +49,116 @@ export function openRenameCollectionModal(name: string) {
openModal(props =>
-
- {title}
-
-
-
- {rows.map(row => (
-
- {row.label}
- {row.value}
-
+
+
+ {rows.map(row => (
+
+ {row.label}
+ {row.value}
+
+ ))}
+
+
+ );
+}
+
+function MoveToCollectionModal({ props, gifId }: { props: RenderModalProps; gifId: string; }) {
+ return (
+
+ Select a collection to move the item to
+
);
}
-function MoveToCollectionModal({ props, gifId }: { props: ModalProps; gifId: string; }) {
- return (
-
-
- Move To Collection
-
-
- Select a collection to move the item to
-
-
-
-
-
- );
-}
-
-function CreateCollectionModal({ props, gif }: { props: ModalProps; gif: Gif; }) {
+function CreateCollectionModal({ props, gif }: { props: RenderModalProps; gif: Gif; }) {
const [name, setName] = useState("");
- const onSubmit = useCallback((e: React.FormEvent) => {
- e.preventDefault();
+ const onSubmit = useCallback((e?: React.FormEvent) => {
+ e?.preventDefault();
if (!name.length) return;
createCollection(name, [gif]);
props.onClose();
}, [name, gif, props]);
return (
-
+
-
+
);
}
-function RenameCollectionModal({ props, name }: { props: ModalProps; name: string; }) {
+function RenameCollectionModal({ props, name }: { props: RenderModalProps; name: string; }) {
const prefix = settings.store.collectionPrefix;
const strippedName = name.startsWith(prefix) ? name.slice(prefix.length) : name;
const [newName, setNewName] = useState(strippedName);
const tooLong = newName.length >= 25;
- const onSubmit = useCallback(async (e: React.FormEvent) => {
- e.preventDefault();
+ const onSubmit = useCallback(async (e?: React.FormEvent) => {
+ e?.preventDefault();
if (!newName.length || tooLong) return;
await renameCollection(name, newName);
props.onClose();
}, [newName, name, tooLong, props]);
return (
-
+
-
+
);
}
diff --git a/src/equicordplugins/githubRepos/components/ProfilePopoutComponent.tsx b/src/equicordplugins/githubRepos/components/ProfilePopoutComponent.tsx
index 617ac8d3d..88591a36d 100644
--- a/src/equicordplugins/githubRepos/components/ProfilePopoutComponent.tsx
+++ b/src/equicordplugins/githubRepos/components/ProfilePopoutComponent.tsx
@@ -9,9 +9,8 @@ import { Span } from "@components/Span";
import { fetchReposByUserId, fetchReposByUsername, fetchUserInfo, GitHubUserInfo } from "@equicordplugins/githubRepos/githubApi";
import { GitHubRepo } from "@equicordplugins/githubRepos/types";
import { classes } from "@utils/misc";
-import { openModal } from "@utils/modal";
import { findCssClassesLazy } from "@webpack";
-import { Clickable, React, useEffect, UserProfileStore, useState } from "@webpack/common";
+import { Clickable, openModal,React, useEffect, UserProfileStore, useState } from "@webpack/common";
import { ReposModal } from "./ReposModal";
diff --git a/src/equicordplugins/githubRepos/components/ProfileTabComponent.tsx b/src/equicordplugins/githubRepos/components/ProfileTabComponent.tsx
index 3008f94a0..8b79bbcdd 100644
--- a/src/equicordplugins/githubRepos/components/ProfileTabComponent.tsx
+++ b/src/equicordplugins/githubRepos/components/ProfileTabComponent.tsx
@@ -7,8 +7,7 @@
import { BaseText } from "@components/BaseText";
import { fetchReposByUserId, fetchReposByUsername, fetchUserInfo, GitHubUserInfo } from "@equicordplugins/githubRepos/githubApi";
import { GitHubRepo } from "@equicordplugins/githubRepos/types";
-import { openModal } from "@utils/modal";
-import { React, useEffect, UserProfileStore, useState } from "@webpack/common";
+import { openModal,React, useEffect, UserProfileStore, useState } from "@webpack/common";
import { cl, settings } from "..";
import { RepoCard } from "./RepoCard";
diff --git a/src/equicordplugins/githubRepos/components/ReposModal.tsx b/src/equicordplugins/githubRepos/components/ReposModal.tsx
index 36bcc0902..885c9a643 100644
--- a/src/equicordplugins/githubRepos/components/ReposModal.tsx
+++ b/src/equicordplugins/githubRepos/components/ReposModal.tsx
@@ -4,12 +4,10 @@
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-import { Button } from "@components/Button";
-import { HeadingPrimary } from "@components/Heading";
import { getLanguageColor } from "@equicordplugins/githubRepos/colors";
import { GitHubRepo } from "@equicordplugins/githubRepos/types";
-import { ModalContent, ModalFooter, ModalHeader, ModalRoot } from "@utils/modal";
-import { React } from "@webpack/common";
+import { RenderModalProps } from "@vencord/discord-types";
+import { Modal, React } from "@webpack/common";
import { cl } from "..";
import { Star } from "./Star";
@@ -20,7 +18,7 @@ interface ReposModalProps {
rootProps: any;
}
-export function ReposModal({ repos, username, rootProps }: ReposModalProps) {
+export function ReposModal({ repos, username, rootProps }: ReposModalProps & { rootProps: RenderModalProps; }) {
const renderTableHeader = () => (
@@ -63,44 +61,38 @@ export function ReposModal({ repos, username, rootProps }: ReposModalProps) {
);
return (
-
-
-
- {username}'s GitHub Repositories
-
-
-
-
-
-
-
-
-
+ window.open(`https://github.com/${username}?tab=repositories`, "_blank")
+ },
+ {
+ text: "Close",
+ variant: "secondary",
+ onClick: rootProps.onClose
+ }
+ ]}
+ >
+
);
}
diff --git a/src/equicordplugins/globalBadges/badgeModal.tsx b/src/equicordplugins/globalBadges/badgeModal.tsx
index e2c501b41..98a91ebec 100644
--- a/src/equicordplugins/globalBadges/badgeModal.tsx
+++ b/src/equicordplugins/globalBadges/badgeModal.tsx
@@ -4,14 +4,12 @@
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-import { Button } from "@components/Button";
import ErrorBoundary from "@components/ErrorBoundary";
import { HeadingTertiary } from "@components/Heading";
import { Paragraph } from "@components/Paragraph";
import { openInviteModal } from "@utils/discord";
-import { ModalContent, ModalFooter, ModalHeader, ModalRoot, openModal } from "@utils/modal";
-import { User } from "@vencord/discord-types";
-import { React, Tooltip } from "@webpack/common";
+import { RenderModalProps, User } from "@vencord/discord-types";
+import { Modal, openModal, React, Tooltip } from "@webpack/common";
import { cl, GlobalBadges, INVITE_LINK } from "./utils";
@@ -37,20 +35,32 @@ export function openBadgeModal(user: User) {
-
-
+ openModal((modalprops: RenderModalProps) => (
+
-
+
{user.username}
-
-
+
+ }
+ actions={[
+ {
+ text: "Join GlobalBadges Server",
+ variant: "link",
+ onClick: () => openInviteModal(INVITE_LINK)
+ }
+ ]}
+ >
+
+
-
+
));
}
diff --git a/src/equicordplugins/hideServers/components/HiddenServersMenu.tsx b/src/equicordplugins/hideServers/components/HiddenServersMenu.tsx
index cdf840d10..863a6b848 100644
--- a/src/equicordplugins/hideServers/components/HiddenServersMenu.tsx
+++ b/src/equicordplugins/hideServers/components/HiddenServersMenu.tsx
@@ -10,40 +10,21 @@ import { HiddenServersStore } from "@equicordplugins/hideServers/HiddenServersSt
import { classNameFactory } from "@utils/css";
import { getGuildAcronym } from "@utils/discord";
import { classes } from "@utils/misc";
-import {
- closeModal,
- ModalCloseButton,
- ModalContent,
- ModalHeader,
- ModalProps,
- ModalRoot,
- ModalSize,
- openModal,
-} from "@utils/modal";
-import { Guild } from "@vencord/discord-types";
+import { Guild, RenderModalProps } from "@vencord/discord-types";
import { findCssClassesLazy } from "@webpack";
-import { Button, IconUtils, useStateFromStores } from "@webpack/common";
+import { Button, closeModal, IconUtils, Modal,openModal, useStateFromStores } from "@webpack/common";
import { SortedGuildStore } from "..";
const cl = classNameFactory("vc-hideservers-");
const IconClasses = findCssClassesLazy("icon", "acronym", "childWrapper");
-function HiddenServersModal({ modalProps, close }: { modalProps: ModalProps; close(): void; }) {
+function HiddenServersModal({ modalProps, close }: { modalProps: RenderModalProps; close(): void; }) {
const guilds = useStateFromStores([HiddenServersStore], () => HiddenServersStore.hiddenGuildsDetail());
return (
-
-
-
- Hidden Servers
-
-
-
-
-
-
+
+
);
}
diff --git a/src/equicordplugins/iconViewer/components/Modals.tsx b/src/equicordplugins/iconViewer/components/Modals.tsx
index 67cc8e8fb..7dfa433fb 100644
--- a/src/equicordplugins/iconViewer/components/Modals.tsx
+++ b/src/equicordplugins/iconViewer/components/Modals.tsx
@@ -5,7 +5,6 @@
*/
import { BaseText } from "@components/BaseText";
-import { Button } from "@components/Button";
import { CodeBlock } from "@components/CodeBlock";
import { Flex } from "@components/Flex";
import { HeadingSecondary } from "@components/Heading";
@@ -13,18 +12,8 @@ import { Paragraph } from "@components/Paragraph";
import { TooltipContainer } from "@components/TooltipContainer";
import { copyWithToast, getIntlMessage } from "@utils/discord";
import { Logger } from "@utils/Logger";
-import {
- CloseButton,
- ModalContent,
- ModalFooter,
- ModalHeader,
- ModalProps,
- ModalRoot,
- ModalSize,
- openModal
-} from "@utils/modal";
import { saveFile } from "@utils/web";
-import { Icon } from "@vencord/discord-types";
+import { Icon, RenderModalProps } from "@vencord/discord-types";
import { findComponentByCodeLazy } from "@webpack";
import {
Clickable,
@@ -32,6 +21,8 @@ import {
createRoot,
FluxDispatcher,
Menu,
+ Modal,
+ openModal,
ReactDOM,
useCallback,
useEffect,
@@ -226,7 +217,7 @@ function OtherContextMenu({ iconName, Icon, color }: { iconName: string; Icon: I
);
}
-function IconModal({ iconName, Icon, onClose, transitionState }: { iconName: string; Icon: Icon; } & ModalProps) {
+function IconModal({ iconName, Icon, onClose, transitionState }: { iconName: string; Icon: Icon; } & RenderModalProps) {
const [color, setColor] = useColorNavigation(209);
const colorData = cssColors[color];
const colorKeys = useMemo(() => getCssColorKeys(), []);
@@ -247,62 +238,59 @@ function IconModal({ iconName, Icon, onClose, transitionState }: { iconName: str
});
}, [colorKeys.length, setColor]);
- const openOtherMenu = (e: React.MouseEvent) => {
- ContextMenuApi.openContextMenu(e, () => (
+ const openOtherMenu = (e?: React.MouseEvent) => {
+ if (e) ContextMenuApi.openContextMenu(e, () => (
-
-
- Deleted
-
-
- Edited
-
-
- Ghost Pinged
-
-
-
-
+ {ghostedChannels.length === 0 ? (
+ No ghosts here!
+ ) : (
+ ghostedChannels.map(channelId => {
+ const channel = ChannelStore.getChannel(channelId);
+ if (!channel) return null;
- const lastMessage = MessageStore.getMessages(channelId)?.last();
- const lastMessageDate = lastMessage?.timestamp ? formatMessageDate(lastMessage.timestamp) : "";
+ const lastMessage = MessageStore.getMessages(channelId)?.last();
+ const lastMessageDate = lastMessage?.timestamp ? formatMessageDate(lastMessage.timestamp) : "";
- const displayName = getChannelDisplayName(channel.id);
- const userId = channel?.recipients?.[0] ?? "";
- return (
-
+ handleChannelClick(channelId)}
- className={cl("ghosted-entry")}
- >
- {channel.isGroupDM() ?
-
+ );
+ })
+ )}
+
-
- {displayName}
+ const displayName = getChannelDisplayName(channel.id);
+ const userId = channel?.recipients?.[0] ?? "";
+ return (
+
-
-
+
+ handleChannelClick(channelId)}
+ className={cl("ghosted-entry")}
+ >
+ {channel.isGroupDM() ?
+
- );
- })
- )}
-
+
+ {displayName}
+
+ {lastMessageDate && (
+
+ {lastMessageDate}
- {lastMessageDate && (
-
- {lastMessageDate}
-
- )}
-
-
+ )}
+ {cache_collections
+ .filter(col => col.name !== getItemCollectionNameFromId(gifId))
+ .map(col => (
+
))}
-
-
-
-
-
-
+
+
- {cache_collections
- .filter(col => col.name !== getItemCollectionNameFromId(gifId))
- .map(col => (
-
- ))}
-
-
-
-
-
-
+
+
+
+
{badgeDataElements.length ? (
<>
@@ -66,16 +76,8 @@ export function openBadgeModal(user: User) {
No global badges.
)}
-
-
-
-
+
- {iconName}
+
+
+
-
-
-
- {iconSizes.map(size => (
-
-
- ))}
-
-
-
- {colorData?.name}
-
-
+
+
+ {iconSizes.map(size => (
+
+
+ ))}
+
+
+ {colorData?.name}
+
+
- copyWithToast(findCode, "Copied!")}>
-
-
-
-
-
-
+
+ copyWithToast(findCode, "Copied!")}>
+
+
);
}
diff --git a/src/equicordplugins/inRole/RoleMembersModal.tsx b/src/equicordplugins/inRole/RoleMembersModal.tsx
index 6483b105b..c628f985d 100644
--- a/src/equicordplugins/inRole/RoleMembersModal.tsx
+++ b/src/equicordplugins/inRole/RoleMembersModal.tsx
@@ -7,38 +7,35 @@
import ErrorBoundary from "@components/ErrorBoundary";
import { Paragraph } from "@components/Paragraph";
import { classNameFactory } from "@utils/css";
-import { ModalCloseButton, ModalContent, ModalHeader, ModalRoot, ModalSize, openModal } from "@utils/modal";
-import { GuildMember } from "@vencord/discord-types";
-import { Parser } from "@webpack/common";
+import { GuildMember, RenderModalProps } from "@vencord/discord-types";
+import { Modal,openModal, Parser, React } from "@webpack/common";
const cl = classNameFactory("vc-inrole-");
export function showInRoleModal(members: GuildMember[], roleId: string, channelId: string) {
- openModal(props =>
- <>
-
-
-
- Members of role {
- Parser.parse(`<@&${roleId}>`, true, { channelId, viewingChannelId: channelId })
- } ({members.length})
-
-
-
-
-
-
+ openModal((props: RenderModalProps) =>
+
+
+ Members of role {Parser.parse(`<@&${roleId}>`, true, { channelId, viewingChannelId: channelId })} ({members.length})
+
+ }
+ >
+
+
);
}
diff --git a/src/equicordplugins/invisibleChat.desktop/components/DecryptionModal.tsx b/src/equicordplugins/invisibleChat.desktop/components/DecryptionModal.tsx
index b4946e28f..542d88230 100644
--- a/src/equicordplugins/invisibleChat.desktop/components/DecryptionModal.tsx
+++ b/src/equicordplugins/invisibleChat.desktop/components/DecryptionModal.tsx
@@ -16,59 +16,49 @@
* along with this program. If not, see
-
- Decrypt Message
-
-
-
- Message with Encryption
- Password
-
-
-
-
-
-
-
+
+ Message with Encryption
+ Password
+
);
}
diff --git a/src/equicordplugins/invisibleChat.desktop/components/EncryptionModal.tsx b/src/equicordplugins/invisibleChat.desktop/components/EncryptionModal.tsx
index 04a225d5c..f27f11f82 100644
--- a/src/equicordplugins/invisibleChat.desktop/components/EncryptionModal.tsx
+++ b/src/equicordplugins/invisibleChat.desktop/components/EncryptionModal.tsx
@@ -17,21 +17,14 @@
*/
import { FormSwitch } from "@components/FormSwitch";
-import { Heading, HeadingTertiary } from "@components/Heading";
+import { Heading } from "@components/Heading";
import { insertTextIntoChatInputBox } from "@utils/discord";
-import {
- ModalContent,
- ModalFooter,
- ModalHeader,
- ModalProps,
- ModalRoot,
- openModal,
-} from "@utils/modal";
-import { Button, React, TextInput } from "@webpack/common";
+import { RenderModalProps } from "@vencord/discord-types";
+import { Modal, openModal, React, TextInput } from "@webpack/common";
import { encrypt } from "../index";
-function EncModal(props: ModalProps) {
+function EncModal(props: RenderModalProps) {
const [secret, setSecret] = React.useState("");
const [cover, setCover] = React.useState("");
const [password, setPassword] = React.useState("password");
@@ -39,72 +32,65 @@ function EncModal(props: ModalProps) {
const isValid = secret && (noCover || (cover && cover.trim().split(" ").length > 1));
+ const onSend = () => {
+ if (!isValid) return;
+ const encrypted = encrypt(secret, password, noCover ? "d d" : cover);
+ const toSend = noCover ? encrypted.replaceAll("d", "") : encrypted;
+ if (!toSend) return;
+
+ insertTextIntoChatInputBox(toSend);
+
+ props.onClose();
+ };
+
return (
-
-
- Encrypt Message
-
-
-
- Secret
- {
- setSecret(e);
- }}
- />
- Cover (2 or more Words!!)
- {
- setCover(e);
- }}
- />
- Password
- {
- setPassword(e);
- }}
- />
- {
- setNoCover(e);
- }}
- />
-
-
-
-
-
-
-
+
+ Secret
+ {
+ setSecret(e);
+ }}
+ />
+ Cover (2 or more Words!!)
+ {
+ setCover(e);
+ }}
+ />
+ Password
+ {
+ setPassword(e);
+ }}
+ />
+ {
+ setNoCover(e);
+ }}
+ />
+
);
}
diff --git a/src/equicordplugins/keyboardNavigation/components/CommandPalette.tsx b/src/equicordplugins/keyboardNavigation/components/CommandPalette.tsx
index d860aeace..5ea75ed67 100644
--- a/src/equicordplugins/keyboardNavigation/components/CommandPalette.tsx
+++ b/src/equicordplugins/keyboardNavigation/components/CommandPalette.tsx
@@ -9,14 +9,14 @@ import "./style.css";
import { actions } from "@equicordplugins/keyboardNavigation/commands";
import { classNameFactory } from "@utils/css";
import { Logger } from "@utils/Logger";
-import { closeAllModals, ModalRoot, ModalSize, openModal } from "@utils/modal";
-import { React, TextInput, useEffect, useState } from "@webpack/common";
+import { RenderModalProps } from "@vencord/discord-types";
+import { closeAllModals, Modal,openModal, React, TextInput, useEffect, useState } from "@webpack/common";
import { settings } from "..";
const logger = new Logger("CommandPalette", "#e5c890");
-export function CommandPalette({ modalProps }) {
+export function CommandPalette({ modalProps }: { modalProps: RenderModalProps; }) {
const cl = classNameFactory("vc-command-palette-");
const [focusedIndex, setFocusedIndex] = useState(null);
const [startIndex, setStartIndex] = useState(0);
@@ -100,8 +100,8 @@ export function CommandPalette({ modalProps }) {
}, [queryEh]);
return (
-
-
+
);
}
diff --git a/src/equicordplugins/keyboardNavigation/components/MultipleChoice.tsx b/src/equicordplugins/keyboardNavigation/components/MultipleChoice.tsx
index 2929f1a94..b8a0a48fa 100644
--- a/src/equicordplugins/keyboardNavigation/components/MultipleChoice.tsx
+++ b/src/equicordplugins/keyboardNavigation/components/MultipleChoice.tsx
@@ -8,13 +8,13 @@ import "./style.css";
import { ButtonAction } from "@equicordplugins/keyboardNavigation/commands";
import { classNameFactory } from "@utils/css";
-import { closeAllModals, ModalProps, ModalRoot, ModalSize, openModal } from "@utils/modal";
-import { React, TextInput, useEffect, useState } from "@webpack/common";
+import { RenderModalProps } from "@vencord/discord-types";
+import { closeAllModals, Modal,openModal, React, TextInput, useEffect, useState } from "@webpack/common";
import { settings } from "..";
interface MultipleChoiceProps {
- modalProps: ModalProps;
+ modalProps: RenderModalProps;
onSelect: (selectedValue: any) => void;
choices: ButtonAction[];
}
@@ -99,9 +99,8 @@ export function MultipleChoice({ modalProps, onSelect, choices }: MultipleChoice
}, [queryEh]);
return (
- // @ts-ignore
-
-
+
);
}
diff --git a/src/equicordplugins/keyboardNavigation/components/TextInput.tsx b/src/equicordplugins/keyboardNavigation/components/TextInput.tsx
index a070137ac..3198ce4b6 100644
--- a/src/equicordplugins/keyboardNavigation/components/TextInput.tsx
+++ b/src/equicordplugins/keyboardNavigation/components/TextInput.tsx
@@ -6,11 +6,11 @@
import "./style.css";
-import { closeAllModals, ModalProps, ModalRoot, ModalSize, openModal } from "@utils/modal";
-import { React, TextInput, useEffect, useState } from "@webpack/common";
+import { RenderModalProps } from "@vencord/discord-types";
+import { closeAllModals, Modal,openModal, React, TextInput, useEffect, useState } from "@webpack/common";
interface SimpleTextInputProps {
- modalProps: ModalProps;
+ modalProps: RenderModalProps;
onSelect: (inputValue: string) => void;
placeholder?: string;
info?: string;
@@ -35,16 +35,17 @@ export function SimpleTextInput({ modalProps, onSelect, placeholder, info }: Sim
}, []);
return (
- // @ts-ignore
-
- setInputValue(e as unknown as string)}
- style={{ width: "30vw", borderRadius: "5px" }}
- placeholder={placeholder ?? "Type and press Enter"}
- />
- {info &&
+
+
);
}
diff --git a/src/equicordplugins/keyboardNavigation/index.tsx b/src/equicordplugins/keyboardNavigation/index.tsx
index 852edafa6..2f10bee4f 100644
--- a/src/equicordplugins/keyboardNavigation/index.tsx
+++ b/src/equicordplugins/keyboardNavigation/index.tsx
@@ -7,9 +7,8 @@
import { definePluginSettings } from "@api/Settings";
import { Devs } from "@utils/constants";
import { classNameFactory } from "@utils/css";
-import { closeAllModals } from "@utils/modal";
import definePlugin, { OptionType } from "@utils/types";
-import { SettingsRouter, useState } from "@webpack/common";
+import { closeAllModals,SettingsRouter, useState } from "@webpack/common";
import { registerAction } from "./commands";
import { openCommandPalette } from "./components/CommandPalette";
diff --git a/src/equicordplugins/loginWithQR/ui/modals/QrModal.tsx b/src/equicordplugins/loginWithQR/ui/modals/QrModal.tsx
index 302640d56..f6da905fa 100644
--- a/src/equicordplugins/loginWithQR/ui/modals/QrModal.tsx
+++ b/src/equicordplugins/loginWithQR/ui/modals/QrModal.tsx
@@ -9,9 +9,6 @@ import { QrCodeIcon } from "@components/Icons";
import { wrapTab } from "@components/settings";
import loginWithQR from "@equicordplugins/loginWithQR";
import { images } from "@equicordplugins/loginWithQR/images";
-import {
- ModalProps,
-} from "@utils/modal";
import { findByPropsLazy } from "@webpack";
import {
RestAPI,
@@ -135,7 +132,7 @@ const handleProcessImage = (file: File, modalPropsRef: QrModalPropsRef) => {
reader.readAsDataURL(file);
};
-function QrModal(props: ModalProps) {
+function QrModal() {
const [state, setState] = useState(LoginStateType.Idle);
const [preview, setPreview] = useState(null);
const error = useRef(null);
diff --git a/src/equicordplugins/loginWithQR/ui/modals/VerifyModal.tsx b/src/equicordplugins/loginWithQR/ui/modals/VerifyModal.tsx
index f988367a5..5c239be74 100644
--- a/src/equicordplugins/loginWithQR/ui/modals/VerifyModal.tsx
+++ b/src/equicordplugins/loginWithQR/ui/modals/VerifyModal.tsx
@@ -8,21 +8,15 @@ import { BaseText } from "@components/BaseText";
import { Button, TextButton } from "@components/Button";
import { images } from "@equicordplugins/loginWithQR/images";
import { getIntlMessage } from "@utils/discord";
-import {
- ModalContent,
- ModalFooter,
- ModalProps,
- ModalRoot,
- ModalSize,
- openModal,
-} from "@utils/modal";
+import { RenderModalProps } from "@vencord/discord-types";
import { findByPropsLazy } from "@webpack";
import {
+ Modal,
+ openModal,
RestAPI,
useEffect,
useRef,
- useState,
-} from "@webpack/common";
+ useState } from "@webpack/common";
import { cl } from "..";
@@ -41,7 +35,7 @@ function VerifyModal({
}: {
token: string | null;
onAbort: () => void;
-} & ModalProps) {
+} & RenderModalProps) {
const [state, setState] = useState(
!token ? VerifyState.NotFound : VerifyState.Verifying
);
@@ -112,8 +106,8 @@ function VerifyModal({
}, [state]);
return (
-
-
+
+
);
}
diff --git a/src/equicordplugins/messageLoggerEnhanced/components/LogsModal.tsx b/src/equicordplugins/messageLoggerEnhanced/components/LogsModal.tsx
index 3fa47d67b..20a961ca8 100644
--- a/src/equicordplugins/messageLoggerEnhanced/components/LogsModal.tsx
+++ b/src/equicordplugins/messageLoggerEnhanced/components/LogsModal.tsx
@@ -8,13 +8,11 @@ import { BaseText } from "@components/BaseText";
import { Button } from "@components/Button";
import { Flex } from "@components/Flex";
import { InfoIcon } from "@components/Icons";
-import { Link } from "@components/Link";
import { copyWithToast, openUserProfile } from "@utils/discord";
-import { closeAllModals, ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot, ModalSize, openModal } from "@utils/modal";
import { LazyComponent } from "@utils/react";
-import { type User } from "@vencord/discord-types";
+import { RenderModalProps, type User } from "@vencord/discord-types";
import { find, findByCode, findByCodeLazy } from "@webpack";
-import { Alerts, ChannelStore, ContextMenuApi, FluxDispatcher, GuildStore, Menu, NavigationRouter, React, TabBar, TextInput, Tooltip, useMemo, useRef, useState } from "@webpack/common";
+import { Alerts, ChannelStore, closeAllModals, ContextMenuApi, FluxDispatcher, GuildStore, Menu, Modal, NavigationRouter, openModal, React, TabBar, TextInput, Tooltip, useMemo, useRef, useState } from "@webpack/common";
import { DBMessageRecord, deleteMessageIDB, deleteMessagesBulkIDB } from "../db";
import { cl, clearLogs, settings } from "../index";
@@ -62,7 +60,7 @@ export enum LogTabs {
}
interface Props {
- modalProps: ModalProps;
+ modalProps: RenderModalProps;
initalQuery?: string;
}
@@ -76,46 +74,96 @@ export function LogsModal({ modalProps, initalQuery }: Props) {
const { messages, total, statusTotal, pending, reset } = useMessages(queryEh, currentTab, sortNewest, numDisplayedMessages);
return (
-
-
- setQuery(e)} style={{ width: "100%" }} placeholder="Filter Messages" />
- {
- setCurrentTab(e);
- setNumDisplayedMessages(settings.store.messagesToDisplayAtOnceInLogs);
+
+ setQuery(e)} style={{ width: "100%" }} placeholder="Filter Messages" />
+ {
+ setCurrentTab(e);
+ setNumDisplayedMessages(settings.store.messagesToDisplayAtOnceInLogs);
+ contentRef.current?.firstElementChild?.scrollTo(0, 0);
+ }}
+ >
+
+ Deleted
+
+
+ Edited
+
+
+ Ghost Pinged
+
+
+
+ }
+ actions={[
+ {
+ text: "Clear All Logs",
+ variant: "dangerPrimary",
+ onClick: () => Alerts.show({
+ title: "Clear Logs",
+ body: "Are you sure you want to clear all the logs",
+ confirmText: "Clear",
+ // @ts-expect-error not typed
+ confirmVariant: "critical-primary",
+ cancelText: "Cancel",
+ onConfirm: async () => {
+ await clearLogs();
+ reset();
+ }
+ })
+ },
+ {
+ text: "Clear Visible Logs",
+ variant: "dangerSecondary",
+ disabled: messages?.length === 0,
+ onClick: () => Alerts.show({
+ title: "Clear Logs",
+ body: `Are you sure you want to clear ${messages.length} logs`,
+ confirmText: "Clear",
+ // @ts-expect-error not typed
+ confirmVariant: "critical-primary",
+ cancelText: "Cancel",
+ onConfirm: async () => {
+ await deleteMessagesBulkIDB(messages.map(e => e.message_id));
+ reset();
+ }
+ })
+ },
+ {
+ text: `Sort ${sortNewest ? "Oldest First" : "Newest First"}`,
+ variant: "secondary",
+ onClick: () => {
+ setSortNewest(e => {
+ const val = !e;
+ settings.store.sortNewest = val;
+ return val;
+ });
contentRef.current?.firstElementChild?.scrollTo(0, 0);
- }}
- >
-
+
-
-
-
-
-
-
- Usage
- Click to copy
-
- {/* for some reason i cant make this shit codeblock full width, FF 15 */}
-
+ Usage
+ Click to copy
+
+ {/* for some reason i cant make this shit codeblock full width, FF 15 */}
+
- {
- members.length !== 0 ? members.map(member =>
- <>
-
- {Parser.parse(`<@${member.userId}>`, true, { channelId, viewingChannelId: channelId })}
-
-
- ) : Looks like no online cached members with that role were found. Try scrolling down on your member list to cache more users!
- }
-
-
+ {
+ members.length !== 0 ? members.map(member =>
+
+
+ {Parser.parse(`<@${member.userId}>`, true, { channelId, viewingChannelId: channelId })}
+
+
+ ) : Looks like no online cached members with that role were found. Try scrolling down on your member list to cache more users!
+ }
+
+
+
+
setQuery(e)}
@@ -123,7 +123,7 @@ export function CommandPalette({ modalProps }) {
))}
-
+
+
setQuery(e)}
@@ -123,7 +122,7 @@ export function MultipleChoice({ modalProps, onSelect, choices }: MultipleChoice
))}
- {info}
}
-
+ setInputValue(e as unknown as string)}
+ style={{ width: "30vw", borderRadius: "5px" }}
+ placeholder={placeholder ?? "Type and press Enter"}
+ />
+ {info &&
+ {info}
}
+
{state === VerifyState.LoggedIn ? (
<>
![]()
)}
-
-
+
+
{state === VerifyState.LoggedIn ? (
+
+ }
+ }
+ ]}
+ >
+
-
-
- {
- setSortNewest(e => {
- const val = !e;
- settings.store.sortNewest = val;
- return val;
- });
- contentRef.current?.firstElementChild?.scrollTo(0, 0);
- }}
- >
- Sort {sortNewest ? "Oldest First" : "Newest First"}
-
-
-
+
);
}
diff --git a/src/equicordplugins/moreStickers/components/picker.tsx b/src/equicordplugins/moreStickers/components/picker.tsx
index 6c652a3c8..c8e373584 100644
--- a/src/equicordplugins/moreStickers/components/picker.tsx
+++ b/src/equicordplugins/moreStickers/components/picker.tsx
@@ -4,13 +4,11 @@
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-import { HeadingPrimary } from "@components/Heading";
import { PickerContent, PickerContentHeader, PickerContentRow, PickerContentRowGrid, PickerHeaderProps, SidebarProps, Sticker, StickerCategoryType, StickerPack } from "@equicordplugins/moreStickers/types";
import { sendSticker } from "@equicordplugins/moreStickers/upload";
import { clPicker, FFmpegStateContext } from "@equicordplugins/moreStickers/utils";
import { debounce } from "@shared/debounce";
-import { ModalContent, ModalHeader, ModalRoot, ModalSize, openModal } from "@utils/modal";
-import { React, TextInput } from "@webpack/common";
+import { Modal,openModal, React, TextInput } from "@webpack/common";
import { JSX } from "react";
import { CategoryImage, CategoryScroller, CategoryWrapper, StickerCategory } from "./categories";
@@ -72,14 +70,9 @@ export const PickerSidebar = ({ packMetas, onPackSelect }: SidebarProps) => {
onClick={() => {
openModal(modalProps => {
return (
-
-
- Stickers+
-
-
-
-
+
+
);
});
}}
diff --git a/src/equicordplugins/musicControls/spotify/lyrics/components/lyrics.tsx b/src/equicordplugins/musicControls/spotify/lyrics/components/lyrics.tsx
index c4b15fa64..d028ded7f 100644
--- a/src/equicordplugins/musicControls/spotify/lyrics/components/lyrics.tsx
+++ b/src/equicordplugins/musicControls/spotify/lyrics/components/lyrics.tsx
@@ -9,8 +9,7 @@ import { TooltipContainer } from "@components/TooltipContainer";
import { settings } from "@equicordplugins/musicControls/settings";
import { SpotifyLrcStore } from "@equicordplugins/musicControls/spotify/lyrics/providers/store";
import { SpotifyStore } from "@equicordplugins/musicControls/spotify/SpotifyStore";
-import { openModal } from "@utils/modal";
-import { ContextMenuApi, React, useEffect, useState, useStateFromStores } from "@webpack/common";
+import { ContextMenuApi, openModal,React, useEffect, useState, useStateFromStores } from "@webpack/common";
import { LyricsContextMenu } from "./ctxMenu";
import { LyricsModal } from "./modal";
diff --git a/src/equicordplugins/musicControls/spotify/lyrics/components/modal.tsx b/src/equicordplugins/musicControls/spotify/lyrics/components/modal.tsx
index 71141e9a8..ef39de086 100644
--- a/src/equicordplugins/musicControls/spotify/lyrics/components/modal.tsx
+++ b/src/equicordplugins/musicControls/spotify/lyrics/components/modal.tsx
@@ -7,8 +7,8 @@
import { BaseText } from "@components/BaseText";
import { SpotifyStore, Track } from "@equicordplugins/musicControls/spotify/SpotifyStore";
import { openImageModal } from "@utils/discord";
-import { ModalContent, ModalHeader, ModalProps, ModalRoot } from "@utils/modal";
-import { React } from "@webpack/common";
+import { RenderModalProps } from "@vencord/discord-types";
+import { Modal,React } from "@webpack/common";
import { cl, NoteSvg, scrollClasses, useLyrics } from "./util";
@@ -18,72 +18,63 @@ const formatTime = (time: number) => {
return `${minutes}:${seconds.toString().padStart(2, "0")}`;
};
-function ModalHeaderContent({ track }: { track: Track | null; }) {
+function getTitleNode(track: Track | null) {
if (!track) {
- return (
-
- No track playing
-
- );
+ return No track playing ;
}
return (
-
-
{
modalProps.transitionState === 1 &&
-
+
-
{messages != null && total === 0 && (
setNumDisplayedMessages(e => e + settings.store.messagesToDisplayAtOnceInLogs)}
/>
)}
-
+
}
- {track?.album?.image?.url && (
- 
openImageModal({
- url: track.album.image.url,
- width: track.album.image.width,
- height: track.album.image.height,
- })}
- />
- )}
-
-
-
-
+ }
+ >
+
-
+
-
- {title}
-
-
- {message}
-
-
-
-
-
-
+
+ {message}
+
);
}
-export function ImportProfilesModal({ title, message, onOverride, onMerge, onCancel, onClose, transitionState }: ImportProfilesModalProps) {
+export function ImportProfilesModal({ title, message, onOverride, onMerge, onCancel, ...props }: ImportProfilesModalProps) {
const closeAfter = (action: () => void) => () => {
action();
- onClose();
+ props.onClose();
};
return (
-
-
- {title}
-
-
- {message}
-
-
-
-
-
-
-
+
+ {message}
+
);
}
diff --git a/src/equicordplugins/profileSets/components/presetManager.tsx b/src/equicordplugins/profileSets/components/presetManager.tsx
index 74f2c5bc8..7207a7525 100644
--- a/src/equicordplugins/profileSets/components/presetManager.tsx
+++ b/src/equicordplugins/profileSets/components/presetManager.tsx
@@ -7,8 +7,7 @@
import { Button } from "@components/Button";
import { Heading } from "@components/Heading";
import { classes } from "@utils/misc";
-import { openModal } from "@utils/modal";
-import { React, SelectedGuildStore, TextInput, useStateFromStores } from "@webpack/common";
+import { openModal,React, SelectedGuildStore, TextInput, useStateFromStores } from "@webpack/common";
import { cl, settings } from "../index";
import { exportPresets, ImportDecision, importPresets, savePreset } from "../utils/actions";
diff --git a/src/equicordplugins/questify/components/settingsModal.tsx b/src/equicordplugins/questify/components/settingsModal.tsx
index 4b741c9d3..2a8019a25 100644
--- a/src/equicordplugins/questify/components/settingsModal.tsx
+++ b/src/equicordplugins/questify/components/settingsModal.tsx
@@ -5,8 +5,8 @@
*/
import PluginModal from "@components/settings/tabs/plugins/PluginModal";
-import { openModal } from "@utils/modal";
import type { Plugin } from "@utils/types";
+import { openModal } from "@webpack/common";
import { promptToRestartIfDirty } from "../settings/restartTracking";
import { setSettingsModalOpen } from "../state";
diff --git a/src/equicordplugins/quoter/index.tsx b/src/equicordplugins/quoter/index.tsx
index d41104617..6868ababf 100644
--- a/src/equicordplugins/quoter/index.tsx
+++ b/src/equicordplugins/quoter/index.tsx
@@ -5,14 +5,12 @@
*/
import { definePluginSettings } from "@api/Settings";
-import { BaseText } from "@components/BaseText";
import { FormSwitch } from "@components/FormSwitch";
import { Devs, EquicordDevs } from "@utils/constants";
import { getCurrentChannel } from "@utils/discord";
-import { ModalCloseButton, ModalContent, ModalHeader, ModalProps, ModalRoot, ModalSize, openModal } from "@utils/modal";
import definePlugin, { OptionType } from "@utils/types";
-import { Message } from "@vencord/discord-types";
-import { Button, IconUtils, Menu, TextInput, UploadHandler, useEffect, useState } from "@webpack/common";
+import { Message, RenderModalProps } from "@vencord/discord-types";
+import { IconUtils, Menu, Modal, openModal, TextInput, UploadHandler, useEffect, useState } from "@webpack/common";
import { QuoteIcon } from "./components/QuoteIcon";
import { QuoteFont } from "./types";
@@ -89,7 +87,7 @@ export default definePlugin({
}
});
-function QuoteModal({ message, ...props }: ModalProps & { message: Message; }) {
+function QuoteModal({ message, ...props }: RenderModalProps & { message: Message; }) {
const [gray, setGray] = useState(settings.store.grayscale);
const [showWatermark, setShowWatermark] = useState(settings.store.showWatermark);
const [saveAsGif, setSaveAsGif] = useState(settings.store.saveAsGif);
@@ -166,49 +164,48 @@ function QuoteModal({ message, ...props }: ModalProps & { message: Message; }) {
};
return (
-
-
-
- Catch Them In 4K.
-
-
-
- ![Quote preview]()
+
+ ![Quote preview]()
-
openImageModal({
- url: track.album.image.url,
- width: track.album.image.width,
- height: track.album.image.height,
- })}
- />
- )}
-
- {track.name}
- by {track.artists.map(a => a.name).join(", ")}
- on {track.album.name}
-
+
+ {track?.album?.image?.url && (
+ openImageModal({
+ url: track.album.image.url,
+ width: track.album.image.width,
+ height: track.album.image.height,
+ })}
+ />
+ )}
+
);
}
const modalCurrentLine = cl("modal-line-current");
const modalLine = cl("modal-line");
-export function LyricsModal({ props }: { props: ModalProps; }) {
+export function LyricsModal({ props }: { props: RenderModalProps; }) {
const { track, lyricsInfo, currLrcIndex } = useLyrics({ scroll: false });
const currentLyrics = lyricsInfo?.lyricsVersions[lyricsInfo.useLyric];
return (
- openImageModal({
+ url: track.album.image.url,
+ width: track.album.image.width,
+ height: track.album.image.height,
+ })}
+ />
+ )}
+
+ {track.name}
+ by {track.artists.map(a => a.name).join(", ")}
+ on {track.album.name}
-
+
- {currentLyrics ? (
- currentLyrics.map((line, i) => (
-
- SpotifyStore.seek(line.time * 1000)}>
- {formatTime(line.time)}
-
- {line.text || NoteSvg()}
-
- ))
- ) : (
-
- No lyrics available :(
+
+
+ No lyrics available :(
+
+ )}
+
+
);
}
diff --git a/src/equicordplugins/musicControls/tidal/lyrics/components/lyrics.tsx b/src/equicordplugins/musicControls/tidal/lyrics/components/lyrics.tsx
index 702393a4f..772d4c427 100644
--- a/src/equicordplugins/musicControls/tidal/lyrics/components/lyrics.tsx
+++ b/src/equicordplugins/musicControls/tidal/lyrics/components/lyrics.tsx
@@ -9,8 +9,7 @@ import { TooltipContainer } from "@components/TooltipContainer";
import { settings } from "@equicordplugins/musicControls/settings";
import { TidalLrcStore } from "@equicordplugins/musicControls/tidal/lyrics/providers/store";
import { TidalStore } from "@equicordplugins/musicControls/tidal/TidalStore";
-import { openModal } from "@utils/modal";
-import { ContextMenuApi, useEffect, useState, useStateFromStores } from "@webpack/common";
+import { ContextMenuApi, openModal,useEffect, useState, useStateFromStores } from "@webpack/common";
import { LyricsContextMenu } from "./ctxMenu";
import { LyricsModal } from "./modal";
diff --git a/src/equicordplugins/musicControls/tidal/lyrics/components/modal.tsx b/src/equicordplugins/musicControls/tidal/lyrics/components/modal.tsx
index c5337e5c4..8aa6a6aa2 100644
--- a/src/equicordplugins/musicControls/tidal/lyrics/components/modal.tsx
+++ b/src/equicordplugins/musicControls/tidal/lyrics/components/modal.tsx
@@ -6,7 +6,8 @@
import { BaseText } from "@components/BaseText";
import { TidalStore, Track } from "@equicordplugins/musicControls/tidal/TidalStore";
-import { ModalContent, ModalHeader, ModalProps, ModalRoot } from "@utils/modal";
+import { RenderModalProps } from "@vencord/discord-types";
+import { Modal,React } from "@webpack/common";
import { cl, NoteSvg, scrollClasses, useLyrics } from "./util";
@@ -16,58 +17,54 @@ const formatTime = (time: number) => {
return `${minutes}:${seconds.toString().padStart(2, "0")}`;
};
-function ModalHeaderContent({ track }: { track: Track; }) {
+function getTitleNode(track: Track | null) {
+ if (!track) return null;
return (
-
+ {currentLyrics ? (
+ currentLyrics.map((line, i) => (
+
+ SpotifyStore.seek(line.time * 1000)}>
+ {formatTime(line.time)}
+
+ {line.text || NoteSvg()}
- )}
-
-
-
+ ))
+ ) : (
+
- {track?.imageSrc && (
- 
- )}
-
- {track &&
- ;
newSettings: KnownPluginSettingsMap;
}
@@ -121,8 +120,10 @@ function NewPluginsModal({ modalProps, newPlugins, newSettings }: ModalComponent
};
return (
-
-
+
New Plugins and Settings ({totalCount})
@@ -131,53 +132,46 @@ function NewPluginsModal({ modalProps, newPlugins, newSettings }: ModalComponent
New plugins have been added since your last visit. Enable any you'd like or continue to dismiss.
-
- {track.name}
- by {track.artist}
- {track.album && on {track.album} }
-
+
+ {track?.imageSrc && (
+
+ )}
+
);
}
-export function LyricsModal({ rootProps }: { rootProps: ModalProps; }) {
+export function LyricsModal({ rootProps }: { rootProps: RenderModalProps; }) {
const { track, lyrics, currLrcIndex } = useLyrics({ scroll: false });
const currentLyrics = lyrics || null;
const position = track ? TidalStore.mPosition : 0;
return (
-
+ {track.name}
+ by {track.artist}
+ {track.album && on {track.album} }
-
+
- {currentLyrics ? (
- currentLyrics.map((line, i) => (
-
+
+ ))
+ ) : (
+ No lyrics available :(
+ )}
+
+
);
}
diff --git a/src/equicordplugins/newPluginsManager/NewPluginsModal.tsx b/src/equicordplugins/newPluginsManager/NewPluginsModal.tsx
index 22f683a06..5be532abb 100644
--- a/src/equicordplugins/newPluginsManager/NewPluginsModal.tsx
+++ b/src/equicordplugins/newPluginsManager/NewPluginsModal.tsx
@@ -10,15 +10,14 @@ import { Settings, useSettings } from "@api/Settings";
import { BaseText } from "@components/BaseText";
import { Button } from "@components/Button";
import ErrorBoundary from "@components/ErrorBoundary";
-import { Flex } from "@components/Flex";
import { PluginDependencyList } from "@components/settings/tabs/plugins";
import { PluginCard } from "@components/settings/tabs/plugins/PluginCard";
import { ChangeList } from "@utils/ChangeList";
import { classNameFactory } from "@utils/css";
-import { CloseButton, closeModal, ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot, ModalSize, openModal } from "@utils/modal";
import { useForceUpdater } from "@utils/react";
+import { RenderModalProps } from "@vencord/discord-types";
import { findComponentByCodeLazy } from "@webpack";
-import { Tooltip, useMemo } from "@webpack/common";
+import { closeModal, Modal,openModal, Tooltip, useMemo } from "@webpack/common";
import { ReactNode } from "react";
import Plugins from "~plugins";
@@ -32,7 +31,7 @@ const Checkbox = findComponentByCodeLazy('"data-toggleable-component":"checkbox'
let hasSeen = false;
interface ModalComponentProps {
- modalProps: ModalProps;
+ modalProps: RenderModalProps;
newPlugins: Set
+ {currentLyrics ? (
+ currentLyrics.map((line, i) => (
+
+ TidalStore.seek(line.time * 1000)}
>
- TidalStore.seek(line.time * 1000)}
- >
- {formatTime(line.time)}
-
- {line.text || NoteSvg(cl("modal-note"))}
-
- ))
- ) : (
- No lyrics available :(
- )}
-
-
-
+ {formatTime(line.time)}
+
+ {line.text || NoteSvg(cl("modal-note"))}
+
-
-
+ {pluginCards}
+ {requiredPluginCards}
+
-
- {pluginCards}
- {requiredPluginCards}
-
-
+
+ The following plugins require a restart:
+
-
-
-
- The following plugins require a restart:
-
-
- {
- Settings.plugins.NewPluginsManager.enabled = !settings?.plugins?.NewPluginsManager?.enabled;
- }}
- >
- Don't show this again
-
-
-
-
+ {
+ Settings.plugins.NewPluginsManager.enabled = !settings?.plugins?.NewPluginsManager?.enabled;
+ }}
+ >
+ Don't show this again
+
+
+
);
}
diff --git a/src/equicordplugins/profileSets/components/confirmModal.tsx b/src/equicordplugins/profileSets/components/confirmModal.tsx
index 76da537d0..2d507b138 100644
--- a/src/equicordplugins/profileSets/components/confirmModal.tsx
+++ b/src/equicordplugins/profileSets/components/confirmModal.tsx
@@ -4,11 +4,11 @@
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-import { Button } from "@components/Button";
-import { Heading } from "@components/Heading";
import { Paragraph } from "@components/Paragraph";
-import { ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot } from "@utils/modal";
-interface ConfirmModalProps extends ModalProps {
+import { RenderModalProps } from "@vencord/discord-types";
+import { Modal, React } from "@webpack/common";
+
+interface ConfirmModalProps extends RenderModalProps {
title: string;
message: string;
confirmText: string;
@@ -17,7 +17,7 @@ interface ConfirmModalProps extends ModalProps {
onCancel: () => void;
}
-interface ImportProfilesModalProps extends ModalProps {
+interface ImportProfilesModalProps extends RenderModalProps {
title: string;
message: string;
onOverride: () => void;
@@ -25,57 +25,65 @@ interface ImportProfilesModalProps extends ModalProps {
onCancel: () => void;
}
-export function ConfirmModal({ title, message, confirmText, cancelText, onConfirm, onCancel, onClose, transitionState }: ConfirmModalProps) {
+export function ConfirmModal({ title, message, confirmText, cancelText, onConfirm, onCancel, ...props }: ConfirmModalProps) {
const closeAfter = (action: () => void) => () => {
action();
- onClose();
+ props.onClose();
};
return (
- -
+ {changes.map(p =>
- {p} )} +
-
- {changes.map(p =>
- {p} )} -
-
- )}
-
-
-
-
+
-
- Remix
- closeModal(close)} />
-
-
-
-
-
-
-
-
+
+
);
}
diff --git a/src/equicordplugins/remix/index.tsx b/src/equicordplugins/remix/index.tsx
index a03d89d09..23d1042c1 100644
--- a/src/equicordplugins/remix/index.tsx
+++ b/src/equicordplugins/remix/index.tsx
@@ -8,10 +8,9 @@ import { findGroupChildrenByChildId, NavContextMenuPatchCallback } from "@api/Co
import { disableStyle, enableStyle } from "@api/Styles";
import { PaintbrushIcon } from "@components/Icons";
import { EquicordDevs } from "@utils/constants";
-import { closeModal, openModal } from "@utils/modal";
import definePlugin from "@utils/types";
import { extractAndLoadChunksLazy } from "@webpack";
-import { ChannelStore, DraftType, FluxDispatcher, Menu, PendingReplyStore, SelectedChannelStore, UploadHandler } from "@webpack/common";
+import { ChannelStore, closeModal, DraftType, FluxDispatcher, Menu, openModal,PendingReplyStore, SelectedChannelStore, UploadHandler } from "@webpack/common";
import RemixModal from "./RemixModal";
import css from "./styles.css?managed";
diff --git a/src/equicordplugins/scheduledMessages/components/ScheduleTimeModal.tsx b/src/equicordplugins/scheduledMessages/components/ScheduleTimeModal.tsx
index 95f4348af..d9126e8bf 100644
--- a/src/equicordplugins/scheduledMessages/components/ScheduleTimeModal.tsx
+++ b/src/equicordplugins/scheduledMessages/components/ScheduleTimeModal.tsx
@@ -8,9 +8,9 @@ import { Button } from "@components/Button";
import ErrorBoundary from "@components/ErrorBoundary";
import { Heading } from "@components/Heading";
import { classNameFactory } from "@utils/css";
-import { closeModal, ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot, openModal } from "@utils/modal";
+import { RenderModalProps } from "@vencord/discord-types";
import { findByPropsLazy } from "@webpack";
-import { ChannelStore, DraftType, showToast, TextInput, Toasts, UploadManager, useState } from "@webpack/common";
+import { ChannelStore, closeModal, DraftType, Modal, openModal, showToast, TextInput, Toasts, UploadManager, useState } from "@webpack/common";
import { ScheduledAttachment } from "../types";
import { addScheduledMessage, getChannelDisplayInfo } from "../utils";
@@ -23,7 +23,7 @@ function ScheduleTimeModalInner({ channelId, content, attachments, rootProps, cl
channelId: string;
content: string;
attachments?: ScheduledAttachment[];
- rootProps: ModalProps;
+ rootProps: RenderModalProps;
close: () => void;
}) {
const [scheduleType, setScheduleType] = useState<"delay" | "time">("delay");
@@ -69,74 +69,78 @@ function ScheduleTimeModalInner({ channelId, content, attachments, rootProps, cl
};
return (
-
-
- Schedule Message
-
+
+
-
+
-
-
+ )}
+
);
}
diff --git a/src/equicordplugins/recentDMSwitcher/index.tsx b/src/equicordplugins/recentDMSwitcher/index.tsx
index 48e5977fa..44bf24a8f 100644
--- a/src/equicordplugins/recentDMSwitcher/index.tsx
+++ b/src/equicordplugins/recentDMSwitcher/index.tsx
@@ -10,9 +10,8 @@ import * as DataStore from "@api/DataStore";
import { definePluginSettings } from "@api/Settings";
import { EquicordDevs, IS_MAC } from "@utils/constants";
import { classNameFactory } from "@utils/css";
-import { closeModal, openModal } from "@utils/modal";
import definePlugin, { makeRange, OptionType } from "@utils/types";
-import { Button, ChannelRouter, ChannelStore, IconUtils, React, RelationshipStore, SelectedChannelStore, Toasts, UserStore } from "@webpack/common";
+import { Button, ChannelRouter, ChannelStore, closeModal, IconUtils, openModal,React, RelationshipStore, SelectedChannelStore, Toasts, UserStore } from "@webpack/common";
const STORAGE_KEY = "RDMSwitch_history";
diff --git a/src/equicordplugins/remix/RemixModal.tsx b/src/equicordplugins/remix/RemixModal.tsx
index c77414f47..1ad9912cc 100644
--- a/src/equicordplugins/remix/RemixModal.tsx
+++ b/src/equicordplugins/remix/RemixModal.tsx
@@ -4,9 +4,8 @@
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-import { BaseText } from "@components/BaseText";
-import { ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot, ModalSize } from "@utils/modal";
-import { Button } from "@webpack/common";
+import { RenderModalProps } from "@vencord/discord-types";
+import { Modal, React } from "@webpack/common";
import { sendRemix } from ".";
import { brushCanvas, canvas, cropCanvas, ctx, exportImg, shapeCanvas } from "./editor/components/Canvas";
@@ -15,7 +14,7 @@ import { resetBounds } from "./editor/tools/crop";
import { SendIcon } from "./icons/SendIcon";
type Props = {
- modalProps: ModalProps;
+ modalProps: RenderModalProps;
close: () => void;
url?: string;
};
@@ -38,18 +37,28 @@ async function closeModal(closeFunc: () => void, save?: boolean) {
export default function RemixModal({ modalProps, close, url }: Props) {
return (
-
+ {avatar && 
}
+
+ Scheduling for: {isDM ? name : `#${name}`}
+
+
-
- {avatar && }
-
- Scheduling for: {isDM ? name : `#${name}`}
-
+ Schedule Type
+ Delay (minutes)
+ Date & Time
+ setScheduledDateTime(e.target.value)}
+ min={new Date().toISOString().slice(0, 16)}
+ />
+
+ )}
+
+ {error && (
+ Schedule Type
- Delay (minutes)
- Date & Time
- setScheduledDateTime(e.target.value)}
- min={new Date().toISOString().slice(0, 16)}
- />
-
- )}
-
- {error && (
-
-
-
-
-
+ )}
+
);
}
diff --git a/src/equicordplugins/scheduledMessages/components/ViewScheduledModal.tsx b/src/equicordplugins/scheduledMessages/components/ViewScheduledModal.tsx
index 1c41e9dbe..0fb99f605 100644
--- a/src/equicordplugins/scheduledMessages/components/ViewScheduledModal.tsx
+++ b/src/equicordplugins/scheduledMessages/components/ViewScheduledModal.tsx
@@ -6,10 +6,9 @@
import { Button } from "@components/Button";
import ErrorBoundary from "@components/ErrorBoundary";
-import { Heading } from "@components/Heading";
import { classNameFactory } from "@utils/css";
-import { closeModal, ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot, openModal } from "@utils/modal";
-import { ChannelStore, showToast, Toasts, useState } from "@webpack/common";
+import { RenderModalProps } from "@vencord/discord-types";
+import { ChannelStore, closeModal, Modal, openModal, showToast, Toasts, useState } from "@webpack/common";
import { clearAllScheduledMessages, getChannelDisplayInfo, getScheduledMessages, removeScheduledMessage } from "../utils";
import { CalendarIcon, TimerIcon } from "./Icons";
@@ -17,7 +16,7 @@ import { CalendarIcon, TimerIcon } from "./Icons";
const cl = classNameFactory("vc-scheduled-msg-");
interface ViewScheduledModalProps {
- rootProps: ModalProps;
+ rootProps: RenderModalProps;
close: () => void;
}
@@ -36,69 +35,74 @@ function ViewScheduledModalInner({ rootProps, close }: ViewScheduledModalProps)
showToast("All scheduled messages cleared", Toasts.Type.SUCCESS);
};
+ const actions = [
+ {
+ text: "Close",
+ variant: "secondary",
+ onClick: close
+ }
+ ];
+
+ if (messages.length > 0) {
+ actions.unshift({
+ text: "Clear All",
+ variant: "dangerPrimary",
+ onClick: handleClearAll
+ });
+ }
+
return (
-
-
- Scheduled Messages
- {messages.length > 0 && (
-
- )}
-
+
+ {!messages.length ? (
+
+
+
+
+
+ {scheduleType === "delay" ? (
+ <>
+
+
-
-
-
-
-
-
- {scheduleType === "delay" ? (
- <>
-
-
- )}
-
-
-
+
+ ) : (
+
+ {messages.map(msg => {
+ const { name, avatar } = getChannelDisplayInfo(msg.channelId);
+ const channel = ChannelStore.getChannel(msg.channelId);
+ if (!channel) return null;
-
- {!messages.length ? (
-
-
- ) : (
-
- {messages.map(msg => {
- const { name, avatar } = getChannelDisplayInfo(msg.channelId);
- const channel = ChannelStore.getChannel(msg.channelId);
- if (!channel) return null;
+ const isDM = channel.isPrivate();
+ const displayContent = msg.content.length > 200
+ ? msg.content.slice(0, 200) + "..."
+ : msg.content;
- const isDM = channel.isPrivate();
- const displayContent = msg.content.length > 200
- ? msg.content.slice(0, 200) + "..."
- : msg.content;
-
- return (
- ("");
const memoedSearchChar = React.useMemo(() => {
@@ -30,22 +29,15 @@ export default function CharSelectModal({ modalProps, setCharacter }: { modalPro
});
}, [search, characters]);
return (
-
-
- Select character menu
-
-
-
- setSearch(e)} />
-
-
-
-
-
-
+
+
+ setSearch(e)} />
+
+
+
+
);
}
diff --git a/src/equicordplugins/sekaiStickers/Components/SekaiStickersModal.tsx b/src/equicordplugins/sekaiStickers/Components/SekaiStickersModal.tsx
index 3b75dcbb9..da0465f84 100644
--- a/src/equicordplugins/sekaiStickers/Components/SekaiStickersModal.tsx
+++ b/src/equicordplugins/sekaiStickers/Components/SekaiStickersModal.tsx
@@ -4,18 +4,17 @@
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-import { BaseText } from "@components/BaseText";
import { Flex } from "@components/Flex";
import { FormSwitch } from "@components/FormSwitch";
import { Heading } from "@components/Heading";
import { characters } from "@equicordplugins/sekaiStickers/characters.json";
-import { ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot, ModalSize, openModal } from "@utils/modal";
-import { Button, ChannelStore, React, SelectedChannelStore, Slider, TextArea, UploadHandler } from "@webpack/common";
+import { RenderModalProps } from "@vencord/discord-types";
+import { ChannelStore, Modal, openModal, React, SelectedChannelStore, Slider, TextArea, UploadHandler } from "@webpack/common";
import Canvas from "./Canvas";
import CharSelectModal from "./Picker";
-export default function SekaiStickersModal({ modalProps, settings }: { modalProps: ModalProps; settings: any; }) {
+export default function SekaiStickersModal({ modalProps, settings }: { modalProps: RenderModalProps; settings: any; }) {
const [text, setText] = React.useState("奏でーかわいい");
const [character, setChracter] = React.useState(49);
const [fontSize, setFontSize] = React.useState(characters[character].defaultText.s);
@@ -97,45 +96,51 @@ export default function SekaiStickersModal({ modalProps, settings }: { modalProp
}
};
return (
-
-
- Sekai Stickers
-
-
-
-
-
-
-
-
-
-
-
+ }
+ }
+ ]}
+ >
+
+
+
);
}
diff --git a/src/equicordplugins/sekaiStickers/index.tsx b/src/equicordplugins/sekaiStickers/index.tsx
index aa6188e1a..965114fde 100644
--- a/src/equicordplugins/sekaiStickers/index.tsx
+++ b/src/equicordplugins/sekaiStickers/index.tsx
@@ -7,8 +7,8 @@
import { ChatBarButton, ChatBarButtonFactory } from "@api/ChatButtons";
import { definePluginSettings } from "@api/Settings";
import { Devs } from "@utils/constants";
-import { openModal } from "@utils/modal";
import definePlugin, { OptionType } from "@utils/types";
+import { openModal } from "@webpack/common";
import SekaiStickersModal from "./Components/SekaiStickersModal";
import { kanadeSvg } from "./kanade.svg";
diff --git a/src/equicordplugins/soggy/index.tsx b/src/equicordplugins/soggy/index.tsx
index 099e94792..c47670d55 100644
--- a/src/equicordplugins/soggy/index.tsx
+++ b/src/equicordplugins/soggy/index.tsx
@@ -8,9 +8,9 @@ import { AudioPlayerInterface, createAudioPlayer } from "@api/AudioPlayer";
import { HeaderBarButton } from "@api/HeaderBar";
import { definePluginSettings } from "@api/Settings";
import { EquicordDevs } from "@utils/constants";
-import { ModalProps, ModalRoot, openModal } from "@utils/modal";
import definePlugin, { OptionType } from "@utils/types";
-import { React } from "@webpack/common";
+import { RenderModalProps } from "@vencord/discord-types";
+import { Modal,openModal, React } from "@webpack/common";
let boopSound: AudioPlayerInterface;
let song: AudioPlayerInterface;
@@ -26,7 +26,7 @@ function assignBoop(url: string, volume: number) {
boopSound.load();
}
-function SoggyModal(props: ModalProps) {
+function SoggyModal(props: RenderModalProps) {
if (settings.store.songVolume !== 0) {
React.useEffect(() => {
song?.loop();
@@ -54,14 +54,13 @@ function SoggyModal(props: ModalProps) {
};
return (
-
+
-
+
);
}
diff --git a/src/equicordplugins/songSpotlight.desktop/lib/oauth2.tsx b/src/equicordplugins/songSpotlight.desktop/lib/oauth2.tsx
index 7bf8e2847..2cee55f1f 100644
--- a/src/equicordplugins/songSpotlight.desktop/lib/oauth2.tsx
+++ b/src/equicordplugins/songSpotlight.desktop/lib/oauth2.tsx
@@ -4,9 +4,8 @@
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-import { openModal } from "@utils/modal";
import { ApplicationIntegrationType } from "@vencord/discord-types/enums";
-import { OAuth2AuthorizeModal, showToast, Toasts } from "@webpack/common";
+import { OAuth2AuthorizeModal, openModal,showToast, Toasts } from "@webpack/common";
import { apiConstants, authFetch, getData } from "./api";
import { useAuthorizationStore } from "./stores/AuthorizationStore";
diff --git a/src/equicordplugins/songSpotlight.desktop/ui/settings/AddSong.tsx b/src/equicordplugins/songSpotlight.desktop/ui/settings/AddSong.tsx
index 9b0767daa..7085a5fb5 100644
--- a/src/equicordplugins/songSpotlight.desktop/ui/settings/AddSong.tsx
+++ b/src/equicordplugins/songSpotlight.desktop/ui/settings/AddSong.tsx
@@ -5,7 +5,6 @@
*/
import { BaseText } from "@components/BaseText";
-import { Button } from "@components/Button";
import ErrorBoundary from "@components/ErrorBoundary";
import { Flex } from "@components/Flex";
import { PlusIcon } from "@components/Icons";
@@ -13,11 +12,11 @@ import { cl, logger } from "@equicordplugins/songSpotlight.desktop/lib/utils";
import { Native } from "@equicordplugins/songSpotlight.desktop/service";
import { parsers } from "@song-spotlight/api/handlers";
import { Song } from "@song-spotlight/api/structs";
-import { closeModal, ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot, openModal } from "@utils/modal";
-import { Clickable, TextInput, useState } from "@webpack/common";
+import { RenderModalProps } from "@vencord/discord-types";
+import { Clickable, closeModal, Modal, openModal, TextInput, useState } from "@webpack/common";
interface AddSongModalProps {
- modalProps: ModalProps;
+ modalProps: RenderModalProps;
close(): void;
onAdd(song: Song): string | undefined;
}
@@ -29,64 +28,60 @@ function AddSongModal({ modalProps, close, onAdd }: AddSongModalProps) {
return (
-
-
- Add a new song
-
-
-
-
- Song Spotlight supports these services: {parsers.map(x => x.label).join(", ")}
-
- {
- setURL(value);
- try {
- if (value) new URL(value);
- setError(undefined);
- } catch {
- setError("Invalid URL");
+ {
+ setPending(true);
+ try {
+ const parsed = await Native.parseLink(url);
+ if (!parsed) {
+ setError("Invalid link");
+ return setPending(false);
}
- }}
- />
-
-
-
-
-
-
-
-
+
+ close();
+ } catch (error) {
+ logger.error("parseLink error", error);
+
+ setError("Failed to parse link");
+ setPending(false);
+ }
+ }
+ }
+ ]}
+ >
+
+
+ Song Spotlight supports these services: {parsers.map(x => x.label).join(", ")}
+
+ {
+ setURL(value);
+ try {
+ if (value) new URL(value);
+ setError(undefined);
+ } catch {
+ setError("Invalid URL");
+ }
+ }}
+ />
+
+
);
}
diff --git a/src/equicordplugins/songSpotlight.desktop/ui/settings/index.tsx b/src/equicordplugins/songSpotlight.desktop/ui/settings/index.tsx
index 7a36d6f73..9f88f7f9c 100644
--- a/src/equicordplugins/songSpotlight.desktop/ui/settings/index.tsx
+++ b/src/equicordplugins/songSpotlight.desktop/ui/settings/index.tsx
@@ -20,8 +20,8 @@ import { UserData, UserDataSchema } from "@song-spotlight/api/structs";
import { sid } from "@song-spotlight/api/util";
import { readClipboard } from "@utils/clipboard";
import { copyWithToast } from "@utils/discord";
-import { ModalContent, ModalHeader, ModalProps, ModalRoot, ModalSize, openModal } from "@utils/modal";
-import { Alerts, Parser, showToast, Toasts, useCallback, useEffect, useMemo, useRef, useState } from "@webpack/common";
+import { RenderModalProps } from "@vencord/discord-types";
+import { Alerts, Modal,openModal, Parser, showToast, Toasts, useCallback, useEffect, useMemo, useRef, useState } from "@webpack/common";
interface ImportButtonProps {
overwrite: boolean;
@@ -210,19 +210,14 @@ export default function Settings({ templateData }: SettingsProps) {
);
}
-export function SettingsModal({ modalProps, ...props }: SettingsProps & { modalProps: ModalProps; }) {
+export function SettingsModal({ modalProps, ...props }: SettingsProps & { modalProps: RenderModalProps; }) {
return (
-
-
- Song Spotlight
-
-
-
-
+
+
);
}
diff --git a/src/equicordplugins/statusPresets/index.tsx b/src/equicordplugins/statusPresets/index.tsx
index 225492694..fd5fd04a0 100644
--- a/src/equicordplugins/statusPresets/index.tsx
+++ b/src/equicordplugins/statusPresets/index.tsx
@@ -23,11 +23,10 @@ import { getUserSettingLazy } from "@api/UserSettings";
import ErrorBoundary from "@components/ErrorBoundary";
import { EquicordDevs } from "@utils/constants";
import { proxyLazy } from "@utils/lazy";
-import { openModalLazy } from "@utils/modal";
import { useForceUpdater } from "@utils/react";
import definePlugin, { OptionType, StartAt } from "@utils/types";
import { extractAndLoadChunksLazy, findComponentByCodeLazy, findModuleId, wreq } from "@webpack";
-import { Menu, OverridePremiumTypeStore, Toasts } from "@webpack/common";
+import { Menu, openModalLazy,OverridePremiumTypeStore, Toasts } from "@webpack/common";
interface Emoji {
animated: boolean;
diff --git a/src/equicordplugins/streaks/stores/AuthorizationStore.tsx b/src/equicordplugins/streaks/stores/AuthorizationStore.tsx
index 4057435fd..970f3b064 100644
--- a/src/equicordplugins/streaks/stores/AuthorizationStore.tsx
+++ b/src/equicordplugins/streaks/stores/AuthorizationStore.tsx
@@ -7,8 +7,7 @@
import * as DataStore from "@api/DataStore";
import { proxyLazy } from "@utils/lazy";
import { Logger } from "@utils/Logger";
-import { openModal } from "@utils/modal";
-import { OAuth2AuthorizeModal, showToast, Toasts, UserStore, zustandCreate, zustandPersist } from "@webpack/common";
+import { OAuth2AuthorizeModal, openModal,showToast, Toasts, UserStore, zustandCreate, zustandPersist } from "@webpack/common";
import { AUTHORIZE_URL, CLIENT_ID } from "../constants";
import { useStreaksStore } from "./StreaksStore";
diff --git a/src/equicordplugins/themeLibrary/components/ThemeCard.tsx b/src/equicordplugins/themeLibrary/components/ThemeCard.tsx
index 218c14de5..a2b6fc4e3 100644
--- a/src/equicordplugins/themeLibrary/components/ThemeCard.tsx
+++ b/src/equicordplugins/themeLibrary/components/ThemeCard.tsx
@@ -8,14 +8,13 @@ import { generateId } from "@api/Commands";
import { Settings } from "@api/Settings";
import { Button } from "@components/Button";
import { Card } from "@components/Card";
-import { HeadingPrimary, HeadingTertiary } from "@components/Heading";
+import { HeadingPrimary } from "@components/Heading";
import { Paragraph } from "@components/Paragraph";
import type { Theme, ThemeLikeProps } from "@equicordplugins/themeLibrary/types";
import { proxyLazy } from "@utils/lazy";
import { Margins } from "@utils/margins";
-import { ModalContent, ModalFooter, ModalHeader, ModalRoot, ModalSize, openModal } from "@utils/modal";
import { User } from "@vencord/discord-types";
-import { FluxDispatcher, Parser, React, UserStore, UserUtils } from "@webpack/common";
+import { FluxDispatcher, Modal, openModal, Parser, React, UserStore, UserUtils } from "@webpack/common";
import { Constructor } from "type-fest";
import { LikesComponent } from "./LikesComponent";
@@ -65,36 +64,32 @@ export const ThemeCard: React.FC = ({ theme, themeLinks, likedTh
if (requiresThemeAttributes && !Settings.plugins.ThemeAttributes.enabled) {
openModal(modalProps => (
-
-
- Hold on!
-
-
-
-
-
-
-
-
-
-
+ }
+ },
+ {
+ text: "Cancel",
+ variant: "secondary",
+ onClick: () => modalProps.onClose()
+ }
+ ]}
+ >
+
+
+
));
} else {
handleAddRemoveTheme();
diff --git a/src/equicordplugins/themeLibrary/components/ThemeInfoModal.tsx b/src/equicordplugins/themeLibrary/components/ThemeInfoModal.tsx
index 02212e0cb..5eef5a4d3 100644
--- a/src/equicordplugins/themeLibrary/components/ThemeInfoModal.tsx
+++ b/src/equicordplugins/themeLibrary/components/ThemeInfoModal.tsx
@@ -5,19 +5,17 @@
*/
import { CodeBlock } from "@components/CodeBlock";
-import { Heading, HeadingTertiary } from "@components/Heading";
+import { Heading } from "@components/Heading";
import { Heart } from "@components/Heart";
import { Paragraph } from "@components/Paragraph";
import { Theme, ThemeInfoModalProps } from "@equicordplugins/themeLibrary/types";
-import { ClockIcon, DownloadIcon, WarningIcon } from "@equicordplugins/themeLibrary/utils/Icons";
+import { ClockIcon, WarningIcon } from "@equicordplugins/themeLibrary/utils/Icons";
import { copyToClipboard } from "@utils/clipboard";
import { openInviteModal } from "@utils/discord";
import { Margins } from "@utils/margins";
-import { classes } from "@utils/misc";
-import { ModalContent, ModalFooter, ModalHeader, ModalRoot, ModalSize, openModal } from "@utils/modal";
import type { PluginNative } from "@utils/types";
import { findComponentByCodeLazy } from "@webpack";
-import { Button, Parser, React, showToast, Toasts } from "@webpack/common";
+import { Button, Modal, openModal, Parser, React, showToast, Toasts } from "@webpack/common";
import { logger } from "./ThemeTab";
@@ -48,212 +46,192 @@ export const ThemeInfoModal: React.FC = ({ author, theme, .
const lastUpdated = Math.floor(new Date(last_updated ?? 0).getTime() / 1000);
return (
-
-
- {type} Details
-
-
- {authors.length > 1 ? "Authors" : "Author"}
-
-
-
-
-
+ )}
+
);
}
diff --git a/src/equicordplugins/sekaiStickers/Components/Picker.tsx b/src/equicordplugins/sekaiStickers/Components/Picker.tsx
index 4a50e703d..1be2c7239 100644
--- a/src/equicordplugins/sekaiStickers/Components/Picker.tsx
+++ b/src/equicordplugins/sekaiStickers/Components/Picker.tsx
@@ -4,13 +4,12 @@
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-import { BaseText } from "@components/BaseText";
import { Flex } from "@components/Flex";
import { characters } from "@equicordplugins/sekaiStickers/characters.json";
-import { ModalCloseButton, ModalContent, ModalHeader, ModalProps, ModalRoot, ModalSize } from "@utils/modal";
-import { React, ScrollerThin, TextInput } from "@webpack/common";
+import { RenderModalProps } from "@vencord/discord-types";
+import { Modal,React, ScrollerThin, TextInput } from "@webpack/common";
-export default function CharSelectModal({ modalProps, setCharacter }: { modalProps: ModalProps; setCharacter?: any; }) {
+export default function CharSelectModal({ modalProps, setCharacter }: { modalProps: RenderModalProps; setCharacter?: any; }) {
const [search, setSearch] = React.useState
-
-
-
-
+
+
+ );
+ })}
+
- {avatar && }
-
- {isDM ? name : `#${name}`}
-
-
-
-
- {displayContent}
+ return (
+
+
- )}
-
-
-
+
- );
- })}
-
+ {avatar && }
+
+ {isDM ? name : `#${name}`}
+
-
+
+
+ {displayContent}
- {memoedSearchChar}
-
-
+ {memoedSearchChar}
+
+
-
- Text Y Pos
- { va = Math.round(va); setPosition({ x: position.x, y: curve ? 256 + fontSize * 3 - va : 256 - va }); }} initialValue={curve ? 256 - position.y + fontSize * 3 : 256 - position.y} orientation={"vertical"} onValueRender={va => String(Math.round(va))} />
- Text XZ Pos
- { va = Math.round(va); setPosition({ y: position.y, x: va }); }} initialValue={position.x} orientation={"horizontal"} onValueRender={(v: number) => String(Math.round(v))} />
-
-
- Text
-
- Rotation
- setRotate(val)} initialValue={rotate} keyboardStep={0.2} orientation={"horizontal"} onValueRender={(v: number) => String(v.toFixed(2))} />
- Font Size
- setFontSize(Math.round(val))} maxValue={100} initialValue={fontSize} keyboardStep={1} orientation={"horizontal"} onValueRender={(v: number) => String(Math.round(v))} />
- Spacing
- setSpaceSize(e)} onValueRender={e => String(Math.round(e))} />
- setCurve(val)} />
-
-
-
+
+ Text Y Pos
+ { va = Math.round(va); setPosition({ x: position.x, y: curve ? 256 + fontSize * 3 - va : 256 - va }); }} initialValue={curve ? 256 - position.y + fontSize * 3 : 256 - position.y} orientation={"vertical"} onValueRender={va => String(Math.round(va))} />
+ Text XZ Pos
+ { va = Math.round(va); setPosition({ y: position.y, x: va }); }} initialValue={position.x} orientation={"horizontal"} onValueRender={(v: number) => String(Math.round(v))} />
+
+
+ Text
+
+ Rotation
+ setRotate(val)} initialValue={rotate} keyboardStep={0.2} orientation={"horizontal"} onValueRender={(v: number) => String(v.toFixed(2))} />
+ Font Size
+ setFontSize(Math.round(val))} maxValue={100} initialValue={fontSize} keyboardStep={1} orientation={"horizontal"} onValueRender={(v: number) => String(Math.round(v))} />
+ Spacing
+ setSpaceSize(e)} onValueRender={e => String(Math.round(e))} />
+ setCurve(val)} />
+
+
-
-
+
+ This theme requires the ThemeAttributes plugin to work properly!
-Do you want to enable it?
-This theme requires the ThemeAttributes plugin to work properly!
+Do you want to enable it?
+
-
-
- Version
-
- {version}
-
-
- )}
- Likes
-
- {likes === 0 ? `Nobody liked this ${type} yet.` : `${likes} users liked this ${type}!`}
-
- {donate && (
- <>
- Donate
-
- You can support the author by donating below!
-
-
-
-
-
- )}
- {(guild || invite) && (
- <>
- Support Server
- {guild && (
-
- {guild.name}
-
- )}
-
-
-
-
- )}
- Source
-
-
-
- {tags && (
- <>
- Tags
-
- {tags.map(tag => (
-
- {tag}
-
- ))}
-
-
- )}
- {requiresThemeAttributes && (
-
-
- )}
- {last_updated && (
-
- ")} ({Parser.parse("")})
-
- )}
-
-
-
- {authors.map(author => author.username).join(", ")}
-
-
- {version && (
- <>
-