diff --git a/src/components/settings/tabs/vencord/index.tsx b/src/components/settings/tabs/vencord/index.tsx index 8a745ba10..a9a242665 100644 --- a/src/components/settings/tabs/vencord/index.tsx +++ b/src/components/settings/tabs/vencord/index.tsx @@ -16,7 +16,7 @@ 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, isEquicordPluginDev, isPluginDev } from "@utils/misc"; +import { identity, isAnyPluginDev } from "@utils/misc"; import { relaunch } from "@utils/native"; import { Button, Flex, Forms, GuildMemberStore, React, Select, Switch, UserStore } from "@webpack/common"; import BadgeAPI from "plugins/_api/badges"; @@ -139,7 +139,7 @@ function EquicordSettings() { )} - {isPluginDev(user?.id) || isEquicordPluginDev(user?.id) && ( + {isAnyPluginDev(user?.id) && ( . */ -export const enum MessageTypes { - CHANNEL_RECIPIENT_ADD = 1, - CHANNEL_RECIPIENT_REMOVE = 2, - CALL = 3, - CHANNEL_NAME_CHANGE = 4, - CHANNEL_ICON_CHANGE = 5, - CHANNEL_PINNED_MESSAGE = 6, -} - export const enum RelationshipType { FRIEND = 1, BLOCKED = 2, diff --git a/src/equicordplugins/vcSupport/index.ts b/src/equicordplugins/vcSupport/index.ts index 391462061..d26b94868 100644 --- a/src/equicordplugins/vcSupport/index.ts +++ b/src/equicordplugins/vcSupport/index.ts @@ -5,7 +5,7 @@ */ import { Devs, EquicordDevs } from "@utils/constants"; -import { isEquicordPluginDev, isPluginDev } from "@utils/misc"; +import { isAnyPluginDev } from "@utils/misc"; import definePlugin from "@utils/types"; import { UserStore } from "@webpack/common"; @@ -16,7 +16,7 @@ export default definePlugin({ required: true, start() { const selfId = UserStore.getCurrentUser()?.id; - if (isPluginDev(selfId) || isEquicordPluginDev(selfId)) { + if (isAnyPluginDev(selfId)) { Vencord.Settings.plugins.VCSupport.enabled = false; } else { Vencord.Settings.plugins.VCSupport.enabled = true; diff --git a/src/plugins/_core/supportHelper.tsx b/src/plugins/_core/supportHelper.tsx index 61aad3b72..b320eab7b 100644 --- a/src/plugins/_core/supportHelper.tsx +++ b/src/plugins/_core/supportHelper.tsx @@ -27,7 +27,7 @@ import { CONTRIB_ROLE_ID, Devs, DONOR_ROLE_ID, EQUIBOP_CONTRIB_ROLE_ID, EQUICORD import { sendMessage } from "@utils/discord"; import { Logger } from "@utils/Logger"; import { Margins } from "@utils/margins"; -import { isEquicordGuild, isEquicordPluginDev, isEquicordSupport, isPluginDev, isSupportChannel, tryOrElse } from "@utils/misc"; +import { isAnyPluginDev, isEquicordGuild, isEquicordSupport, isSupportChannel, tryOrElse } from "@utils/misc"; import { relaunch } from "@utils/native"; import { onlyOnce } from "@utils/onlyOnce"; import { makeCodeblock } from "@utils/text"; @@ -167,7 +167,7 @@ function generatePluginList() { const user = UserStore.getCurrentUser(); - if (enabledPlugins.length > 100 && !(isPluginDev(user.id) || isEquicordPluginDev(user.id))) { + if (enabledPlugins.length > 100 && !isAnyPluginDev(user.id)) { Alerts.show({ title: "You are attempting to get support!", body:
@@ -220,14 +220,14 @@ export default definePlugin({ name: "equicord-debug", description: "Send Equicord debug info", // @ts-ignore - predicate: ctx => isPluginDev(UserStore.getCurrentUser()?.id) || isEquicordPluginDev(UserStore.getCurrentUser()?.id) || isEquicordGuild(ctx?.guild?.id, true), + predicate: ctx => isAnyPluginDev(UserStore.getCurrentUser()?.id) || isEquicordGuild(ctx?.guild?.id, true), execute: async () => ({ content: await generateDebugInfoMessage() }) }, { name: "equicord-plugins", description: "Send Equicord plugin list", // @ts-ignore - predicate: ctx => isPluginDev(UserStore.getCurrentUser()?.id) || isEquicordPluginDev(UserStore.getCurrentUser()?.id) || isEquicordGuild(ctx?.guild?.id, true), + predicate: ctx => isAnyPluginDev(UserStore.getCurrentUser()?.id) || isEquicordGuild(ctx?.guild?.id, true), execute: () => { const pluginList = generatePluginList(); return { content: typeof pluginList === "string" ? pluginList : "Unable to generate plugin list." }; @@ -241,7 +241,7 @@ export default definePlugin({ if (!isSupportChannel) return; const selfId = UserStore.getCurrentUser()?.id; - if (!selfId || isPluginDev(selfId) || isEquicordPluginDev(selfId)) return; + if (!selfId || isAnyPluginDev(selfId)) return; if (VC_SUPPORT_CHANNEL_IDS.includes(channelId) && Vencord.Plugins.isPluginEnabled("VCSupport") && !clicked) { return Alerts.show({ title: "You are entering the support channel!", @@ -418,8 +418,8 @@ export default definePlugin({ renderContributorDmWarningCard: ErrorBoundary.wrap(({ channel }) => { const userId = channel.getRecipientId(); - if (!isPluginDev(userId) || !isEquicordPluginDev(userId)) return null; - if (RelationshipStore.isFriend(userId) || isPluginDev(UserStore.getCurrentUser()?.id) || isEquicordPluginDev(UserStore.getCurrentUser()?.id)) return null; + if (!isAnyPluginDev(userId)) return null; + if (RelationshipStore.isFriend(userId) || isAnyPluginDev(UserStore.getCurrentUser()?.id)) return null; return ( diff --git a/src/utils/misc.ts b/src/utils/misc.ts index 7939dc84e..377282e33 100644 --- a/src/utils/misc.ts +++ b/src/utils/misc.ts @@ -97,6 +97,8 @@ export const shouldShowContributorBadge = (id: string) => isPluginDev(id) && Ven export const isEquicordPluginDev = (id: string) => Object.hasOwn(EquicordDevsById, id); export const shouldShowEquicordContributorBadge = (id: string) => isEquicordPluginDev(id) && EquicordDevsById[id].badge !== false; +export const isAnyPluginDev = (id: string) => Object.hasOwn(VencordDevsById, id) || Object.hasOwn(EquicordDevsById, id); + export function pluralise(amount: number, singular: string, plural = singular + "s") { return amount === 1 ? `${amount} ${singular}` : `${amount} ${plural}`; }