diff --git a/src/components/settings/tabs/vencord/index.tsx b/src/components/settings/tabs/vencord/index.tsx index 478ad3b37..8a745ba10 100644 --- a/src/components/settings/tabs/vencord/index.tsx +++ b/src/components/settings/tabs/vencord/index.tsx @@ -8,22 +8,21 @@ import "./VencordTab.css"; import { openNotificationLogModal } from "@api/Notifications/notificationLog"; import { useSettings } from "@api/Settings"; -import { classNameFactory } from "@api/Styles"; import { FolderIcon, GithubIcon, LogIcon, PaintbrushIcon, RestartIcon } from "@components/Icons"; import { openContributorModal, openPluginModal, SettingsTab, wrapTab } from "@components/settings"; import { DonateButton, InviteButton } from "@components/settings/DonateButton"; import { QuickAction, QuickActionCard } from "@components/settings/QuickAction"; import { SpecialCard } from "@components/settings/SpecialCard"; import { gitRemote } from "@shared/vencordUserAgent"; +import { DONOR_ROLE_ID, GUILD_ID, VC_DONOR_ROLE_ID, VC_GUILD_ID } from "@utils/constants"; import { Margins } from "@utils/margins"; -import { identity, isEquicordDonor, isEquicordPluginDev, isPluginDev, isVencordDonor } from "@utils/misc"; +import { identity, isEquicordPluginDev, isPluginDev } from "@utils/misc"; import { relaunch } from "@utils/native"; -import { Button, Flex, Forms, React, Select, Switch, UserStore } from "@webpack/common"; +import { Button, Flex, Forms, GuildMemberStore, React, Select, Switch, UserStore } from "@webpack/common"; +import BadgeAPI from "plugins/_api/badges"; import { openNotificationSettingsModal } from "./NotificationSettings"; -const cl = classNameFactory("vc-settings-"); - const DEFAULT_DONATE_IMAGE = "https://cdn.discordapp.com/emojis/1026533090627174460.png"; const SHIGGY_DONATE_IMAGE = "https://i.imgur.com/57ATLZu.png"; @@ -338,3 +337,13 @@ function DonateButtonComponent() { } export default wrapTab(EquicordSettings, "Equicord Settings"); + +export function isEquicordDonor(userId: string): boolean { + const donorBadges = BadgeAPI.getEquicordDonorBadges(userId); + return GuildMemberStore.getMember(GUILD_ID, userId)?.roles.includes(DONOR_ROLE_ID) || !!donorBadges; +} + +export function isVencordDonor(userId: string): boolean { + const donorBadges = BadgeAPI.getDonorBadges(userId); + return GuildMemberStore.getMember(VC_GUILD_ID, userId)?.roles.includes(VC_DONOR_ROLE_ID) || !!donorBadges; +} diff --git a/src/plugins/_api/badges/index.tsx b/src/plugins/_api/badges/index.tsx index 006885fda..4423b69a3 100644 --- a/src/plugins/_api/badges/index.tsx +++ b/src/plugins/_api/badges/index.tsx @@ -21,9 +21,10 @@ import "./fixDiscordBadgePadding.css"; import { _getBadges, BadgePosition, BadgeUserArgs, ProfileBadge } from "@api/Badges"; import ErrorBoundary from "@components/ErrorBoundary"; import { openContributorModal } from "@components/settings/tabs"; +import { isEquicordDonor } from "@components/settings/tabs/vencord"; import { Devs } from "@utils/constants"; import { Logger } from "@utils/Logger"; -import { copyWithToast, isEquicordDonor, shouldShowContributorBadge, shouldShowEquicordContributorBadge } from "@utils/misc"; +import { copyWithToast, shouldShowContributorBadge, shouldShowEquicordContributorBadge } from "@utils/misc"; import definePlugin from "@utils/types"; import { User } from "@vencord/discord-types"; import { ContextMenuApi, Menu, Toasts, UserStore } from "@webpack/common"; diff --git a/src/utils/misc.ts b/src/utils/misc.ts index cbeb35728..7939dc84e 100644 --- a/src/utils/misc.ts +++ b/src/utils/misc.ts @@ -17,10 +17,9 @@ */ import { ChannelStore, GuildMemberStore, Toasts } from "@webpack/common"; -import BadgeAPI from "plugins/_api/badges"; import { copyToClipboard } from "./clipboard"; -import { DONOR_ROLE_ID, EQUICORD_HELPERS, EquicordDevsById, GUILD_ID, SUPPORT_CHANNEL_ID, VC_DONOR_ROLE_ID, VC_GUILD_ID, VencordDevsById } from "./constants"; +import { EQUICORD_HELPERS, EquicordDevsById, GUILD_ID, SUPPORT_CHANNEL_ID, VencordDevsById } from "./constants"; /** * Calls .join(" ") on the arguments @@ -133,13 +132,3 @@ export function isEquicordSupport(userId: string): boolean { const member = GuildMemberStore.getMember(GUILD_ID, userId); return member?.roles?.includes(EQUICORD_HELPERS) || false; } - -export function isEquicordDonor(userId: string): boolean { - const donorBadges = BadgeAPI.getEquicordDonorBadges(userId); - return GuildMemberStore.getMember(GUILD_ID, userId)?.roles.includes(DONOR_ROLE_ID) || !!donorBadges; -} - -export function isVencordDonor(userId: string): boolean { - const donorBadges = BadgeAPI.getDonorBadges(userId); - return GuildMemberStore.getMember(VC_GUILD_ID, userId)?.roles.includes(VC_DONOR_ROLE_ID) || !!donorBadges; -}