Some porting

This commit is contained in:
thororen1234 2024-07-13 00:06:01 -04:00
parent 89c4e489f5
commit ea8c134159
24 changed files with 111 additions and 100 deletions

1
.gitignore vendored
View file

@ -3,6 +3,7 @@ node_modules
*.exe *.exe
vencord_installer vencord_installer
equicord_installer
.idea .idea
.DS_Store .DS_Store

View file

@ -37,7 +37,7 @@ const NOOP_ASYNC = async () => { };
const setCssDebounced = debounce((css: string) => VencordNative.quickCss.set(css)); const setCssDebounced = debounce((css: string) => VencordNative.quickCss.set(css));
const themeStore = DataStore.createStore("VencordThemes", "VencordThemeData"); const themeStore = DataStore.createStore("EquicordThemes", "VencordThemeData");
// probably should make this less cursed at some point // probably should make this less cursed at some point
window.VencordNative = { window.VencordNative = {
@ -98,13 +98,13 @@ window.VencordNative = {
settings: { settings: {
get: () => { get: () => {
try { try {
return JSON.parse(localStorage.getItem("VencordSettings") || "{}"); return JSON.parse(localStorage.getItem("EquicordSettings") || "{}");
} catch (e) { } catch (e) {
console.error("Failed to parse settings from localStorage: ", e); console.error("Failed to parse settings from localStorage: ", e);
return {}; return {};
} }
}, },
set: async (s: Settings) => localStorage.setItem("VencordSettings", JSON.stringify(s)), set: async (s: Settings) => localStorage.setItem("EquicordSettings", JSON.stringify(s)),
getSettingsDir: async () => "LocalStorage" getSettingsDir: async () => "LocalStorage"
}, },

View file

@ -1,10 +1,10 @@
// ==UserScript== // ==UserScript==
// @name Vencord // @name Equicord
// @description A Discord client mod - Web version // @description A Discord client mod - Web version
// @version %version% // @version %version%
// @author Vendicated (https://github.com/Vendicated) // @author Equicord (https://github.com/Equicord)
// @namespace https://github.com/Vendicated/Vencord // @namespace https://github.com/Equicord/Equicord
// @supportURL https://github.com/Vendicated/Vencord // @supportURL https://github.com/Equicord/Equicord
// @license GPL-3.0 // @license GPL-3.0
// @match *://*.discord.com/* // @match *://*.discord.com/*
// @grant GM_xmlhttpRequest // @grant GM_xmlhttpRequest
@ -21,4 +21,4 @@
// to overwrite stuff on the window on sites that use CSP. Use Tampermonkey or use a chromium based browser // to overwrite stuff on the window on sites that use CSP. Use Tampermonkey or use a chromium based browser
// https://github.com/violentmonkey/violentmonkey/issues/997 // https://github.com/violentmonkey/violentmonkey/issues/997
// this is a compiled and minified version of Vencord. For the source code, visit the GitHub repo // this is a compiled and minified version of Equicord. For the source code, visit the GitHub repo

View file

@ -42,11 +42,11 @@ export const IS_REPORTER = process.argv.includes("--reporter");
export const IS_STANDALONE = process.argv.includes("--standalone"); export const IS_STANDALONE = process.argv.includes("--standalone");
export const IS_UPDATER_DISABLED = process.argv.includes("--disable-updater"); export const IS_UPDATER_DISABLED = process.argv.includes("--disable-updater");
export const gitHash = process.env.VENCORD_HASH || execSync("git rev-parse --short HEAD", { encoding: "utf-8" }).trim(); export const gitHash = process.env.EQUICORD_HASH || execSync("git rev-parse --short HEAD", { encoding: "utf-8" }).trim();
export const banner = { export const banner = {
js: ` js: `
// Vencord ${gitHash} // Equicord ${gitHash}
// Standalone: ${IS_STANDALONE} // Standalone: ${IS_STANDALONE}
// Platform: ${IS_STANDALONE === false ? process.platform : "Universal"} // Platform: ${IS_STANDALONE === false ? process.platform : "Universal"}
// Updater Disabled: ${IS_UPDATER_DISABLED} // Updater Disabled: ${IS_UPDATER_DISABLED}
@ -191,7 +191,7 @@ export const gitRemotePlugin = {
namespace: "git-remote", path: args.path namespace: "git-remote", path: args.path
})); }));
build.onLoad({ filter, namespace: "git-remote" }, async () => { build.onLoad({ filter, namespace: "git-remote" }, async () => {
let remote = process.env.VENCORD_REMOTE; let remote = process.env.EQUICORD_REMOTE;
if (!remote) { if (!remote) {
const res = await promisify(exec)("git remote get-url origin", { encoding: "utf-8" }); const res = await promisify(exec)("git remote get-url origin", { encoding: "utf-8" });
remote = res.stdout.trim() remote = res.stdout.trim()

View file

@ -199,11 +199,11 @@ page.on("console", async e => {
const firstArg = await rawArgs[0]?.jsonValue(); const firstArg = await rawArgs[0]?.jsonValue();
const isVencord = firstArg === "[Vencord]"; const isEquicord = firstArg === "[Equicord]";
const isDebug = firstArg === "[PUP_DEBUG]"; const isDebug = firstArg === "[PUP_DEBUG]";
outer: outer:
if (isVencord) { if (isEquicord) {
try { try {
var args = await Promise.all(e.args().map(a => a.jsonValue())); var args = await Promise.all(e.args().map(a => a.jsonValue()));
} catch { } catch {

View file

@ -25,8 +25,8 @@ import { Readable } from "stream";
import { finished } from "stream/promises"; import { finished } from "stream/promises";
import { fileURLToPath } from "url"; import { fileURLToPath } from "url";
const BASE_URL = "https://github.com/Vencord/Installer/releases/latest/download/"; const BASE_URL = "https://github.com/Equicord/Installer/releases/latest/download/";
const INSTALLER_PATH_DARWIN = "VencordInstaller.app/Contents/MacOS/VencordInstaller"; const INSTALLER_PATH_DARWIN = "EquicordInstaller.app/Contents/MacOS/EquicordInstaller";
const BASE_DIR = join(dirname(fileURLToPath(import.meta.url)), ".."); const BASE_DIR = join(dirname(fileURLToPath(import.meta.url)), "..");
const FILE_DIR = join(BASE_DIR, "dist", "Installer"); const FILE_DIR = join(BASE_DIR, "dist", "Installer");
@ -35,11 +35,11 @@ const ETAG_FILE = join(FILE_DIR, "etag.txt");
function getFilename() { function getFilename() {
switch (process.platform) { switch (process.platform) {
case "win32": case "win32":
return "VencordInstallerCli.exe"; return "EquicordInstallerCli.exe";
case "darwin": case "darwin":
return "VencordInstaller.MacOS.zip"; return "EquicordInstaller.MacOS.zip";
case "linux": case "linux":
return "VencordInstaller-linux"; return "EquicordInstaller-linux";
default: default:
throw new Error("Unsupported platform: " + process.platform); throw new Error("Unsupported platform: " + process.platform);
} }
@ -53,7 +53,7 @@ async function ensureBinary() {
const downloadName = join(FILE_DIR, filename); const downloadName = join(FILE_DIR, filename);
const outputFile = process.platform === "darwin" const outputFile = process.platform === "darwin"
? join(FILE_DIR, "VencordInstaller") ? join(FILE_DIR, "EquicordInstaller")
: downloadName; : downloadName;
const etag = existsSync(outputFile) && existsSync(ETAG_FILE) const etag = existsSync(outputFile) && existsSync(ETAG_FILE)
@ -62,7 +62,7 @@ async function ensureBinary() {
const res = await fetch(BASE_URL + filename, { const res = await fetch(BASE_URL + filename, {
headers: { headers: {
"User-Agent": "Vencord (https://github.com/Vendicated/Vencord)", "User-Agent": "Equicord (https://github.com/Equicord/Equicord)",
"If-None-Match": etag "If-None-Match": etag
} }
}); });
@ -96,7 +96,7 @@ async function ensureBinary() {
execSync(cmd); execSync(cmd);
} catch { } } catch { }
}; };
logAndRun(`sudo spctl --add '${outputFile}' --label "Vencord Installer"`); logAndRun(`sudo spctl --add '${outputFile}' --label "Equicord Installer"`);
logAndRun(`sudo xattr -d com.apple.quarantine '${outputFile}'`); logAndRun(`sudo xattr -d com.apple.quarantine '${outputFile}'`);
} else { } else {
// WHY DOES NODE FETCH RETURN A WEB STREAM OH MY GOD // WHY DOES NODE FETCH RETURN A WEB STREAM OH MY GOD
@ -123,8 +123,8 @@ try {
stdio: "inherit", stdio: "inherit",
env: { env: {
...process.env, ...process.env,
VENCORD_USER_DATA_DIR: BASE_DIR, EQUICORD_USER_DATA_DIR: BASE_DIR,
VENCORD_DEV_INSTALL: "1" EQUICORD_DEV_INSTALL: "1"
} }
}); });
} catch { } catch {

View file

@ -58,7 +58,7 @@ async function syncSettings() {
body: "We've noticed you have cloud integrations enabled in another client! Due to limitations, you will " + body: "We've noticed you have cloud integrations enabled in another client! Due to limitations, you will " +
"need to re-authenticate to continue using them. Click here to go to the settings page to do so!", "need to re-authenticate to continue using them. Click here to go to the settings page to do so!",
color: "var(--yellow-360)", color: "var(--yellow-360)",
onClick: () => SettingsRouter.open("VencordCloud") onClick: () => SettingsRouter.open("EquicordCloud")
}); });
return; return;
} }

View file

@ -32,7 +32,7 @@ export function nextNotice() {
currentNotice = noticesQueue.shift(); currentNotice = noticesQueue.shift();
if (currentNotice) { if (currentNotice) {
NoticesModule.show(...currentNotice, "VencordNotice"); NoticesModule.show(...currentNotice, "EquicordNotice");
} }
} }

View file

@ -46,7 +46,7 @@ import {
SettingTextComponent SettingTextComponent
} from "./components"; } from "./components";
import { openContributorModal } from "./ContributorModal"; import { openContributorModal } from "./ContributorModal";
import { GithubButton, WebsiteButton } from "./LinkIconButton"; import { GithubButton } from "./LinkIconButton";
const cl = classNameFactory("vc-plugin-modal-"); const cl = classNameFactory("vc-plugin-modal-");
@ -226,10 +226,6 @@ export default function PluginModal({ plugin, onRestartNeeded, onClose, transiti
<Forms.FormText className={cl("description")}>{plugin.description}</Forms.FormText> <Forms.FormText className={cl("description")}>{plugin.description}</Forms.FormText>
{!pluginMeta.userPlugin && ( {!pluginMeta.userPlugin && (
<div className="vc-settings-modal-links"> <div className="vc-settings-modal-links">
<WebsiteButton
text="View more info"
href={`https://vencord.dev/plugins/${plugin.name}`}
/>
<GithubButton <GithubButton
text="View source code" text="View source code"
href={`https://github.com/${gitRemote}/tree/main/src/plugins/${pluginMeta.folderName}`} href={`https://github.com/${gitRemote}/tree/main/src/plugins/${pluginMeta.folderName}`}

View file

@ -181,7 +181,7 @@ function ExcludedPluginsList({ search }: { search: string; }) {
discordDesktop: "Discord Desktop app", discordDesktop: "Discord Desktop app",
vencordDesktop: "Vesktop app", vencordDesktop: "Vesktop app",
web: "Vesktop app and the Web version of Discord", web: "Vesktop app and the Web version of Discord",
dev: "Developer version of Vencord" dev: "Developer version of Equicord"
}; };
return ( return (
@ -296,7 +296,7 @@ export default function PluginSettings() {
if (isRequired) { if (isRequired) {
const tooltipText = p.required const tooltipText = p.required
? "This plugin is required for Vencord to function." ? "This plugin is required for Equicord 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(

View file

@ -123,7 +123,7 @@ function CloudTab() {
<SettingsTab title="Equicord Cloud"> <SettingsTab title="Equicord 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}>
Vencord comes with a cloud integration that adds goodies like settings sync across devices. Equicord 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.

View file

@ -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>Vencord Notifications</strong>: These are in-app notifications</li> <li><strong>Equicord 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 Vencord notifications", value: "never" }, { label: "Always use Equicord 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}

View file

@ -43,7 +43,7 @@ type KeysOfType<Object, Type> = {
}[keyof Object]; }[keyof Object];
function VencordSettings() { function EquicordSettings() {
const [settingsDir, , settingsDirPending] = useAwaiter(VencordNative.settings.getSettingsDir, { const [settingsDir, , settingsDirPending] = useAwaiter(VencordNative.settings.getSettingsDir, {
fallbackValue: "Loading..." fallbackValue: "Loading..."
}); });
@ -225,7 +225,7 @@ function VencordSettings() {
serialize={identity} /> serialize={identity} />
</>} </>}
<Forms.FormSection className={Margins.top16} title="Vencord Notifications" tag="h5"> <Forms.FormSection className={Margins.top16} title="Equicord Notifications" tag="h5">
<Flex> <Flex>
<Button onClick={openNotificationSettingsModal}> <Button onClick={openNotificationSettingsModal}>
Notification Settings Notification Settings
@ -266,4 +266,4 @@ function DonateCard({ image }: DonateCardProps) {
); );
} }
export default wrapTab(VencordSettings, "Equicord Settings"); export default wrapTab(EquicordSettings, "Equicord Settings");

View file

@ -56,7 +56,6 @@ export default definePlugin({
start() { start() {
console.log("Well hello there!, CustomAppIcons has started :)");
const appIcons = JSON.parse(localStorage.getItem("vc_app_icons") ?? "[]"); const appIcons = JSON.parse(localStorage.getItem("vc_app_icons") ?? "[]");
for (const icon of appIcons) { for (const icon of appIcons) {
findByProps("UZ", "QA").UZ.push(icon); findByProps("UZ", "QA").UZ.push(icon);
@ -88,12 +87,12 @@ export default definePlugin({
<><Forms.FormTitle> <><Forms.FormTitle>
<Forms.FormTitle>How to use?</Forms.FormTitle> <Forms.FormTitle>How to use?</Forms.FormTitle>
</Forms.FormTitle> </Forms.FormTitle>
<Forms.FormText> <Forms.FormText>
<Forms.FormText>Go to <Link href="/settings/appearance" onClick={e => { e.preventDefault(); closeAllModals(); FluxDispatcher.dispatch({ type: "USER_SETTINGS_MODAL_SET_SECTION", section: "Appearance" }); }}>Appearance Settings</Link> tab.</Forms.FormText> <Forms.FormText>Go to <Link href="/settings/appearance" onClick={e => { e.preventDefault(); closeAllModals(); FluxDispatcher.dispatch({ type: "USER_SETTINGS_MODAL_SET_SECTION", section: "Appearance" }); }}>Appearance Settings</Link> tab.</Forms.FormText>
<Forms.FormText>Scroll down to "In-app Icons" and click on "Preview App Icon".</Forms.FormText> <Forms.FormText>Scroll down to "In-app Icons" and click on "Preview App Icon".</Forms.FormText>
<Forms.FormText>And upload your own custom icon!</Forms.FormText> <Forms.FormText>And upload your own custom icon!</Forms.FormText>
<Forms.FormText>You can only use links when you are uploading your Custom Icon.</Forms.FormText> <Forms.FormText>You can only use links when you are uploading your Custom Icon.</Forms.FormText>
</Forms.FormText></> </Forms.FormText></>
); );
} }
}); });

View file

@ -1197,14 +1197,14 @@
.dc-colorway-settings::before { .dc-colorway-settings::before {
/* stylelint-disable-next-line property-no-vendor-prefix */ /* stylelint-disable-next-line property-no-vendor-prefix */
-webkit-mask: var(--si-vencordsettings) center/contain no-repeat !important; -webkit-mask: var(--si-equicordsettings) center/contain no-repeat !important;
mask: var(--si-vencordsettings) center/contain no-repeat !important mask: var(--si-equicordsettings) center/contain no-repeat !important
} }
.dc-colorway-ondemand::before { .dc-colorway-ondemand::before {
/* stylelint-disable-next-line property-no-vendor-prefix */ /* stylelint-disable-next-line property-no-vendor-prefix */
-webkit-mask: var(--si-vencordupdater) center/contain no-repeat !important; -webkit-mask: var(--si-equicordupdater) center/contain no-repeat !important;
mask: var(--si-vencordupdater) center/contain no-repeat !important mask: var(--si-equicordupdater) center/contain no-repeat !important
} }
.dc-colorway-sources-manager::before { .dc-colorway-sources-manager::before {

View file

@ -54,13 +54,13 @@
--si-textplayground: url(https://minidiscordthemes.github.io/SettingsIcons/svg/textplayground.svg); --si-textplayground: url(https://minidiscordthemes.github.io/SettingsIcons/svg/textplayground.svg);
--si-textcomponent: url(https://minidiscordthemes.github.io/SettingsIcons/svg/textcomponent.svg); --si-textcomponent: url(https://minidiscordthemes.github.io/SettingsIcons/svg/textcomponent.svg);
--si-logout: url(https://minidiscordthemes.github.io/SettingsIcons/svg/logout.svg); --si-logout: url(https://minidiscordthemes.github.io/SettingsIcons/svg/logout.svg);
--si-vencordsettings: url(https://minidiscordthemes.github.io/SettingsIcons/svg/vencordsettings.svg); --si-equicordsettings: url(https://minidiscordthemes.github.io/SettingsIcons/svg/vencordsettings.svg);
--si-vencordplugins: url(https://minidiscordthemes.github.io/SettingsIcons/svg/vencordplugins.svg); --si-equicordplugins: url(https://minidiscordthemes.github.io/SettingsIcons/svg/vencordplugins.svg);
--si-vencordthemes: url(https://minidiscordthemes.github.io/SettingsIcons/svg/vencordthemes.svg); --si-equicordthemes: url(https://minidiscordthemes.github.io/SettingsIcons/svg/vencordthemes.svg);
--si-vencordupdater: url(https://minidiscordthemes.github.io/SettingsIcons/svg/vencordupdater.svg); --si-equicordupdater: url(https://minidiscordthemes.github.io/SettingsIcons/svg/vencordupdater.svg);
--si-vencordcloud: url(https://minidiscordthemes.github.io/SettingsIcons/svg/vencordcloud.svg); --si-equicordcloud: url(https://minidiscordthemes.github.io/SettingsIcons/svg/vencordcloud.svg);
--si-vencordsettingssync: url(https://minidiscordthemes.github.io/SettingsIcons/svg/vencordsettingssync.svg); --si-equicordsettingssync: url(https://minidiscordthemes.github.io/SettingsIcons/svg/vencordsettingssync.svg);
--si-vencordpatchhelper: url(https://minidiscordthemes.github.io/SettingsIcons/svg/vencordpatchhelper.svg); --si-equicordpatchhelper: url(https://minidiscordthemes.github.io/SettingsIcons/svg/vencordpatchhelper.svg);
--si-vesktop: url(https://minidiscordthemes.github.io/SettingsIcons/svg/vesktop.svg); --si-vesktop: url(https://minidiscordthemes.github.io/SettingsIcons/svg/vesktop.svg);
--si-overview: url(https://minidiscordthemes.github.io/SettingsIcons/svg/overview.svg); --si-overview: url(https://minidiscordthemes.github.io/SettingsIcons/svg/overview.svg);
--si-roles: url(https://minidiscordthemes.github.io/SettingsIcons/svg/roles.svg); --si-roles: url(https://minidiscordthemes.github.io/SettingsIcons/svg/roles.svg);
@ -280,33 +280,33 @@
-webkit-mask:var(--si-logout) center/contain no-repeat; -webkit-mask:var(--si-logout) center/contain no-repeat;
mask:var(--si-logout) center/contain no-repeat mask:var(--si-logout) center/contain no-repeat
} }
.sidebar_c25c6d .side_a0 .item_a0[data-tab-id=VencordSettings]::before{ .sidebar_c25c6d .side_a0 .item_a0[data-tab-id=EquicordSettings]::before{
-webkit-mask:var(--si-vencordsettings) center/contain no-repeat; -webkit-mask:var(--si-equicordsettings) center/contain no-repeat;
mask:var(--si-vencordsettings) center/contain no-repeat mask:var(--si-equicordsettings) center/contain no-repeat
} }
.sidebar_c25c6d .side_a0 .item_a0[data-tab-id=VencordPlugins]::before{ .sidebar_c25c6d .side_a0 .item_a0[data-tab-id=EquicordPlugins]::before{
-webkit-mask:var(--si-vencordplugins) center/contain no-repeat; -webkit-mask:var(--si-equicordplugins) center/contain no-repeat;
mask:var(--si-vencordplugins) center/contain no-repeat mask:var(--si-equicordplugins) center/contain no-repeat
} }
.sidebar_c25c6d .side_a0 .item_a0[data-tab-id=VencordThemes]::before{ .sidebar_c25c6d .side_a0 .item_a0[data-tab-id=EquicordThemes]::before{
-webkit-mask:var(--si-vencordthemes) center/contain no-repeat; -webkit-mask:var(--si-equicordthemes) center/contain no-repeat;
mask:var(--si-vencordthemes) center/contain no-repeat mask:var(--si-equicordthemes) center/contain no-repeat
} }
.sidebar_c25c6d .side_a0 .item_a0[data-tab-id=VencordUpdater]::before{ .sidebar_c25c6d .side_a0 .item_a0[data-tab-id=EquicordUpdater]::before{
-webkit-mask:var(--si-vencordupdater) center/contain no-repeat; -webkit-mask:var(--si-equicordupdater) center/contain no-repeat;
mask:var(--si-vencordupdater) center/contain no-repeat mask:var(--si-equicordupdater) center/contain no-repeat
} }
.sidebar_c25c6d .side_a0 .item_a0[data-tab-id=VencordCloud]::before{ .sidebar_c25c6d .side_a0 .item_a0[data-tab-id=EquicordCloud]::before{
-webkit-mask:var(--si-vencordcloud) center/contain no-repeat; -webkit-mask:var(--si-equicordcloud) center/contain no-repeat;
mask:var(--si-vencordcloud) center/contain no-repeat mask:var(--si-equicordcloud) center/contain no-repeat
} }
.sidebar_c25c6d .side_a0 .item_a0[data-tab-id=VencordSettingsSync]::before{ .sidebar_c25c6d .side_a0 .item_a0[data-tab-id=EquicordSettingsSync]::before{
-webkit-mask:var(--si-vencordsettingssync) center/contain no-repeat; -webkit-mask:var(--si-equicordsettingssync) center/contain no-repeat;
mask:var(--si-vencordsettingssync) center/contain no-repeat mask:var(--si-equicordsettingssync) center/contain no-repeat
} }
.sidebar_c25c6d .side_a0 .item_a0[data-tab-id=VencordPatchHelper]::before{ .sidebar_c25c6d .side_a0 .item_a0[data-tab-id=EquicordPatchHelper]::before{
-webkit-mask:var(--si-vencordpatchhelper) center/contain no-repeat; -webkit-mask:var(--si-equicordpatchhelper) center/contain no-repeat;
mask:var(--si-vencordpatchhelper) center/contain no-repeat mask:var(--si-equicordpatchhelper) center/contain no-repeat
} }
.sidebar_c25c6d .side_a0 .item_a0[data-tab-id=Vesktop]::before{ .sidebar_c25c6d .side_a0 .item_a0[data-tab-id=Vesktop]::before{
-webkit-mask:var(--si-vesktop) center/contain no-repeat; -webkit-mask:var(--si-vesktop) center/contain no-repeat;

View file

@ -16,16 +16,31 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
import { Settings } from "@api/Settings";
import { Devs } from "@utils/constants"; import { Devs } from "@utils/constants";
import definePlugin, { OptionType } from "@utils/types"; import definePlugin, { OptionType } from "@utils/types";
const sounds = { let click1, click2, click3, backspace;
click1: new Audio("https://github.com/HypedDomi/Vencord-Plugins/raw/main/Keyboard-Sounds/sounds/click1.wav"), let sounds = {
click2: new Audio("https://github.com/HypedDomi/Vencord-Plugins/raw/main/Keyboard-Sounds/sounds/click2.wav"), click1,
click3: new Audio("https://github.com/HypedDomi/Vencord-Plugins/raw/main/Keyboard-Sounds/sounds/click3.wav"), click2,
backspace: new Audio("https://github.com/HypedDomi/Vencord-Plugins/raw/main/Keyboard-Sounds/sounds/backspace.wav") click3,
backspace
}; };
if (Settings.plugins.KeyboardSounds.enabled) {
click1 = new Audio("https://github.com/HypedDomi/Vencord-Plugins/raw/main/Keyboard-Sounds/sounds/click1.wav");
click2 = new Audio("https://github.com/HypedDomi/Vencord-Plugins/raw/main/Keyboard-Sounds/sounds/click2.wav");
click3 = new Audio("https://github.com/HypedDomi/Vencord-Plugins/raw/main/Keyboard-Sounds/sounds/click3.wav");
backspace = new Audio("https://github.com/HypedDomi/Vencord-Plugins/raw/main/Keyboard-Sounds/sounds/backspace.wav");
sounds = {
click1,
click2,
click3,
backspace,
};
}
const ignoredKeys = ["CapsLock", "ShiftLeft", "ShiftRight", "ControlLeft", "ControlRight", "AltLeft", "AltRight", "MetaLeft", "MetaRight", "ArrowUp", "ArrowRight", "ArrowLeft", "ArrowDown", "MediaPlayPause", "MediaStop", "MediaTrackNext", "MediaTrackPrevious", "MediaSelect", "MediaEject", "MediaVolumeUp", "MediaVolumeDown", "AudioVolumeUp", "AudioVolumeDown"]; const ignoredKeys = ["CapsLock", "ShiftLeft", "ShiftRight", "ControlLeft", "ControlRight", "AltLeft", "AltRight", "MetaLeft", "MetaRight", "ArrowUp", "ArrowRight", "ArrowLeft", "ArrowDown", "MediaPlayPause", "MediaStop", "MediaTrackNext", "MediaTrackPrevious", "MediaSelect", "MediaEject", "MediaVolumeUp", "MediaVolumeDown", "AudioVolumeUp", "AudioVolumeDown"];
const keydown = (e: KeyboardEvent) => { const keydown = (e: KeyboardEvent) => {

View file

@ -58,8 +58,8 @@ if (IS_VESKTOP || !IS_VANILLA) {
try { try {
if (RendererSettings.store.enableReactDevtools) if (RendererSettings.store.enableReactDevtools)
installExt("fmkadmapgofadopljbjfkapdkoienihi") installExt("fmkadmapgofadopljbjfkapdkoienihi")
.then(() => console.info("[Vencord] Installed React Developer Tools")) .then(() => console.info("[Equicord] Installed React Developer Tools"))
.catch(err => console.error("[Vencord] Failed to install React Developer Tools", err)); .catch(err => console.error("[Equicord] Failed to install React Developer Tools", err));
} catch { } } catch { }

View file

@ -51,7 +51,7 @@ function patchLatest() {
if (!existsSync(app) || statSync(app).isDirectory()) return; if (!existsSync(app) || statSync(app).isDirectory()) return;
console.info("[Vencord] Detected Host Update. Repatching..."); console.info("[Equicord] Detected Host Update. Repatching...");
renameSync(app, _app); renameSync(app, _app);
mkdirSync(app); mkdirSync(app);
@ -61,7 +61,7 @@ function patchLatest() {
})); }));
writeFileSync(join(app, "index.js"), `require(${JSON.stringify(join(__dirname, "patcher.js"))});`); writeFileSync(join(app, "index.js"), `require(${JSON.stringify(join(__dirname, "patcher.js"))});`);
} catch (err) { } catch (err) {
console.error("[Vencord] Failed to repatch latest host update", err); console.error("[Equicord] Failed to repatch latest host update", err);
} }
} }

View file

@ -24,7 +24,7 @@ import { initIpc } from "./ipcMain";
import { RendererSettings } from "./settings"; import { RendererSettings } from "./settings";
import { IS_VANILLA } from "./utils/constants"; import { IS_VANILLA } from "./utils/constants";
console.log("[Vencord] Starting up..."); console.log("[Equicord] Starting up...");
// Our injector file at app/index.js // Our injector file at app/index.js
const injectorPath = require.main!.filename; const injectorPath = require.main!.filename;
@ -154,8 +154,8 @@ if (!IS_VANILLA) {
app.commandLine.appendSwitch("disable-background-timer-throttling"); app.commandLine.appendSwitch("disable-background-timer-throttling");
app.commandLine.appendSwitch("disable-backgrounding-occluded-windows"); app.commandLine.appendSwitch("disable-backgrounding-occluded-windows");
} else { } else {
console.log("[Vencord] Running in vanilla mode. Not loading Vencord"); console.log("[Equicord] Running in vanilla mode. Not loading Equicord");
} }
console.log("[Vencord] Loading original Discord app.asar"); console.log("[Equicord] Loading original Discord app.asar");
require(require.main!.filename); require(require.main!.filename);

View file

@ -34,7 +34,7 @@ export default definePlugin({
}, },
{ {
match: /(?<=,NOTICE_DISMISS:function\(\i\){)return null!=(\i)/, match: /(?<=,NOTICE_DISMISS:function\(\i\){)return null!=(\i)/,
replace: "if($1.id==\"VencordNotice\")return($1=null,Vencord.Api.Notices.nextNotice(),true);$&" replace: "if($1.id==\"EquicordNotice\")return($1=null,Vencord.Api.Notices.nextNotice(),true);$&"
} }
] ]
} }

View file

@ -100,43 +100,43 @@ export default definePlugin({
className: "vc-settings-header" className: "vc-settings-header"
}, },
{ {
section: "VencordSettings", section: "EquicordSettings",
label: "Equicord", label: "Equicord",
element: VencordTab, element: VencordTab,
className: "vc-settings" className: "vc-settings"
}, },
{ {
section: "VencordPlugins", section: "EquicordPlugins",
label: "Plugins", label: "Plugins",
element: PluginsTab, element: PluginsTab,
className: "vc-plugins" className: "vc-plugins"
}, },
{ {
section: "VencordThemes", section: "EquicordThemes",
label: "Themes", label: "Themes",
element: require("@components/ThemeSettings/ThemesTab").default, element: require("@components/ThemeSettings/ThemesTab").default,
className: "vc-themes" className: "vc-themes"
}, },
!IS_UPDATER_DISABLED && { !IS_UPDATER_DISABLED && {
section: "VencordUpdater", section: "EquicordUpdater",
label: "Updater", label: "Updater",
element: UpdaterTab, element: UpdaterTab,
className: "vc-updater" className: "vc-updater"
}, },
{ {
section: "VencordCloud", section: "EquicordCloud",
label: "Cloud", label: "Cloud",
element: CloudTab, element: CloudTab,
className: "vc-cloud" className: "vc-cloud"
}, },
{ {
section: "VencordSettingsSync", section: "EquicordSettingsSync",
label: "Backup & Restore", label: "Backup & Restore",
element: BackupAndRestoreTab, element: BackupAndRestoreTab,
className: "vc-backup-restore" className: "vc-backup-restore"
}, },
{ {
section: "VencordPatchHelper", section: "EquicordPatchHelper",
label: "Patch Helper", label: "Patch Helper",
element: PatchHelperTab, element: PatchHelperTab,
className: "vc-patch-helper" className: "vc-patch-helper"

View file

@ -53,9 +53,9 @@ interface IVoiceChannelEffectSendEvent {
const MOYAI = "🗿"; const MOYAI = "🗿";
const MOYAI_URL = const MOYAI_URL =
"https://raw.githubusercontent.com/MeguminSama/VencordPlugins/main/plugins/moyai/moyai.mp3"; "https://github.com/Equicord/Ignore/raw/main/moyai.mp3";
const MOYAI_URL_HD = const MOYAI_URL_HD =
"https://raw.githubusercontent.com/MeguminSama/VencordPlugins/main/plugins/moyai/moyai_hd.wav"; "https://github.com/Equicord/Ignore/raw/main/moyai_hd.wav";
const settings = definePluginSettings({ const settings = definePluginSettings({
volume: { volume: {

View file

@ -38,7 +38,7 @@ export class Logger {
} }
console[level]( console[level](
`%c Vencord %c %c ${this.name} ${customFmt}`, `%c Equicord %c %c ${this.name} ${customFmt}`,
`background: ${levelColor}; color: black; font-weight: bold; border-radius: 5px;`, `background: ${levelColor}; color: black; font-weight: bold; border-radius: 5px;`,
"", "",
`background: ${this.color}; color: black; font-weight: bold; border-radius: 5px;` `background: ${this.color}; color: black; font-weight: bold; border-radius: 5px;`