diff --git a/src/components/Icons.tsx b/src/components/Icons.tsx index 0aea2c5e0..c0ff49a33 100644 --- a/src/components/Icons.tsx +++ b/src/components/Icons.tsx @@ -827,3 +827,141 @@ export const BookmarkIcon = (props?: any) => { ); }; + +export function RobotIcon(props: IconProps) { + return ( + + + + + ); +} + +export function HeadphonesIcon(props: IconProps) { + return ( + + + + ); +} + +export function ShieldIcon(props: IconProps) { + return ( + + + + + ); +} + +export function CircleQuestionIcon(props: IconProps) { + return ( + + + + + ); +} + +export function AttachmentIcon(props: IconProps) { + return ( + + + + ); +} + +export function StickerIcon(props: IconProps) { + return ( + + + + + ); +} + +export function GifIcon(props: IconProps) { + return ( + + + + ); +} + +export function VideoIcon(props: IconProps) { + return ( + + + + ); +} diff --git a/src/equicordplugins/commandPalette/registry.tsx b/src/equicordplugins/commandPalette/registry.tsx index 313dd242c..2007fc3bc 100644 --- a/src/equicordplugins/commandPalette/registry.tsx +++ b/src/equicordplugins/commandPalette/registry.tsx @@ -8,6 +8,7 @@ import { DataStore } from "@api/index"; import { isPluginEnabled, plugins, startPlugin, stopPlugin } from "@api/PluginManager"; import { Settings, SettingsStore } from "@api/Settings"; import { getUserSettingLazy } from "@api/UserSettings"; +import { HeadphonesIcon } from "@components/Icons"; import { openPluginModal } from "@components/settings/tabs"; import { toggleEnabled } from "@equicordplugins/equicordHelper/utils"; import { copyWithToast } from "@utils/discord"; @@ -15,7 +16,7 @@ import { Logger } from "@utils/Logger"; import type { Plugin } from "@utils/types"; import { changes, checkForUpdates } from "@utils/updater"; import { Guild } from "@vencord/discord-types"; -import { findByPropsLazy, findComponentByCodeLazy, findStoreLazy } from "@webpack"; +import { findByPropsLazy, findStoreLazy } from "@webpack"; import { Alerts, ChannelActionCreators, ChannelRouter, ChannelStore, ComponentDispatch, FluxDispatcher, GuildStore, IconUtils, MediaEngineStore, MessageStore, NavigationRouter, React, ReadStateStore, ReadStateUtils, SelectedChannelStore, SelectedGuildStore, SettingsRouter, StreamerModeStore, Toasts, useEffect, UserStore, VoiceActions } from "@webpack/common"; import type { FC, ReactElement, ReactNode } from "react"; @@ -800,7 +801,6 @@ const runtimeCleanupCallbacks: Array<() => void> = []; const NotificationSettingsActionCreators = findByPropsLazy("updateGuildNotificationSettings", "updateChannelOverrideSettings"); const GuildSettingsActions = findByPropsLazy("open", "selectRole", "updateGuild"); const GuildMembershipActions = findByPropsLazy("leaveGuild"); -const HeadphonesIcon = findComponentByCodeLazy("4.1-2.13h1.86A9"); const UserGuildSettingsStore = findStoreLazy("UserGuildSettingsStore"); const NotificationsInboxStore = findStoreLazy("NotificationsInboxStore") as NotificationsInboxStoreLike; const RecentMentionsStore = findStoreLazy("RecentMentionsStore") as RecentMentionsStoreLike; diff --git a/src/equicordplugins/equicordHelper/index.tsx b/src/equicordplugins/equicordHelper/index.tsx index 5a8755f2c..1123c8dff 100644 --- a/src/equicordplugins/equicordHelper/index.tsx +++ b/src/equicordplugins/equicordHelper/index.tsx @@ -9,13 +9,13 @@ import { HeaderBarButton } from "@api/HeaderBar"; import { addMessagePreSendListener, removeMessagePreSendListener } from "@api/MessageEvents"; import { isPluginEnabled } from "@api/PluginManager"; import { definePluginSettings, migratePluginToSettings, Settings } from "@api/Settings"; -import { WarningIcon } from "@components/Icons"; +import { ShieldIcon, WarningIcon } from "@components/Icons"; import customRPC from "@plugins/customRPC"; import { Devs, EquicordDevs, GUILD_ID, SUPPORT_CHANNEL_ID, SUPPORT_CHANNEL_IDS, VC_SUPPORT_CHANNEL_IDS } from "@utils/constants"; import { isAnyPluginDev } from "@utils/misc"; import definePlugin, { OptionType } from "@utils/types"; import { StandingState } from "@vencord/discord-types/enums"; -import { findByCodeLazy, findComponentByCodeLazy, findStoreLazy } from "@webpack"; +import { findByCodeLazy, findStoreLazy } from "@webpack"; import { Alerts, ApplicationCommandIndexStore, NavigationRouter, React, SettingsRouter, UserStore, useStateFromStores } from "@webpack/common"; import { ComponentType } from "react"; @@ -30,7 +30,6 @@ let clicked = false; const SafetyHubStore = findStoreLazy("SafetyHubStore"); const fetchSafetyHub: () => Promise = findByCodeLazy("SAFETY_HUB_FETCH_START"); -const ShieldIcon = findComponentByCodeLazy("0 0 1-1.29-.88c-.36-.33-.7-.73-.88-1.13-.33-."); const StandingConfig: Record; }> = { [StandingState.ALL_GOOD]: { label: "All good!", hoverColor: "var(--status-positive)", Icon: ShieldIcon }, diff --git a/src/equicordplugins/hideMessages/index.tsx b/src/equicordplugins/hideMessages/index.tsx index b373a6bbf..425eaa4d9 100644 --- a/src/equicordplugins/hideMessages/index.tsx +++ b/src/equicordplugins/hideMessages/index.tsx @@ -6,15 +6,12 @@ import { findGroupChildrenByChildId, NavContextMenuPatchCallback } from "@api/ContextMenu"; import { definePluginSettings } from "@api/Settings"; +import { EyeIcon } from "@components/Icons"; import { EquicordDevs } from "@utils/constants"; -import definePlugin, { IconComponent, OptionType } from "@utils/types"; +import definePlugin, { OptionType } from "@utils/types"; import { Message } from "@vencord/discord-types"; -import { findComponentByCodeLazy } from "@webpack"; import { ChannelStore, FluxDispatcher, Menu } from "@webpack/common"; -const EyeIconLazy = findComponentByCodeLazy("0-.78-.41l-9.53 6.35c-.42.28-.96.28-1.38"); -const EyeIcon: IconComponent = props => ; - const hideMessage = (messageId: string, channelId: string) => { FluxDispatcher.dispatch({ type: "MESSAGE_DELETE", diff --git a/src/equicordplugins/messagePeek/index.tsx b/src/equicordplugins/messagePeek/index.tsx index 1b4fe30cb..6c0b40224 100644 --- a/src/equicordplugins/messagePeek/index.tsx +++ b/src/equicordplugins/messagePeek/index.tsx @@ -9,7 +9,7 @@ import "./style.css"; import { DecoratorProps } from "@api/MemberListDecorators"; import { isPluginEnabled } from "@api/PluginManager"; import { definePluginSettings } from "@api/Settings"; -import { ImageIcon, Microphone } from "@components/Icons"; +import { AttachmentIcon, GifIcon, ImageIcon, Microphone, StickerIcon, VideoIcon } from "@components/Icons"; import betterActivities from "@equicordplugins/betterActivities"; import showMeYourName from "@plugins/showMeYourName"; import { Devs, EquicordDevs } from "@utils/constants"; @@ -45,11 +45,11 @@ type IconType = AttachmentType | "voice" | "sticker"; const Icons: Record> = { image: ImageIcon, - file: findComponentByCodeLazy("9.86 0l.54.55a6.99 6.99"), + file: AttachmentIcon, voice: Microphone, - sticker: findComponentByCodeLazy("1-.5.5H6a4 4 0 0 1-4-4V6a4 4 0 0 1 4-4Zm.5 8a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3ZM19"), - gif: findComponentByCodeLazy("3.18 0 0 1-1.12-1.35A4.88 4.8"), - video: findComponentByCodeLazy(" 3-3v-2.12a1"), + sticker: StickerIcon, + gif: GifIcon, + video: VideoIcon, }; const ATTACHMENT_LABELS: Record = { diff --git a/src/equicordplugins/songLink.desktop/SongLinker.tsx b/src/equicordplugins/songLink.desktop/SongLinker.tsx index 87a212fb0..1807eee2f 100644 --- a/src/equicordplugins/songLink.desktop/SongLinker.tsx +++ b/src/equicordplugins/songLink.desktop/SongLinker.tsx @@ -6,14 +6,12 @@ import { BaseText } from "@components/BaseText"; import { Card } from "@components/Card"; -import { findComponentByCodeLazy } from "@webpack"; +import { HeadphonesIcon } from "@components/Icons"; import { Button, useEffect, useState } from "@webpack/common"; import pl, { Native, settings, SongLinkResult } from "."; import Providers from "./Providers"; -const HeadphonesIcon = findComponentByCodeLazy("4.1-2.13h1.86A9"); - export default function SongLinker({ url }: { url: string; }) { const [songData, setSongData] = useState(); diff --git a/src/equicordplugins/triviaAI/index.tsx b/src/equicordplugins/triviaAI/index.tsx index 20c20953b..f2932e93e 100644 --- a/src/equicordplugins/triviaAI/index.tsx +++ b/src/equicordplugins/triviaAI/index.tsx @@ -5,18 +5,15 @@ */ import { findGroupChildrenByChildId, NavContextMenuPatchCallback } from "@api/ContextMenu"; +import { RobotIcon } from "@components/Icons"; import { EquicordDevs } from "@utils/constants"; -import definePlugin, { IconComponent } from "@utils/types"; +import definePlugin from "@utils/types"; import { Message } from "@vencord/discord-types"; -import { findComponentByCodeLazy } from "@webpack"; import { ChannelStore, Menu } from "@webpack/common"; import { settings } from "./settings"; import { getPayload, getResponse, handleResponse } from "./utils"; -const RobotIconLazy = findComponentByCodeLazy("14.93-4H15a1 "); -const RobotIcon: IconComponent = props => ; - const messageCtxPatch: NavContextMenuPatchCallback = (children, { message }: { message: Message; }) => { const payload = getPayload(message); if (!payload) return;