From 36f78a80d32774875d370ec4da66453426598852 Mon Sep 17 00:00:00 2001 From: thororen1234 <78185467+thororen1234@users.noreply.github.com> Date: Sun, 28 Sep 2025 23:14:12 -0400 Subject: [PATCH 1/2] Add isAnyPluginDev For Sizing Down --- src/components/settings/tabs/vencord/index.tsx | 4 ++-- src/equicordplugins/vcSupport/index.ts | 4 ++-- src/plugins/_core/supportHelper.tsx | 14 +++++++------- src/utils/misc.ts | 2 ++ 4 files changed, 13 insertions(+), 11 deletions(-) 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) && ( 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}`; } From 4824993e9ad8c1f50370751c4656b7f6dfc9322d Mon Sep 17 00:00:00 2001 From: thororen1234 <78185467+thororen1234@users.noreply.github.com> Date: Sun, 28 Sep 2025 23:44:34 -0400 Subject: [PATCH 2/2] Fix Lint --- src/equicordplugins/toastNotifications/index.tsx | 15 ++++++++------- src/equicordplugins/toastNotifications/types.ts | 9 --------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/src/equicordplugins/toastNotifications/index.tsx b/src/equicordplugins/toastNotifications/index.tsx index b6433cdf3..006be4dce 100644 --- a/src/equicordplugins/toastNotifications/index.tsx +++ b/src/equicordplugins/toastNotifications/index.tsx @@ -20,12 +20,13 @@ import { definePluginSettings } from "@api/Settings"; import { EquicordDevs } from "@utils/constants"; import definePlugin, { makeRange, OptionType } from "@utils/types"; import { Channel, Message, User } from "@vencord/discord-types"; +import { MessageType } from "@vencord/discord-types/enums"; import { findByPropsLazy, findStore } from "@webpack"; import { Button, ChannelStore, GuildRoleStore, NavigationRouter, RelationshipStore, SelectedChannelStore, StreamerModeStore, UserStore } from "@webpack/common"; import { ReactNode } from "react"; import { NotificationData, showNotification } from "./components/Notifications"; -import { MessageTypes, RelationshipType, StreamingTreatment } from "./types"; +import { RelationshipType, StreamingTreatment } from "./types"; let ignoredUsers: string[] = []; let notifyFor: string[] = []; @@ -271,11 +272,11 @@ export default definePlugin({ // Handle specific message types. switch (message.type) { - case MessageTypes.CALL: { + case MessageType.CALL: { Notification.body = "Started a call with you!"; break; } - case MessageTypes.CHANNEL_RECIPIENT_ADD: { + case MessageType.RECIPIENT_ADD: { const actor = UserStore.getUser(message.author.id); const user = message.mentions[0]; const targetUser = UserStore.getUser((user as any).id); @@ -283,7 +284,7 @@ export default definePlugin({ Notification.body = `${getName(targetUser)} was added to the group by ${getName(actor)}.`; break; } - case MessageTypes.CHANNEL_RECIPIENT_REMOVE: { + case MessageType.RECIPIENT_REMOVE: { const actor = UserStore.getUser(message.author.id); const user = message.mentions[0]; const targetUser = UserStore.getUser((user as any).id); @@ -295,15 +296,15 @@ export default definePlugin({ } break; } - case MessageTypes.CHANNEL_NAME_CHANGE: { + case MessageType.CHANNEL_NAME_CHANGE: { Notification.body = `Changed the channel name to '${message.content}'.`; break; } - case MessageTypes.CHANNEL_ICON_CHANGE: { + case MessageType.CHANNEL_ICON_CHANGE: { Notification.body = "Changed the channel icon."; break; } - case MessageTypes.CHANNEL_PINNED_MESSAGE: { + case MessageType.CHANNEL_PINNED_MESSAGE: { Notification.body = "Pinned a message."; break; } diff --git a/src/equicordplugins/toastNotifications/types.ts b/src/equicordplugins/toastNotifications/types.ts index d3c444f16..4959fe853 100644 --- a/src/equicordplugins/toastNotifications/types.ts +++ b/src/equicordplugins/toastNotifications/types.ts @@ -16,15 +16,6 @@ * along with this program. If not, see . */ -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,