From 1ab88e8eebb8dc98d9d6be7c22ae7bf0e0b44f3f Mon Sep 17 00:00:00 2001 From: thororen <78185467+thororen1234@users.noreply.github.com> Date: Mon, 24 Jun 2024 00:40:01 -0400 Subject: [PATCH] Some Fixes --- README.md | 3 +- src/components/ThemeSettings/themesStyles.css | 25 ++-- src/equicordplugins/betterQuests/index.tsx | 131 ------------------ src/equicordplugins/betterQuests/style.css | 9 -- src/equicordplugins/betterQuests/types.ts | 23 --- src/plugins/noServerEmojis/index.ts | 2 +- src/plugins/openInApp/index.ts | 4 +- 7 files changed, 12 insertions(+), 185 deletions(-) delete mode 100644 src/equicordplugins/betterQuests/index.tsx delete mode 100644 src/equicordplugins/betterQuests/style.css delete mode 100644 src/equicordplugins/betterQuests/types.ts diff --git a/README.md b/README.md index b759eb37..407a05d9 100644 --- a/README.md +++ b/README.md @@ -21,13 +21,12 @@ An enhanced version of [Vencord](https://github.com/Vendicated/Vencord) by [Vend - Request for plugins from Discord.
-Extra included plugins (59 additional plugins) +Extra included plugins (58 additional plugins) - AllCallTimers by MaxHerbold and D3SOX - AltKrispSwitch by newwares - Anammox by Kyuuhachi - BetterActivities by D3SOX, Arjix, AutumnVN -- BetterQuests by kvba - BetterQuickReact by Ven and Sqaaakoi - BlockKrsip by D3SOX - BypassDND by Inbestigator diff --git a/src/components/ThemeSettings/themesStyles.css b/src/components/ThemeSettings/themesStyles.css index ab37c951..0c3d34a6 100644 --- a/src/components/ThemeSettings/themesStyles.css +++ b/src/components/ThemeSettings/themesStyles.css @@ -28,31 +28,22 @@ content: "by "; } -.vc-settings-theme-add-theme-content { - margin: 10px 0; - display: flex; - flex-direction: column; - gap: 10px; +.vc-settings-theme-link-input { + width: 100%; } -.vc-settings-theme-add-theme-footer { - display: flex; - flex-direction: row; - gap: 10px; - justify-content: flex-end; +.vc-settings-theme-add-card { + padding: 1em; + margin-bottom: 16px; } -.vc-settings-theme-add-theme-error { - color: var(--text-danger); -} - -.vc-settings-usercss-ie-buttons > div { +.vc-settings-usercss-ie-buttons>div { color: var(--interactive-normal); opacity: .5; padding: 4px; } -.vc-settings-usercss-ie-buttons > div:hover { +.vc-settings-usercss-ie-buttons>div:hover { color: var(--interactive-hover); opacity: 1; -} +} \ No newline at end of file diff --git a/src/equicordplugins/betterQuests/index.tsx b/src/equicordplugins/betterQuests/index.tsx deleted file mode 100644 index 3d9c6f9d..00000000 --- a/src/equicordplugins/betterQuests/index.tsx +++ /dev/null @@ -1,131 +0,0 @@ -/* - * Vencord, a Discord client mod - * Copyright (c) 2024 Vendicated and contributors - * SPDX-License-Identifier: GPL-3.0-or-later - */ - -import "./style.css"; - -import ErrorBoundary from "@components/ErrorBoundary"; -import { EquicordDevs } from "@utils/constants"; -import definePlugin from "@utils/types"; -import { extractAndLoadChunksLazy, findComponentByCodeLazy, findExportedComponentLazy, findStoreLazy } from "@webpack"; -import { NavigationRouter, useEffect, useState } from "@webpack/common"; - - -const LinkButton = findExportedComponentLazy("LinkButton"); // let {route: e, selected: t, icon: n, iconClassName: a, interactiveClassName: s, text: r, children: o, locationState: d, onClick: f, className: p, role: m, "aria-posinset": C, "aria-setsize": g, ...E} = this.props; -const NumberBadge = findExportedComponentLazy("NumberBadge"); // let { count: l } = this.props -const QuestsComponent = findComponentByCodeLazy(".questsContainer"); // No nessessary props to include - -const questsStore = findStoreLazy("QuestsStore"); - -const requireSettingsMenu = extractAndLoadChunksLazy(['name:"UserSettings"'], /createPromise:.{0,20}Promise\.all\((\[\i\.\i\(".+?"\).+?\])\).then\(\i\.bind\(\i,"(.+?)"\)\).{0,50}"UserSettings"/); - - -// Routes used in this plugin (in case someone wants to add new ones) -const routes = new Map(); - -routes.set("/questsMenu", { - path: "/questsMenu", - render: (...props) => , - disableTrack: 1, - redirectTo: "/channels/@me" -}); - - -// Credits to https://www.svgrepo.com/svg/507254/crown -const CrownIcon = () => { - return ( - - - - - ); -}; - - -const QuestPage = (props?: any) => { - const [loadedQuests, setLoaded] = useState(false); - - useEffect(() => { - const loadQuests = async () => { - await requireSettingsMenu(); - setLoaded(true); - }; - - loadQuests(); - }, []); - - return ( -
- {loadedQuests && } -
- ); -}; - - -const QuestButtonComponent = () => { - const activeQuests = Array.from(questsStore.quests.values()).filter((q: any) => new Date(q.config.expiresAt).getTime() > Date.now() && q.claimedAt); - return ( - - - {activeQuests.length > 0 && } - - - ); -}; - -const redirectRoute = (ev: BeforeUnloadEvent) => { - const paths = Array.from(routes.keys()); - - ev.preventDefault(); - NavigationRouter.transitionTo("/quests/@me"); - setTimeout(() => window.location.reload(), 0); -}; - -export default definePlugin({ - name: "BetterQuests", - description: "Puts the quest button in more accessibile place.", - authors: [EquicordDevs.kvba], - - start: () => window.addEventListener("beforeunload", redirectRoute), - stop: () => window.removeEventListener("beforeunload", redirectRoute), - - get paths() { - return Array.from(routes.keys()); - }, - - get routes() { - return Array.from(routes.values()); - }, - - patches: [ - { // Add new quest button - find: "\"discord-shop\"),", - replacement: { - match: /"discord-shop"\),/, - replace: "$&,$self.QuestButtonComponent()," - } - }, - { // Add new route - find: ".MESSAGE_REQUESTS,render:", - replacement: { - match: /\((0,.{0,10}\.jsx\)\(.{0,10}\.\i,){path:.{0,10}\.\i\.MESSAGE_REQUESTS,.{0,100}?\),/, - replace: "$&...$self.routes.map(r => (($1r)))," - } - }, - { - find: 'on("LAUNCH_APPLICATION"', - replacement: { - match: /path:\[.{0,500}\i\.MESSAGE_REQUESTS,/, - replace: "$&...$self.paths," - } - } - ], - - QuestButtonComponent -}); diff --git a/src/equicordplugins/betterQuests/style.css b/src/equicordplugins/betterQuests/style.css deleted file mode 100644 index 55f90f6d..00000000 --- a/src/equicordplugins/betterQuests/style.css +++ /dev/null @@ -1,9 +0,0 @@ -.quests-container { - width: 100%; - overflow: hidden; - display: flex; - flex-direction: column; - background: var(--bg-overlay-chat,var(--background-primary)); - padding-left: 50px; - padding-right: 50px; -} diff --git a/src/equicordplugins/betterQuests/types.ts b/src/equicordplugins/betterQuests/types.ts deleted file mode 100644 index da64bade..00000000 --- a/src/equicordplugins/betterQuests/types.ts +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Vencord, a Discord client mod - * Copyright (c) 2024 Vendicated and contributors - * SPDX-License-Identifier: GPL-3.0-or-later - */ - -type RouteData = { - path: string, - render: (props?: any) => JSX.Element, - disableTrack: 1 | 0; - redirectTo?: string; -}; - -type NavigationSettings = { - /** Transition to a route */ - transitionTo: (path: string) => unknown, - getHistory: () => { - location: { - /** The current route */ - pathname: string; - }; - }, -}; diff --git a/src/plugins/noServerEmojis/index.ts b/src/plugins/noServerEmojis/index.ts index ed843769..84b0aaba 100644 --- a/src/plugins/noServerEmojis/index.ts +++ b/src/plugins/noServerEmojis/index.ts @@ -47,4 +47,4 @@ export default definePlugin({ } return false; } -}); +}); \ No newline at end of file diff --git a/src/plugins/openInApp/index.ts b/src/plugins/openInApp/index.ts index cb05324a..19e87fa8 100644 --- a/src/plugins/openInApp/index.ts +++ b/src/plugins/openInApp/index.ts @@ -158,11 +158,11 @@ export default definePlugin({ handleAccountView(event: { preventDefault(): void; }, platformType: string, userId: string) { if (platformType === "spotify" && settings.store.spotify) { VencordNative.native.openExternal(`spotify:user:${userId}`); - event.preventDefault(); + event.preventDefault; } else if (platformType === "steam" && settings.store.steam) { VencordNative.native.openExternal(`steam://openurl/https://steamcommunity.com/profiles/${userId}`); showToast("Opened link in Steam", Toasts.Type.SUCCESS); - event.preventDefault(); + event.preventDefault; } } });