From 614c3b820d4ce0bb30af72204b8ac7740c6a4f16 Mon Sep 17 00:00:00 2001 From: thororen1234 <78185467+thororen1234@users.noreply.github.com> Date: Thu, 4 Dec 2025 17:52:58 -0500 Subject: [PATCH] Fix Patches + Update Contrib Card --- src/components/settings/DonateButton.tsx | 6 ++-- src/components/settings/SpecialCard.css | 25 ++++++++++++++++ .../settings/tabs/vencord/DonateButton.tsx | 13 +++++--- .../settings/tabs/vencord/index.tsx | 30 +++++++++---------- src/plugins/_api/badges/modals.tsx | 4 +-- src/plugins/roleColorEverywhere/index.tsx | 2 +- src/plugins/showMeYourName/index.tsx | 2 +- 7 files changed, 56 insertions(+), 26 deletions(-) diff --git a/src/components/settings/DonateButton.tsx b/src/components/settings/DonateButton.tsx index f1fc23a41..e7c562df7 100644 --- a/src/components/settings/DonateButton.tsx +++ b/src/components/settings/DonateButton.tsx @@ -18,6 +18,7 @@ import { Button } from "@components/Button"; import { Heart } from "@components/Heart"; +import { OpenExternalIcon } from "@components/Icons"; import { openInviteModal } from "@utils/discord"; import { ButtonProps } from "@vencord/discord-types"; import { showToast } from "@webpack/common"; @@ -48,7 +49,7 @@ export function InviteButton({ return ( ); } diff --git a/src/components/settings/SpecialCard.css b/src/components/settings/SpecialCard.css index c7af4a914..7c2e51c89 100644 --- a/src/components/settings/SpecialCard.css +++ b/src/components/settings/SpecialCard.css @@ -1,13 +1,38 @@ +.vc-contrib-button, +.vc-invite-button, .vc-donate-button { overflow: visible !important; +} + +.vc-invite-link { + width: 16px; + height: 16px; + margin-left: 8px; + flex-shrink: 0; +} + +.vc-contrib-button { + overflow: visible !important; + margin-top: 1em; color: black; } +.vc-contrib-github { + width: 24px; + height: 24px; + flex-shrink: 0; + transition: transform 0.3s; +} + +.vc-invite-button .vc-invite-link, +.vc-contrib-button .vc-contrib-github, .vc-donate-button .vc-heart-icon { transition: transform 0.3s; margin-right: 0.5em; } +.vc-invite-button:hover .vc-invite-link, +.vc-contrib-github:hover .vc-contrib-github, .vc-donate-button:hover .vc-heart-icon { transform: scale(1.1); z-index: 10; diff --git a/src/components/settings/tabs/vencord/DonateButton.tsx b/src/components/settings/tabs/vencord/DonateButton.tsx index 9b529bd45..c78c1bf0a 100644 --- a/src/components/settings/tabs/vencord/DonateButton.tsx +++ b/src/components/settings/tabs/vencord/DonateButton.tsx @@ -4,7 +4,8 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -import { DonateButton } from "@components/settings/DonateButton"; +import { Flex } from "@components/Flex"; +import { DonateButton, InviteButton } from "@components/settings/DonateButton"; import BadgeAPI from "@plugins/_api/badges"; import { DONOR_ROLE_ID, VC_GUILD_ID } from "@utils/constants"; import { GuildMemberStore } from "@webpack/common"; @@ -16,8 +17,12 @@ export const isDonor = (userId: string) => !!( export function DonateButtonComponent() { return ( - + + + + ); } diff --git a/src/components/settings/tabs/vencord/index.tsx b/src/components/settings/tabs/vencord/index.tsx index 89d9cf9c1..579ae4a5d 100644 --- a/src/components/settings/tabs/vencord/index.tsx +++ b/src/components/settings/tabs/vencord/index.tsx @@ -17,7 +17,7 @@ import { FormSwitch } from "@components/FormSwitch"; import { Heading } from "@components/Heading"; import { FolderIcon, GithubIcon, LogIcon, PaintbrushIcon, RestartIcon } from "@components/Icons"; import { Paragraph } from "@components/Paragraph"; -import { DonateButton, InviteButton, openContributorModal, openPluginModal, SettingsTab, wrapTab } from "@components/settings"; +import { openContributorModal, openPluginModal, SettingsTab, wrapTab } from "@components/settings"; import { QuickAction, QuickActionCard } from "@components/settings/QuickAction"; import { SpecialCard } from "@components/settings/SpecialCard"; import { gitRemote } from "@shared/vencordUserAgent"; @@ -28,6 +28,7 @@ import { relaunch } from "@utils/native"; import { GuildMemberStore, React, Select, UserStore } from "@webpack/common"; import BadgeAPI from "plugins/_api/badges"; +import { DonateButtonComponent } from "./DonateButton"; import { openNotificationSettingsModal } from "./NotificationSettings"; const DEFAULT_DONATE_IMAGE = "https://cdn.discordapp.com/emojis/1026533090627174460.png"; @@ -156,9 +157,18 @@ function EquicordSettings() { cardImage={COZY_CONTRIB_IMAGE} backgroundImage={CONTRIB_BACKGROUND_IMAGE} backgroundColor="#EDCC87" - buttonTitle="See what you've contributed to" - buttonOnClick={() => openContributorModal(user)} - /> + > + + )}
@@ -330,18 +340,6 @@ function EquicordSettings() { ); } -function DonateButtonComponent() { - return ( - - - - - ); -} - export default wrapTab(EquicordSettings, "Equicord Settings"); export function isEquicordDonor(userId: string): boolean { diff --git a/src/plugins/_api/badges/modals.tsx b/src/plugins/_api/badges/modals.tsx index 8890f86f7..644057b54 100644 --- a/src/plugins/_api/badges/modals.tsx +++ b/src/plugins/_api/badges/modals.tsx @@ -57,7 +57,7 @@ export function VencordDonorModal() { - + @@ -113,7 +113,7 @@ export function EquicordDonorModal() { - + diff --git a/src/plugins/roleColorEverywhere/index.tsx b/src/plugins/roleColorEverywhere/index.tsx index 779fc895d..c5d047179 100644 --- a/src/plugins/roleColorEverywhere/index.tsx +++ b/src/plugins/roleColorEverywhere/index.tsx @@ -135,7 +135,7 @@ export default definePlugin({ }, // Reaction List { - find: ".reactorDefault", + find: ".tagFaded:null", replacement: { match: /tag:"strong"(?=.{0,50}\i\.name)(?<=onContextMenu:.{0,15}\((\i),(\i),\i\).+?)/, replace: "$&,style:$self.getColorStyle($2?.id,$1?.channel?.id)" diff --git a/src/plugins/showMeYourName/index.tsx b/src/plugins/showMeYourName/index.tsx index eab8a0259..48798d7ab 100644 --- a/src/plugins/showMeYourName/index.tsx +++ b/src/plugins/showMeYourName/index.tsx @@ -1016,7 +1016,7 @@ export default definePlugin({ }, { // Track hovering over reaction popouts. - match: /(return\(0,\i.\i\)\(\i.\i,{className:\i.reactorDefault,)(onContextMenu)/, + match: /(return\(0,\i.\i\)\(\i.\i,{className:\i.reactor,)(onContextMenu)/, replace: "$1onMouseEnter:()=>{$self.addHoveringReactionPopout(arguments[0].user.id)},onMouseLeave:()=>{$self.removeHoveringReactionPopout(arguments[0].user.id)},$2" } ]