From c52a9a1cc4135caef3e2937888e4d257496f493b Mon Sep 17 00:00:00 2001 From: coolesding <71647195+coolesding@users.noreply.github.com> Date: Thu, 9 May 2024 20:13:44 +0200 Subject: [PATCH] feat(SupportHelper): Updates * Remove insults and slander Also removes blocking people from getting help (great play) * Fix --------- Co-authored-by: thororen <78185467+thororen1234@users.noreply.github.com> --- src/plugins/_core/supportHelper.tsx | 52 ++++++++++++++--------------- 1 file changed, 25 insertions(+), 27 deletions(-) diff --git a/src/plugins/_core/supportHelper.tsx b/src/plugins/_core/supportHelper.tsx index e8e6f178..0a8b3be3 100644 --- a/src/plugins/_core/supportHelper.tsx +++ b/src/plugins/_core/supportHelper.tsx @@ -16,11 +16,12 @@ * along with this program. If not, see . */ +import ErrorBoundary from "@components/ErrorBoundary"; import { Link } from "@components/Link"; import { openUpdaterModal } from "@components/VencordSettings/UpdaterTab"; import { Devs, EquicordDevs, SUPPORT_CHANNEL_ID, SUPPORT_CHANNEL_IDS, VC_SUPPORT_CHANNEL_ID } from "@utils/constants"; -import { isEquicordPluginDev, isPluginDev } from "@utils/misc"; import { Margins } from "@utils/margins"; +import { isEquicordPluginDev, isPluginDev } from "@utils/misc"; import { relaunch } from "@utils/native"; import { makeCodeblock } from "@utils/text"; import definePlugin from "@utils/types"; @@ -31,9 +32,9 @@ import gitHash from "~git-hash"; import plugins from "~plugins"; import settings from "./settings"; -import ErrorBoundary from "@components/ErrorBoundary"; const VENCORD_GUILD_ID = "1015060230222131221"; +const EQUICORD_GUILD_ID = "1015060230222131221"; const AllowedChannelIds = [ SUPPORT_CHANNEL_ID, @@ -45,13 +46,16 @@ const TrustedRolesIds = [ "1026534353167208489", // contributor "1026504932959977532", // regular "1042507929485586532", // donor + "1173520023239786538", // Equicord Team + "1222677964760682556", // Equicord Contributor + "1173343399470964856", // Vencord Contributor ]; export default definePlugin({ name: "SupportHelper", required: true, description: "Helps us provide support to you", - authors: [Devs.Ven, EquicordDevs.thororen], + authors: [Devs.Ven, EquicordDevs.thororen, EquicordDevs.coolesding], dependencies: ["CommandsAPI"], patches: [{ @@ -112,21 +116,17 @@ ${makeCodeblock(enabledPlugins.join(", "))} async CHANNEL_SELECT({ channelId }) { if (!SUPPORT_CHANNEL_IDS.includes(channelId)) return; - if (channelId === VC_SUPPORT_CHANNEL_ID && Vencord.Plugins.isPluginEnabled("VCSupport")) return Alerts.show({ + if (channelId === VC_SUPPORT_CHANNEL_ID) return Alerts.show({ title: "You are entering the support channel!", body:
- Are you sure you want to do this? - The support channel is full of brainrotted idiots, - potentially including you! - Are you sure you're up to date with upstream? - Are you ready to endure other people's brainrot? -
, - confirmText: "Get mental health support", - onConfirm: () => history.back() + Before you ask for help, + Check for updates and if this + issue could be caused by Equicord! + }); const selfId = UserStore.getCurrentUser()?.id; @@ -136,7 +136,7 @@ ${makeCodeblock(enabledPlugins.join(", "))} return Alerts.show({ title: "Hold on!", body:
- You are using an outdated version of Vencord! Chances are, your issue is already fixed. + You are using an outdated version of Equicord! Chances are, your issue is already fixed. Please first update before asking for support! @@ -153,20 +153,19 @@ ${makeCodeblock(enabledPlugins.join(", "))} } // @ts-ignore outdated type - const roles = GuildMemberStore.getSelfMember(VENCORD_GUILD_ID)?.roles; + const roles = GuildMemberStore.getSelfMember(VENCORD_GUILD_ID)?.roles || GuildMemberStore.getSelfMember(EQUICORD_GUILD_ID)?.roles; if (!roles || TrustedRolesIds.some(id => roles.includes(id))) return; if (!IS_WEB && IS_UPDATER_DISABLED) { return Alerts.show({ title: "Hold on!", body:
- You are using an externally updated Vencord version, which we do not provide support for! + You are using an externally updated Equicord version, the ability to help you here may be limited. - Please either switch to an officially supported version of Vencord, or - contact your package maintainer for support instead. + Please join the Equicord Server for support, + or if this issue persists on Vencord, continue on. -
, - onCloseCallback: () => setTimeout(() => NavigationRouter.back(), 50) +
}); } @@ -175,27 +174,26 @@ ${makeCodeblock(enabledPlugins.join(", "))} return Alerts.show({ title: "Hold on!", body:
- You are using a fork of Vencord, which we do not provide support for! + You are running a modified version of Vencord. - Please either switch to an officially supported version of Vencord, or - contact your package maintainer for support instead. + Please join the Equicord Server for support, + or if this issue persists on Vencord, continue on. -
, - onCloseCallback: () => setTimeout(() => NavigationRouter.back(), 50) + }); } } }, ContributorDmWarningCard: ErrorBoundary.wrap(({ userId }) => { - if (!isPluginDev(userId)) return null; + if (!isPluginDev(userId) || !isEquicordPluginDev(userId)) return null; if (RelationshipStore.isFriend(userId)) return null; return ( - Please do not private message Vencord plugin developers for support! + Please do not private message plugin developers for support!
- Instead, use the Vencord support channel: {Parser.parse("https://discord.com/channels/1015060230222131221/1026515880080842772")} + Instead, use the support channel: {Parser.parse("https://discord.com/channels/1173279886065029291/1173342942858055721")} {!ChannelStore.getChannel(SUPPORT_CHANNEL_ID) && " (Click the link to join)"} );