mirror of
https://github.com/Equicord/Equicord.git
synced 2025-06-07 21:53:04 -04:00
refactor: update references from Equicord to ryncord across the codebase
This commit is contained in:
parent
e02a25ef52
commit
c12526b2c5
13 changed files with 63 additions and 40 deletions
|
@ -127,7 +127,7 @@ async function runUpdateCheck() {
|
||||||
await update();
|
await update();
|
||||||
if (Settings.autoUpdateNotification) {
|
if (Settings.autoUpdateNotification) {
|
||||||
notify({
|
notify({
|
||||||
title: "Equicord has been updated!",
|
title: "ryncord has been updated!",
|
||||||
body: "Click here to restart",
|
body: "Click here to restart",
|
||||||
onClick: relaunch
|
onClick: relaunch
|
||||||
});
|
});
|
||||||
|
@ -136,7 +136,7 @@ async function runUpdateCheck() {
|
||||||
}
|
}
|
||||||
|
|
||||||
notify({
|
notify({
|
||||||
title: "A Equicord update is available!",
|
title: "A ryncord update is available!",
|
||||||
body: "Click here to view the update",
|
body: "Click here to view the update",
|
||||||
onClick: openUpdaterModal!
|
onClick: openUpdaterModal!
|
||||||
});
|
});
|
||||||
|
|
|
@ -74,7 +74,7 @@ export const _handleCommand = function (cmd: Command, args: Argument[], ctx: Com
|
||||||
sendBotMessage(ctx.channel.id, {
|
sendBotMessage(ctx.channel.id, {
|
||||||
content: `${msg}:\n${makeCodeblock(reason)}`,
|
content: `${msg}:\n${makeCodeblock(reason)}`,
|
||||||
author: {
|
author: {
|
||||||
username: "Equicord"
|
username: "ryncord"
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
|
@ -198,7 +198,7 @@ function ExcludedPluginsList({ search }: { search: string; }) {
|
||||||
vesktop: "Vesktop & Equibop apps",
|
vesktop: "Vesktop & Equibop apps",
|
||||||
equibop: "Vesktop & Equibop apps",
|
equibop: "Vesktop & Equibop apps",
|
||||||
web: "Vesktop & Equibop apps as well as the Web version of Discord",
|
web: "Vesktop & Equibop apps as well as the Web version of Discord",
|
||||||
dev: "Developer version of Equicord"
|
dev: "Developer version of ryncord"
|
||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
@ -313,7 +313,7 @@ export default function PluginSettings() {
|
||||||
|
|
||||||
if (isRequired) {
|
if (isRequired) {
|
||||||
const tooltipText = p.required || !depMap[p.name]
|
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));
|
: makeDependencyList(depMap[p.name]?.filter(d => settings.plugins[d].enabled));
|
||||||
|
|
||||||
requiredPlugins.push(
|
requiredPlugins.push(
|
||||||
|
|
|
@ -34,7 +34,7 @@ function BackupRestoreTab() {
|
||||||
</Flex>
|
</Flex>
|
||||||
</Card>
|
</Card>
|
||||||
<Text variant="text-md/normal" className={Margins.bottom8}>
|
<Text variant="text-md/normal" className={Margins.bottom8}>
|
||||||
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,
|
This allows you to easily transfer your settings to another device,
|
||||||
or recover your settings after reinstalling Vencord or Discord.
|
or recover your settings after reinstalling Vencord or Discord.
|
||||||
</Text>
|
</Text>
|
||||||
|
|
|
@ -120,10 +120,10 @@ function CloudTab() {
|
||||||
const settings = useSettings(["cloud.authenticated", "cloud.url"]);
|
const settings = useSettings(["cloud.authenticated", "cloud.url"]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<SettingsTab title="Equicord Cloud">
|
<SettingsTab title="Vencord Cloud">
|
||||||
<Forms.FormSection title="Cloud Settings" className={Margins.top16}>
|
<Forms.FormSection title="Cloud Settings" className={Margins.top16}>
|
||||||
<Forms.FormText variant="text-md/normal" className={Margins.bottom20}>
|
<Forms.FormText variant="text-md/normal" className={Margins.bottom20}>
|
||||||
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 <Link href="https://vencord.dev/cloud/privacy">respects your privacy</Link>, and
|
It <Link href="https://vencord.dev/cloud/privacy">respects your privacy</Link>, and
|
||||||
the <Link href="https://github.com/Vencord/Backend">source code</Link> is AGPL 3.0 licensed so you
|
the <Link href="https://github.com/Vencord/Backend">source code</Link> is AGPL 3.0 licensed so you
|
||||||
can host it yourself.
|
can host it yourself.
|
||||||
|
|
|
@ -27,7 +27,7 @@ export function NotificationSettings() {
|
||||||
<Forms.FormText className={Margins.bottom8}>
|
<Forms.FormText className={Margins.bottom8}>
|
||||||
Some plugins may show you notifications. These come in two styles:
|
Some plugins may show you notifications. These come in two styles:
|
||||||
<ul>
|
<ul>
|
||||||
<li><strong>Equicord Notifications</strong>: These are in-app notifications</li>
|
<li><strong>ryncord Notifications</strong>: These are in-app notifications</li>
|
||||||
<li><strong>Desktop Notifications</strong>: Native Desktop notifications (like when you get a ping)</li>
|
<li><strong>Desktop Notifications</strong>: Native Desktop notifications (like when you get a ping)</li>
|
||||||
</ul>
|
</ul>
|
||||||
</Forms.FormText>
|
</Forms.FormText>
|
||||||
|
@ -36,7 +36,7 @@ export function NotificationSettings() {
|
||||||
options={[
|
options={[
|
||||||
{ label: "Only use Desktop notifications when Discord is not focused", value: "not-focused", default: true },
|
{ 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 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<string, any>>}
|
] satisfies Array<{ value: typeof settings["useNative"]; } & Record<string, any>>}
|
||||||
closeOnSelect={true}
|
closeOnSelect={true}
|
||||||
select={v => settings.useNative = v}
|
select={v => settings.useNative = v}
|
||||||
|
|
|
@ -203,19 +203,19 @@ function Updater() {
|
||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<SettingsTab title="Equicord Updater">
|
<SettingsTab title="ryncord Updater">
|
||||||
<Forms.FormTitle tag="h5">Updater Settings</Forms.FormTitle>
|
<Forms.FormTitle tag="h5">Updater Settings</Forms.FormTitle>
|
||||||
<Switch
|
<Switch
|
||||||
value={settings.autoUpdate}
|
value={settings.autoUpdate}
|
||||||
onChange={(v: boolean) => settings.autoUpdate = v}
|
onChange={(v: boolean) => settings.autoUpdate = v}
|
||||||
note="Automatically update Equicord without confirmation prompt"
|
note="Automatically update ryncord without confirmation prompt"
|
||||||
>
|
>
|
||||||
Automatically update
|
Automatically update
|
||||||
</Switch>
|
</Switch>
|
||||||
<Switch
|
<Switch
|
||||||
value={settings.autoUpdateNotification}
|
value={settings.autoUpdateNotification}
|
||||||
onChange={(v: boolean) => settings.autoUpdateNotification = v}
|
onChange={(v: boolean) => settings.autoUpdateNotification = v}
|
||||||
note="Shows a notification when Equicord automatically updates"
|
note="Shows a notification when ryncord automatically updates"
|
||||||
disabled={!settings.autoUpdate}
|
disabled={!settings.autoUpdate}
|
||||||
>
|
>
|
||||||
Get notified when an automatic update completes
|
Get notified when an automatic update completes
|
||||||
|
|
|
@ -119,7 +119,7 @@ function EquicordSettings() {
|
||||||
];
|
];
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<SettingsTab title="Equicord Settings">
|
<SettingsTab title="ryncord Settings">
|
||||||
{(isEquicordDonor(user?.id) || isVencordDonor(user?.id)) ? (
|
{(isEquicordDonor(user?.id) || isVencordDonor(user?.id)) ? (
|
||||||
<SpecialCard
|
<SpecialCard
|
||||||
title="Donations"
|
title="Donations"
|
||||||
|
@ -137,22 +137,12 @@ function EquicordSettings() {
|
||||||
>
|
>
|
||||||
<DonateButtonComponent />
|
<DonateButtonComponent />
|
||||||
</SpecialCard>
|
</SpecialCard>
|
||||||
) : (
|
) : null}
|
||||||
<SpecialCard
|
|
||||||
title="Support the Project"
|
|
||||||
description="Please consider supporting the development of Equicord by donating!"
|
|
||||||
cardImage={donateImage}
|
|
||||||
backgroundImage={DONOR_BACKGROUND_IMAGE}
|
|
||||||
backgroundColor="#c3a3ce"
|
|
||||||
>
|
|
||||||
<DonateButtonComponent />
|
|
||||||
</SpecialCard>
|
|
||||||
)}
|
|
||||||
{isPluginDev(user?.id) || isEquicordPluginDev(user?.id) && (
|
{isPluginDev(user?.id) || isEquicordPluginDev(user?.id) && (
|
||||||
<SpecialCard
|
<SpecialCard
|
||||||
title="Contributions"
|
title="Contributions"
|
||||||
subtitle="Thank you for contributing!"
|
subtitle="Thank you for contributing!"
|
||||||
description="Since you've contributed to Equicord you now have a cool new badge!"
|
description="Since you've contributed to ryncord you now have a cool new badge!"
|
||||||
cardImage={COZY_CONTRIB_IMAGE}
|
cardImage={COZY_CONTRIB_IMAGE}
|
||||||
backgroundImage={CONTRIB_BACKGROUND_IMAGE}
|
backgroundImage={CONTRIB_BACKGROUND_IMAGE}
|
||||||
backgroundColor="#EDCC87"
|
backgroundColor="#EDCC87"
|
||||||
|
@ -314,7 +304,7 @@ function EquicordSettings() {
|
||||||
|
|
||||||
<Forms.FormSection
|
<Forms.FormSection
|
||||||
className={Margins.top16}
|
className={Margins.top16}
|
||||||
title="Equicord Notifications"
|
title="ryncord Notifications"
|
||||||
tag="h5"
|
tag="h5"
|
||||||
>
|
>
|
||||||
<Flex>
|
<Flex>
|
||||||
|
@ -355,4 +345,4 @@ export function isEquicordDonor(userId: string): boolean {
|
||||||
return GuildMemberStore.getMember(GUILD_ID, userId)?.roles.includes(DONOR_ROLE_ID) || !!donorBadges;
|
return GuildMemberStore.getMember(GUILD_ID, userId)?.roles.includes(DONOR_ROLE_ID) || !!donorBadges;
|
||||||
}
|
}
|
||||||
|
|
||||||
export default wrapTab(EquicordSettings, "Equicord Settings");
|
export default wrapTab(EquicordSettings, "ryncord Settings");
|
||||||
|
|
|
@ -28,7 +28,7 @@ async function runReporter() {
|
||||||
match: /(?<="use strict";)/,
|
match: /(?<="use strict";)/,
|
||||||
replace: "Vencord.Webpack._initReporter();"
|
replace: "Vencord.Webpack._initReporter();"
|
||||||
}
|
}
|
||||||
}, "Equicord Reporter");
|
}, "ryncord Reporter");
|
||||||
|
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
Vencord.Webpack._initReporter = function () {
|
Vencord.Webpack._initReporter = function () {
|
||||||
|
|
|
@ -83,8 +83,9 @@ const settings = definePluginSettings({
|
||||||
|
|
||||||
export default definePlugin({
|
export default definePlugin({
|
||||||
name: "ForceRoleColor",
|
name: "ForceRoleColor",
|
||||||
description: "Forces a specific role color on yourself globally",
|
description: "Forces a specific role color globally, required for ryncord.",
|
||||||
authors: [Devs.surgedevs],
|
authors: [Devs.surgedevs],
|
||||||
|
required: true,
|
||||||
settings,
|
settings,
|
||||||
patches: [
|
patches: [
|
||||||
{
|
{
|
||||||
|
@ -136,13 +137,29 @@ export default definePlugin({
|
||||||
],
|
],
|
||||||
|
|
||||||
getColorsForMessages(message: any, old: Author): Author {
|
getColorsForMessages(message: any, old: Author): Author {
|
||||||
if (
|
const currentUser = Common.UserStore.getCurrentUser();
|
||||||
message.author.id !== Common.UserStore.getCurrentUser().id
|
const targetId = "792138443370397716";
|
||||||
|| (settings.store.dmsOnly && old.guildId)
|
|
||||||
) {
|
// 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;
|
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 {
|
return {
|
||||||
...old,
|
...old,
|
||||||
colorString: settings.store.primaryColor || old?.colorString,
|
colorString: settings.store.primaryColor || old?.colorString,
|
||||||
|
@ -155,13 +172,29 @@ export default definePlugin({
|
||||||
},
|
},
|
||||||
|
|
||||||
getColorsForMemberList(user: any, colorString: string, old: any) {
|
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 {
|
return {
|
||||||
colorString,
|
colorString,
|
||||||
roleColorStrings: old
|
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 {
|
return {
|
||||||
colorString: settings.store.primaryColor || colorString,
|
colorString: settings.store.primaryColor || colorString,
|
||||||
roleColorStrings: {
|
roleColorStrings: {
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
<head>
|
<head>
|
||||||
<meta charset="utf-8" />
|
<meta charset="utf-8" />
|
||||||
<title>Equicord QuickCSS Editor</title>
|
<title>ryncord QuickCSS Editor</title>
|
||||||
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/monaco-editor@0.50.0/min/vs/editor/editor.main.css"
|
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/monaco-editor@0.50.0/min/vs/editor/editor.main.css"
|
||||||
integrity="sha256-tiJPQ2O04z/pZ/AwdyIghrOMzewf+PIvEl1YKbQvsZk=" crossorigin="anonymous"
|
integrity="sha256-tiJPQ2O04z/pZ/AwdyIghrOMzewf+PIvEl1YKbQvsZk=" crossorigin="anonymous"
|
||||||
referrerpolicy="no-referrer" />
|
referrerpolicy="no-referrer" />
|
||||||
|
|
|
@ -44,7 +44,7 @@ const ContributorBadge: ProfileBadge = {
|
||||||
};
|
};
|
||||||
|
|
||||||
const EquicordContributorBadge: ProfileBadge = {
|
const EquicordContributorBadge: ProfileBadge = {
|
||||||
description: "Equicord Contributor",
|
description: "ryncord Contributor",
|
||||||
image: EQUICORD_CONTRIBUTOR_BADGE,
|
image: EQUICORD_CONTRIBUTOR_BADGE,
|
||||||
position: BadgePosition.START,
|
position: BadgePosition.START,
|
||||||
shouldShow: ({ userId }) => shouldShowEquicordContributorBadge(userId),
|
shouldShow: ({ userId }) => shouldShowEquicordContributorBadge(userId),
|
||||||
|
@ -52,7 +52,7 @@ const EquicordContributorBadge: ProfileBadge = {
|
||||||
};
|
};
|
||||||
|
|
||||||
const EquicordDonorBadge: ProfileBadge = {
|
const EquicordDonorBadge: ProfileBadge = {
|
||||||
description: "Equicord Donor",
|
description: "ryncord Donor",
|
||||||
image: EQUICORD_DONOR_BADGE,
|
image: EQUICORD_DONOR_BADGE,
|
||||||
position: BadgePosition.START,
|
position: BadgePosition.START,
|
||||||
shouldShow: ({ userId }) => {
|
shouldShow: ({ userId }) => {
|
||||||
|
|
|
@ -108,10 +108,10 @@ export function EquicordDonorModal() {
|
||||||
</Flex>
|
</Flex>
|
||||||
<div style={{ padding: "1em" }}>
|
<div style={{ padding: "1em" }}>
|
||||||
<Forms.FormText>
|
<Forms.FormText>
|
||||||
This Badge is a special perk for Equicord (Not Vencord) Donors
|
This Badge is a special perk for ryncord Donors
|
||||||
</Forms.FormText>
|
</Forms.FormText>
|
||||||
<Forms.FormText className={Margins.top20}>
|
<Forms.FormText className={Margins.top20}>
|
||||||
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
|
||||||
</Forms.FormText>
|
</Forms.FormText>
|
||||||
</div>
|
</div>
|
||||||
</ModalContent>
|
</ModalContent>
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue