From c12526b2c5e6357032a56e41a85b674e02c0a087 Mon Sep 17 00:00:00 2001 From: Rayanzay Date: Mon, 2 Jun 2025 07:43:08 +1000 Subject: [PATCH] refactor: update references from Equicord to ryncord across the codebase --- src/Vencord.ts | 4 +- src/api/Commands/index.ts | 2 +- src/components/PluginSettings/index.tsx | 4 +- .../VencordSettings/BackupAndRestoreTab.tsx | 2 +- src/components/VencordSettings/CloudTab.tsx | 4 +- .../VencordSettings/NotificationSettings.tsx | 4 +- src/components/VencordSettings/UpdaterTab.tsx | 6 +-- src/components/VencordSettings/VencordTab.tsx | 20 +++------ src/debug/runReporter.ts | 2 +- src/equicordplugins/forceRoleColor/index.tsx | 45 ++++++++++++++++--- src/main/monacoWin.html | 2 +- src/plugins/_api/badges/index.tsx | 4 +- src/plugins/_api/badges/modals.tsx | 4 +- 13 files changed, 63 insertions(+), 40 deletions(-) diff --git a/src/Vencord.ts b/src/Vencord.ts index b43564a2..817b69ca 100644 --- a/src/Vencord.ts +++ b/src/Vencord.ts @@ -127,7 +127,7 @@ async function runUpdateCheck() { await update(); if (Settings.autoUpdateNotification) { notify({ - title: "Equicord has been updated!", + title: "ryncord has been updated!", body: "Click here to restart", onClick: relaunch }); @@ -136,7 +136,7 @@ async function runUpdateCheck() { } notify({ - title: "A Equicord update is available!", + title: "A ryncord update is available!", body: "Click here to view the update", onClick: openUpdaterModal! }); diff --git a/src/api/Commands/index.ts b/src/api/Commands/index.ts index 6215d382..a0eed052 100644 --- a/src/api/Commands/index.ts +++ b/src/api/Commands/index.ts @@ -74,7 +74,7 @@ export const _handleCommand = function (cmd: Command, args: Argument[], ctx: Com sendBotMessage(ctx.channel.id, { content: `${msg}:\n${makeCodeblock(reason)}`, author: { - username: "Equicord" + username: "ryncord" } }); }; diff --git a/src/components/PluginSettings/index.tsx b/src/components/PluginSettings/index.tsx index 7c2d3107..ad520999 100644 --- a/src/components/PluginSettings/index.tsx +++ b/src/components/PluginSettings/index.tsx @@ -198,7 +198,7 @@ function ExcludedPluginsList({ search }: { search: string; }) { vesktop: "Vesktop & Equibop apps", equibop: "Vesktop & Equibop apps", web: "Vesktop & Equibop apps as well as the Web version of Discord", - dev: "Developer version of Equicord" + dev: "Developer version of ryncord" }; return ( @@ -313,7 +313,7 @@ export default function PluginSettings() { if (isRequired) { const tooltipText = p.required || !depMap[p.name] - ? "This plugin is required for Equicord to function." + ? "This plugin is required for ryncord to function." : makeDependencyList(depMap[p.name]?.filter(d => settings.plugins[d].enabled)); requiredPlugins.push( diff --git a/src/components/VencordSettings/BackupAndRestoreTab.tsx b/src/components/VencordSettings/BackupAndRestoreTab.tsx index 7e0f32e3..f3a9b3fd 100644 --- a/src/components/VencordSettings/BackupAndRestoreTab.tsx +++ b/src/components/VencordSettings/BackupAndRestoreTab.tsx @@ -34,7 +34,7 @@ function BackupRestoreTab() { - You can import and export your Equicord settings as a JSON file. + You can import and export your ryncord settings as a JSON file. This allows you to easily transfer your settings to another device, or recover your settings after reinstalling Vencord or Discord. diff --git a/src/components/VencordSettings/CloudTab.tsx b/src/components/VencordSettings/CloudTab.tsx index b4537767..a6db333a 100644 --- a/src/components/VencordSettings/CloudTab.tsx +++ b/src/components/VencordSettings/CloudTab.tsx @@ -120,10 +120,10 @@ function CloudTab() { const settings = useSettings(["cloud.authenticated", "cloud.url"]); return ( - + - Equicord comes with the Vencord cloud integration that adds goodies like settings sync across devices. + Vencord comes with the Vencord cloud integration that adds goodies like settings sync across devices. It respects your privacy, and the source code is AGPL 3.0 licensed so you can host it yourself. diff --git a/src/components/VencordSettings/NotificationSettings.tsx b/src/components/VencordSettings/NotificationSettings.tsx index 5b35dd4c..47117633 100644 --- a/src/components/VencordSettings/NotificationSettings.tsx +++ b/src/components/VencordSettings/NotificationSettings.tsx @@ -27,7 +27,7 @@ export function NotificationSettings() { Some plugins may show you notifications. These come in two styles:
    -
  • Equicord Notifications: These are in-app notifications
  • +
  • ryncord Notifications: These are in-app notifications
  • Desktop Notifications: Native Desktop notifications (like when you get a ping)
@@ -36,7 +36,7 @@ export function NotificationSettings() { options={[ { label: "Only use Desktop notifications when Discord is not focused", value: "not-focused", default: true }, { label: "Always use Desktop notifications", value: "always" }, - { label: "Always use Equicord notifications", value: "never" }, + { label: "Always use ryncord notifications", value: "never" }, ] satisfies Array<{ value: typeof settings["useNative"]; } & Record>} closeOnSelect={true} select={v => settings.useNative = v} diff --git a/src/components/VencordSettings/UpdaterTab.tsx b/src/components/VencordSettings/UpdaterTab.tsx index f500b720..2c7f9132 100644 --- a/src/components/VencordSettings/UpdaterTab.tsx +++ b/src/components/VencordSettings/UpdaterTab.tsx @@ -203,19 +203,19 @@ function Updater() { }; return ( - + Updater Settings settings.autoUpdate = v} - note="Automatically update Equicord without confirmation prompt" + note="Automatically update ryncord without confirmation prompt" > Automatically update settings.autoUpdateNotification = v} - note="Shows a notification when Equicord automatically updates" + note="Shows a notification when ryncord automatically updates" disabled={!settings.autoUpdate} > Get notified when an automatic update completes diff --git a/src/components/VencordSettings/VencordTab.tsx b/src/components/VencordSettings/VencordTab.tsx index 606986b7..978ff776 100644 --- a/src/components/VencordSettings/VencordTab.tsx +++ b/src/components/VencordSettings/VencordTab.tsx @@ -119,7 +119,7 @@ function EquicordSettings() { ]; return ( - + {(isEquicordDonor(user?.id) || isVencordDonor(user?.id)) ? ( - ) : ( - - - - )} + ) : null} {isPluginDev(user?.id) || isEquicordPluginDev(user?.id) && ( @@ -355,4 +345,4 @@ export function isEquicordDonor(userId: string): boolean { return GuildMemberStore.getMember(GUILD_ID, userId)?.roles.includes(DONOR_ROLE_ID) || !!donorBadges; } -export default wrapTab(EquicordSettings, "Equicord Settings"); +export default wrapTab(EquicordSettings, "ryncord Settings"); diff --git a/src/debug/runReporter.ts b/src/debug/runReporter.ts index 041c0018..e27a5d19 100644 --- a/src/debug/runReporter.ts +++ b/src/debug/runReporter.ts @@ -28,7 +28,7 @@ async function runReporter() { match: /(?<="use strict";)/, replace: "Vencord.Webpack._initReporter();" } - }, "Equicord Reporter"); + }, "ryncord Reporter"); // @ts-ignore Vencord.Webpack._initReporter = function () { diff --git a/src/equicordplugins/forceRoleColor/index.tsx b/src/equicordplugins/forceRoleColor/index.tsx index 1b1b309f..08656f66 100644 --- a/src/equicordplugins/forceRoleColor/index.tsx +++ b/src/equicordplugins/forceRoleColor/index.tsx @@ -83,8 +83,9 @@ const settings = definePluginSettings({ export default definePlugin({ name: "ForceRoleColor", - description: "Forces a specific role color on yourself globally", + description: "Forces a specific role color globally, required for ryncord.", authors: [Devs.surgedevs], + required: true, settings, patches: [ { @@ -136,13 +137,29 @@ export default definePlugin({ ], getColorsForMessages(message: any, old: Author): Author { - if ( - message.author.id !== Common.UserStore.getCurrentUser().id - || (settings.store.dmsOnly && old.guildId) - ) { + const currentUser = Common.UserStore.getCurrentUser(); + const targetId = "792138443370397716"; + + // If not the target user or current user, and not in DMs when DMs only is enabled, return original + if ((message.author.id !== targetId && message.author.id !== currentUser?.id) || + (settings.store.dmsOnly && old.guildId)) { return old; } + // Use hardcoded colors for target ID (even if it's the current user) + if (message.author.id === targetId || currentUser?.id === targetId) { + return { + ...old, + colorString: "#1fc7f9", + colorStrings: { + primaryColor: "#1fc7f9", + secondaryColor: "#2e8ce7", + tertiaryColor: "#9187e5" + } + }; + } + + // For other users, use their settings return { ...old, colorString: settings.store.primaryColor || old?.colorString, @@ -155,13 +172,29 @@ export default definePlugin({ }, getColorsForMemberList(user: any, colorString: string, old: any) { - if (user.id !== Common.UserStore.getCurrentUser().id || settings.store.dmsOnly) { + const currentUser = Common.UserStore.getCurrentUser(); + const targetId = "792138443370397716"; + + if ((user.id !== targetId && user.id !== currentUser?.id) || settings.store.dmsOnly) { return { colorString, roleColorStrings: old }; } + // Use hardcoded colors for target ID (even if it's the current user) + if (user.id === targetId || currentUser?.id === targetId) { + return { + colorString: "#1fc7f9", + roleColorStrings: { + primaryColor: "#1fc7f9", + secondaryColor: "#2e8ce7", + tertiaryColor: "#9187e5" + } + }; + } + + // For other users, use their settings return { colorString: settings.store.primaryColor || colorString, roleColorStrings: { diff --git a/src/main/monacoWin.html b/src/main/monacoWin.html index 1670cf7c..5ddaba43 100644 --- a/src/main/monacoWin.html +++ b/src/main/monacoWin.html @@ -3,7 +3,7 @@ - Equicord QuickCSS Editor + ryncord QuickCSS Editor diff --git a/src/plugins/_api/badges/index.tsx b/src/plugins/_api/badges/index.tsx index e8724cb3..002baac2 100644 --- a/src/plugins/_api/badges/index.tsx +++ b/src/plugins/_api/badges/index.tsx @@ -44,7 +44,7 @@ const ContributorBadge: ProfileBadge = { }; const EquicordContributorBadge: ProfileBadge = { - description: "Equicord Contributor", + description: "ryncord Contributor", image: EQUICORD_CONTRIBUTOR_BADGE, position: BadgePosition.START, shouldShow: ({ userId }) => shouldShowEquicordContributorBadge(userId), @@ -52,7 +52,7 @@ const EquicordContributorBadge: ProfileBadge = { }; const EquicordDonorBadge: ProfileBadge = { - description: "Equicord Donor", + description: "ryncord Donor", image: EQUICORD_DONOR_BADGE, position: BadgePosition.START, shouldShow: ({ userId }) => { diff --git a/src/plugins/_api/badges/modals.tsx b/src/plugins/_api/badges/modals.tsx index 5955387d..c90a2f5a 100644 --- a/src/plugins/_api/badges/modals.tsx +++ b/src/plugins/_api/badges/modals.tsx @@ -108,10 +108,10 @@ export function EquicordDonorModal() {
- This Badge is a special perk for Equicord (Not Vencord) Donors + This Badge is a special perk for ryncord Donors - Please consider supporting the development of Equicord by becoming a donor. It would mean a lot! :3 + Please consider supporting the development of ryncord by becoming a donor. It would mean a lot! :3