-
+
@@ -374,9 +419,10 @@ export default function PluginSettings() {
{ label: "Show Disabled", value: SearchStatus.DISABLED },
{ label: "Show Equicord", value: SearchStatus.EQUICORD },
{ label: "Show Vencord", value: SearchStatus.VENCORD },
- ...(totalUserPlugins > 0 ? [{ label: "Show Custom", value: SearchStatus.CUSTOM }] : []),
{ label: "Show New", value: SearchStatus.NEW },
- ]}
+ hasUserPlugins && { label: "Show UserPlugins", value: SearchStatus.USER_PLUGINS },
+ { label: "Show API Plugins", value: SearchStatus.API_PLUGINS },
+ ].filter(isTruthy)}
serialize={String}
select={onStatusChange}
isSelected={v => v === searchValue.status}
diff --git a/src/components/settings/tabs/plugins/styles.css b/src/components/settings/tabs/plugins/styles.css
index 70288b64a..f2c8a38f3 100644
--- a/src/components/settings/tabs/plugins/styles.css
+++ b/src/components/settings/tabs/plugins/styles.css
@@ -19,7 +19,7 @@
.vc-plugins-grid {
margin-top: 16px;
display: grid;
- grid-gap: 16px;
+ gap: 16px;
grid-template-columns: repeat(auto-fill, minmax(250px, 1fr));
}
@@ -29,16 +29,16 @@
padding: 0;
background: transparent;
margin-right: 8px;
- color: var(--icon-secondary);
+ color: var(--icon-muted);
transition: background-color .2s ease;
&:hover {
- color: var(--interactive-hover)
+ color: var(--interactive-icon-hover)
}
}
.vc-plugins-settings-button:hover {
- color: var(--interactive-hover);
+ color: var(--interactive-icon-hover);
}
.vc-plugins-filter-controls {
@@ -78,23 +78,23 @@
.vc-plugins-restart-card {
padding: 1em;
- background: var(--info-warning-background);
- border: 1px solid var(--info-warning-foreground);
- color: var(--info-warning-foreground);
+ background: var(--icon-status-idle) !important;
+ border: 1px solid var(--icon-status-idle) !important;
+ color: var(--text-status-idle);
}
.vc-plugins-info-icon:not(:hover, :focus) {
- color: var(--text-muted);
+ color: var(--text-subtle);
}
.vc-plugins-restart-button {
- background-color: var(--background-color) !important;
- border: 1px solid var(--info-warning-foreground) !important;
+ background-color: var(--background-base-low) !important;
+ border: 1px solid var(--text-status-idle) !important;
margin-top: 0.5em;
}
.vc-plugins-restart-button:hover {
- background-color: var(--info-warning-foreground) !important;
+ background-color: var(--text-status-idle) !important;
}
.vc-plugin-stats {
@@ -112,7 +112,7 @@
.vc-plugins-info-card:hover,
.vc-plugin-stats:hover {
- background-color: var(--background-tertiary) !important;
+ background-color: var(--background-base-low) !important;
transform: translateY(-1px);
box-shadow: var(--elevation-high);
}
@@ -159,7 +159,7 @@
}
.text-danger {
- color: var(--text-danger) !important;
+ color: var(--text-feedback-critical) !important;
font-size: 1.2rem;
font-weight: bold;
}
@@ -175,29 +175,29 @@
.vc-plugins-disable-warning,
.vc-plugin-modal-disable-warning {
- background-color: color-mix(in srgb, var(--button-danger-background) 10%, transparent) !important;
+ background-color: color-mix(in srgb, var(--redesign-button-danger-background) 10%, transparent) !important;
border-style: solid !important;
border-width: .1rem !important;
- border-color: color-mix(in srgb, var(--button-danger-background) 80%, transparent) !important;
+ border-color: color-mix(in srgb, var(--redesign-button-danger-background) 80%, transparent) !important;
border-radius: 5px !important;
- color: color-mix(in srgb, var(--button-danger-background) 100%, transparent) !important;
+ color: color-mix(in srgb, var(--redesign-button-danger-background) 100%, transparent) !important;
}
.vc-plugins-disable-warning:hover,
.vc-plugin-modal-disable-warning:hover {
- background-color: color-mix(in srgb, var(--button-danger-background-hover) 40%, transparent) !important;
+ background-color: color-mix(in srgb, var(--redesign-button-danger-background) 40%, transparent) !important;
}
.vc-plugins-confirm-reset,
.vc-plugin-modal-confirm-reset {
- background-color: var(--button-danger-background) !important;
- color: var(--header-primary);
+ background-color: var(--redesign-button-danger-background) !important;
+ color: var(--redesign-button-danger-pressed-text);
}
.vc-plugins-confirm-reset:hover,
.vc-plugin-modal-confirm-reset:hover {
- background-color: var(--button-danger-background-hover) !important;
- filter: saturate(80%);
+ background-color: var(--redesign-button-danger-pressed-background) !important;
+ color: var(--redesign-button-danger-pressed-text);
}
.vc-modal-close-button {
@@ -224,7 +224,7 @@
/* Specific to disable all modal */
.warning-text {
- color: var(--text-danger) !important;
+ color: var(--text-feedback-critical) !important;
font-size: 1.2rem !important;
}
@@ -250,20 +250,20 @@
}
.visual-refresh .vc-plugins-info-card {
- background-color: var(--card-primary-bg) !important;
+ background-color: var(--background-surface-high) !important;
border: 1px solid var(--border-subtle) !important;
&:hover {
- background-color: var(--card-primary-bg) !important;
+ background-color: var(--background-surface-high) !important;
}
}
.visual-refresh .vc-plugin-stats {
- background-color: var(--card-primary-bg) !important;
+ background-color: var(--background-surface-high) !important;
border: 1px solid var(--border-subtle) !important;
&:hover {
- background-color: var(--card-primary-bg) !important;
+ background-color: var(--background-surface-high) !important;
}
}
@@ -286,4 +286,16 @@
height: 22px;
margin-top: 2px;
margin-right: 8px;
+}
+
+.vc-plugins-stats-container {
+ margin-top: 16px;
+ gap: 16px;
+ display: flex;
+ flex-direction: row;
+ width: 100%;
+}
+
+.vc-plugins-ui-elements {
+ margin-top: 16px;
}
\ No newline at end of file
diff --git a/src/components/settings/tabs/styles.css b/src/components/settings/tabs/styles.css
index eacb524c5..83003366c 100644
--- a/src/components/settings/tabs/styles.css
+++ b/src/components/settings/tabs/styles.css
@@ -33,15 +33,15 @@
.vc-warning-card {
padding: 1em;
- background: var(--info-warning-background);
- border: 1px solid var(--info-warning-foreground);
- color: var(--info-warning-foreground);
+ background: var(--background-feedback-warning);
+ border: 1px solid var(--text-status-idle);
+ color: var(--text-status-idle);
}
.vc-backup-restore-card {
- background-color: var(--info-warning-background);
- border-color: var(--info-warning-foreground);
- color: var(--info-warning-foreground);
+ background-color: var(--background-feedback-warning);
+ border-color: var(--text-status-idle);
+ color: var(--text-status-idle);
}
.vc-settings-theme-links {
@@ -49,7 +49,7 @@
display: inline-block !important;
color: var(--text-default) !important;
padding: 0.5em 1em;
- border: 1px solid var(--input-border);
+ border: 1px solid var(--input-border-default);
max-height: unset;
background-color: transparent;
box-sizing: border-box;
@@ -61,7 +61,7 @@
}
.vc-settings-theme-links::placeholder {
- color: var(--text-muted) !important;
+ color: var(--text-subtle) !important;
}
.vc-settings-theme-links:focus {
@@ -71,18 +71,18 @@
.vc-cloud-settings-sync-grid {
display: grid;
grid-template-columns: repeat(3, 1fr);
- grid-gap: 1em;
+ gap: 1em;
}
.vc-cloud-erase-data-danger-btn {
color: var(--white-500);
- background-color: var(--button-danger-background);
+ background-color: var(--redesign-button-danger-background);
}
-.vc-updater-modal {
+.vc-settings-modal {
padding: 1.5em !important;
}
-.vc-updater-modal-close-button {
+.vc-settings-modal-close {
float: right;
}
\ No newline at end of file
diff --git a/src/components/settings/tabs/sync/BackupAndRestoreTab.tsx b/src/components/settings/tabs/sync/BackupAndRestoreTab.tsx
index 38b67ac35..f38741e2f 100644
--- a/src/components/settings/tabs/sync/BackupAndRestoreTab.tsx
+++ b/src/components/settings/tabs/sync/BackupAndRestoreTab.tsx
@@ -16,67 +16,103 @@
* along with this program. If not, see .
*/
-import { BaseText } from "@components/BaseText";
+import { downloadSettingsBackup, uploadSettingsBackup } from "@api/SettingsSync/offline";
+import { Alert } from "@components/Alert";
+import { Button } from "@components/Button";
+import { Divider } from "@components/Divider";
import { Flex } from "@components/Flex";
+import { Heading } from "@components/Heading";
+import { Paragraph } from "@components/Paragraph";
import { SettingsTab, wrapTab } from "@components/settings/tabs/BaseTab";
import { Margins } from "@utils/margins";
-import { classes } from "@utils/misc";
-import { downloadSettingsBackup, uploadSettingsBackup } from "@utils/settingsSync";
-import { Button, Card } from "@webpack/common";
function BackupAndRestoreTab() {
return (
-
-
-
- Warning
- Importing a settings file will overwrite your current settings.
-
-
-
- You can import and export your Equicord settings as a JSON file.
- This allows you to easily transfer your settings to another device,
- or recover your settings after reinstalling Equicord or Discord.
-
-
- Settings Export contains:
-
- - — Custom QuickCSS
- - — Theme Links
- - — Plugin Settings
- - — Plugin DataStores (e.g. Timezones or IRememberYou)
-
-
-
+
+ Backup & Restore
+
+ Import and export your Equicord settings as a JSON file. This allows you to easily transfer your settings to another device, or recover them after reinstalling Equicord or Discord.
+
+
+
+ Importing a settings file will overwrite your current settings. Make sure to export a backup first if you want to keep your current configuration.
+
+
+ What's included in a backup
+
+ • Custom QuickCSS
+ • Theme Links
+ • Plugin Settings
+ • DataStore Data
+
+
+
+
+ Import Settings
+
+ Select a previously exported settings file to restore your configuration. This will replace all your current settings with the ones from the backup.
+
+
+
+
+
+
+
+
+
+ Export Settings
+
+ Download your current settings as a backup file. You can export everything at once, or choose to export only specific parts of your configuration.
+
+
+
+
diff --git a/src/components/settings/tabs/sync/CloudTab.tsx b/src/components/settings/tabs/sync/CloudTab.tsx
index 046b609e9..ad6aec597 100644
--- a/src/components/settings/tabs/sync/CloudTab.tsx
+++ b/src/components/settings/tabs/sync/CloudTab.tsx
@@ -16,20 +16,28 @@
* along with this program. If not, see .
*/
-import { showNotification } from "@api/Notifications";
-import { Settings, useSettings } from "@api/Settings";
+import { useSettings } from "@api/Settings";
+import { authorizeCloud, deauthorizeCloud } from "@api/SettingsSync/cloudSetup";
+import { deleteCloudSettings, eraseAllCloudData, getCloudSettings, putCloudSettings } from "@api/SettingsSync/cloudSync";
+import { Alert } from "@components/Alert";
+import { Button } from "@components/Button";
import { CheckedTextInput } from "@components/CheckedTextInput";
import { Divider } from "@components/Divider";
+import { Flex } from "@components/Flex";
import { FormSwitch } from "@components/FormSwitch";
-import { Grid } from "@components/Grid";
import { Heading } from "@components/Heading";
import { Link } from "@components/Link";
import { Paragraph } from "@components/Paragraph";
+import { QuickAction, QuickActionCard } from "@components/settings/QuickAction";
import { SettingsTab, wrapTab } from "@components/settings/tabs/BaseTab";
-import { authorizeCloud, cloudLogger, deauthorizeCloud, getCloudAuth, getCloudUrl } from "@utils/cloud";
import { Margins } from "@utils/margins";
-import { deleteCloudSettings, getCloudSettings, putCloudSettings } from "@utils/settingsSync";
-import { Alerts, Button, Tooltip, useState } from "@webpack/common";
+import { findComponentByCodeLazy } from "@webpack";
+import { Alerts, useState } from "@webpack/common";
+
+const UploadIcon = findComponentByCodeLazy("M12.7 3.3a1 1 0 0 0-1.4 0l-5 5a1 1 0 0 0 1.4 1.4L11 6.42V20");
+const DownloadIcon = findComponentByCodeLazy("M12.7 20.7a1 1 0 0 1-1.4 0l-5-5a1 1 0 1 1 1.4-1.4l3.3 3.29V4");
+const TrashIcon = findComponentByCodeLazy("2.81h8.36a3");
+const SkullIcon = findComponentByCodeLazy("m13.47 1 .07.04c.45.06");
function validateUrl(url: string) {
try {
@@ -40,93 +48,17 @@ function validateUrl(url: string) {
}
}
-async function eraseAllData() {
- const res = await fetch(new URL("/v1/", getCloudUrl()), {
- method: "DELETE",
- headers: { Authorization: await getCloudAuth() }
- });
-
- if (!res.ok) {
- cloudLogger.error(`Failed to erase data, API returned ${res.status}`);
- showNotification({
- title: "Cloud Integrations",
- body: `Could not erase all data (API returned ${res.status}), please contact support.`,
- color: "var(--red-360)"
- });
- return;
- }
-
- Settings.cloud.authenticated = false;
- await deauthorizeCloud();
-
- showNotification({
- title: "Cloud Integrations",
- body: "Successfully erased all data.",
- color: "var(--green-360)"
- });
-}
-
-function SettingsSyncSection() {
- const { cloud } = useSettings(["cloud.authenticated", "cloud.settingsSync"]);
- const sectionEnabled = cloud.authenticated && cloud.settingsSync;
-
- return (
-
- Settings Sync
-
-
- Synchronize your settings to the cloud. This allows easy synchronization across multiple devices with
- minimal effort.
-
- { cloud.settingsSync = v; }}
- disabled={!cloud.authenticated}
- />
-
-
-
- {({ onMouseLeave, onMouseEnter }) => (
-
- )}
-
-
-
-
- );
-}
-
function CloudTab() {
- const settings = useSettings(["cloud.authenticated", "cloud.url"]);
+ const settings = useSettings(["cloud.authenticated", "cloud.url", "cloud.settingsSync"]);
const [inputKey, setInputKey] = useState(0);
+ const { cloud } = settings;
+ const isAuthenticated = cloud.authenticated;
+ const syncEnabled = isAuthenticated && cloud.settingsSync;
+
async function changeUrl(url: string) {
- settings.cloud.url = url;
- settings.cloud.authenticated = false;
+ cloud.url = url;
+ cloud.authenticated = false;
await deauthorizeCloud();
await authorizeCloud();
@@ -135,86 +67,153 @@ function CloudTab() {
}
return (
-
-
- Cloud Settings
+
+ Cloud Integration
+
+ Equicord's cloud integration allows you to sync your settings across multiple devices and Discord installations. Your data is securely stored and can be easily restored at any time.
+
-
- Equicord comes with a cloud integration allowing settings to be synced across apps and devices.
-
- We use our own Equicloud backend to provide our cloud instance with enhanced features.
-
- Our privacy policy allows you to see what information we store, how we use it, and data retention.
-
- Equicloud is BSD 3.0 licensed so you can host it yourself if you would like.
-
- You can swap between Equicord and Vencord's different cloud instances below if needed.
-
- {
- if (v)
- authorizeCloud();
- else
- settings.cloud.authenticated = v;
- }}
- />
- Backend URL
-
- Which backend to use when using cloud integrations.
-
- {
- settings.cloud.url = v;
- settings.cloud.authenticated = false;
+
+ We use our own Equicloud backend with enhanced features.
+ View our privacy policy to see what we store and how we use your data.
+ Equicloud is BSD 3.0 licensed, so you can self-host if preferred.
+
+
+ {
+ if (v)
+ authorizeCloud();
+ else
+ cloud.authenticated = v;
+ }}
+ hideBorder
+ />
+
+
+
+ Cloud Backend
+
+ Choose which cloud backend to use for storing your settings. You can switch between Equicord's and Vencord's cloud services, or use a self-hosted instance.
+
+
+ Current: {cloud.url}
+
+
+ {
+ cloud.url = v;
+ cloud.authenticated = false;
+ await deauthorizeCloud();
+ }}
+ validate={validateUrl}
+ />
+
+
+
+
+
+
-
-
-
-
-
-
+
-
-
-
+ Settings Sync
+
+ Synchronize your Equicord settings to the cloud. This makes it easy to keep your configuration consistent across multiple devices without manual import/export.
+
+
+ { cloud.settingsSync = v; }}
+ disabled={!isAuthenticated}
+ hideBorder
+ />
+
+ {isAuthenticated && (
+
+ putCloudSettings(true)}
+ disabled={!syncEnabled}
+ />
+ getCloudSettings(true, true)}
+ disabled={!syncEnabled}
+ />
+
+ )}
+
+ {!isAuthenticated && (
+
+ Enable cloud integration above to use settings sync features.
+
+ )}
+
+
+
+ Danger Zone
+
+ Permanently delete all your data from the cloud. This action cannot be undone and will remove all synced settings and any other data stored on the cloud backend.
+
+
+
+
+
+
);
}
diff --git a/src/components/settings/tabs/updater/Components.tsx b/src/components/settings/tabs/updater/Components.tsx
index 935c24e46..8d9f34afb 100644
--- a/src/components/settings/tabs/updater/Components.tsx
+++ b/src/components/settings/tabs/updater/Components.tsx
@@ -4,15 +4,17 @@
* SPDX-License-Identifier: GPL-3.0-or-later
*/
+import { Button } from "@components/Button";
+import { Card } from "@components/Card";
import { ErrorCard } from "@components/ErrorCard";
import { Flex } from "@components/Flex";
import { Link } from "@components/Link";
import { Paragraph } from "@components/Paragraph";
+import { Span } from "@components/Span";
import { Margins } from "@utils/margins";
-import { classes } from "@utils/misc";
import { relaunch } from "@utils/native";
import { changes, checkForUpdates, update, updateError } from "@utils/updater";
-import { Alerts, Button, Card, React, Toasts, useState } from "@webpack/common";
+import { Alerts, React, Toasts, useState } from "@webpack/common";
import { runWithDispatch } from "./runWithDispatch";
@@ -31,25 +33,26 @@ export function HashLink({ repo, hash, disabled = false }: { repo: string, hash:
export function Changes({ updates, repo, repoPending }: CommonProps & { updates: typeof changes; }) {
return (
-
- {updates.map(({ hash, author, message }) => (
+
+ {updates.map(({ hash, author, message }, i) => (
-
-
-
-
-
- {message} - {author}
-
+
+
+
+
+
+ {message}
+
+
+ — {author}
+
+
))}
@@ -59,8 +62,8 @@ export function Changes({ updates, repo, repoPending }: CommonProps & { updates:
export function Newer(props: CommonProps) {
return (
<>
-
- Your local copy has more recent commits. Please stash or reset them.
+
+ Your local copy has more recent commits than the remote repository. This usually happens when you've made local changes. Please stash or reset them before updating.
@@ -76,25 +79,35 @@ export function Updatable(props: CommonProps) {
return (
<>
- {!updates && updateError ? (
- <>
- Failed to check updates. Check the console for more info
-
- {updateError.stderr || updateError.stdout || "An unknown error occurred"}
-
-
- ) : (
-
- {isOutdated ? (updates.length === 1 ? "There is 1 Update" : `There are ${updates.length} Updates`) : "Up to Date!"}
-
- )}
+
+
{isOutdated && (
)}
-
+ {!updates && updateError ? (
+ <>
+ Error checking for updates
+
+ {updateError.stderr || updateError.stdout || "An unknown error occurred"}
+
+
+ ) : isOutdated ? (
+ <>
+
+ There {updates.length === 1 ? "is 1 update" : `are ${updates.length} updates`} available. Click the button below to download and install.
+
+
+
+ ) : (
+
+ You're running the latest version of Equicord.
+
+ )}
);
}
diff --git a/src/components/settings/tabs/updater/index.tsx b/src/components/settings/tabs/updater/index.tsx
index 4bca119fe..c964ba4ee 100644
--- a/src/components/settings/tabs/updater/index.tsx
+++ b/src/components/settings/tabs/updater/index.tsx
@@ -18,155 +18,25 @@
import { useSettings } from "@api/Settings";
import { Divider } from "@components/Divider";
-import { ErrorCard } from "@components/ErrorCard";
-import { Flex } from "@components/Flex";
import { FormSwitch } from "@components/FormSwitch";
import { Heading } from "@components/Heading";
import { Link } from "@components/Link";
import { Paragraph } from "@components/Paragraph";
-import { handleSettingsTabError, SettingsTab, wrapTab } from "@components/settings";
+import { SettingsTab, wrapTab } from "@components/settings";
import { Margins } from "@utils/margins";
-import { classes } from "@utils/misc";
-import { ModalCloseButton, ModalContent, ModalProps, ModalRoot, ModalSize, openModal } from "@utils/modal";
-import { relaunch } from "@utils/native";
import { useAwaiter } from "@utils/react";
-import { changes, checkForUpdates, getRepo, isNewer, update, updateError, UpdateLogger } from "@utils/updater";
-import { Alerts, Button, Parser, React, Toasts } from "@webpack/common";
+import { getRepo, isNewer, UpdateLogger } from "@utils/updater";
+import { React } from "@webpack/common";
import gitHash from "~git-hash";
-import { Changes, HashLink } from "./Components";
-
-function withDispatcher(dispatcher: React.Dispatch>, action: () => any) {
- return async () => {
- dispatcher(true);
- try {
- await action();
- } catch (e: any) {
- UpdateLogger.error("Failed to update", e);
-
- let err: string;
- if (!e) {
- err = "An unknown error occurred (error is undefined).\nPlease try again.";
- } else if (e.code && e.cmd) {
- const { code, path, cmd, stderr } = e;
-
- if (code === "ENOENT")
- err = `Command \`${path}\` not found.\nPlease install it and try again`;
- else {
- err = `An error occurred while running \`${cmd}\`:\n`;
- err += stderr || `Code \`${code}\`. See the console for more info`;
- }
-
- } else {
- err = "An unknown error occurred. See the console for more info.";
- }
-
- Alerts.show({
- title: "Oops!",
- body: (
-
- {err.split("\n").map((line, idx) => {Parser.parse(line)}
)}
-
- )
- });
- }
- finally {
- dispatcher(false);
- }
- };
-}
+import { HashLink, Newer, Updatable } from "./Components";
interface CommonProps {
repo: string;
repoPending: boolean;
}
-function Updatable(props: CommonProps) {
- const [updates, setUpdates] = React.useState(changes);
- const [isChecking, setIsChecking] = React.useState(false);
- const [isUpdating, setIsUpdating] = React.useState(false);
- const isOutdated = (updates?.length ?? 0) > 0;
-
- return (
- <>
-
- {isOutdated && }
-
-
- {!updates && updateError ? (
- <>
- Failed to check updates. Check the console for more info
-
- {updateError.stderr || updateError.stdout || "An unknown error occurred"}
-
-
- ) : (
-
- {isOutdated ? (updates.length === 1 ? "There is 1 Update" : `There are ${updates.length} Updates`) : "Up to Date!"}
-
- )}
-
- {isOutdated && }
-
- );
-}
-
-function Newer(props: CommonProps) {
- return (
- <>
-
- Your local copy has more recent commits. Please stash or reset them.
-
-
-
- );
-}
-
function Updater() {
const settings = useSettings(["autoUpdate", "autoUpdateNotification"]);
@@ -183,25 +53,35 @@ function Updater() {
};
return (
-
- Updater Settings
+
+ Update Preferences
+
+ Control how Equicord keeps itself up to date. You can choose to update automatically in the background or be notified when new updates are available.
+
+
settings.autoUpdate = v}
+ hideBorder
/>
settings.autoUpdateNotification = v}
title="Get notified when an automatic update completes"
- description="Shows a notification when Equicord automatically updates"
+ description="Receive a notification when Equicord finishes downloading an update in the background, so you know when to restart Discord."
disabled={!settings.autoUpdate}
+ hideBorder
/>
- Repo
+
-
+ Repository
+
+ This is the GitHub repository where Equicord fetches updates from.
+
+
{repoPending
? repo
: err
@@ -215,30 +95,14 @@ function Updater() {
{" "}()
-
-
- Updates
+
+ Updates
{isNewer ? : }
-
+
);
}
-export default IS_UPDATER_DISABLED ? null : wrapTab(Updater, "Updater");
-
-export const openUpdaterModal = IS_UPDATER_DISABLED ? null : function () {
- const UpdaterTab = wrapTab(Updater, "Updater");
-
- try {
- openModal(wrapTab((modalProps: ModalProps) => (
-
-
-
-
-
-
- ), "UpdaterModal"));
- } catch {
- handleSettingsTabError();
- }
-};
+export default IS_UPDATER_DISABLED
+ ? null
+ : wrapTab(Updater, "Updater");
diff --git a/src/components/settings/tabs/vencord/DonateButton.tsx b/src/components/settings/tabs/vencord/DonateButton.tsx
index a02a4cbf6..0d63f2b87 100644
--- a/src/components/settings/tabs/vencord/DonateButton.tsx
+++ b/src/components/settings/tabs/vencord/DonateButton.tsx
@@ -4,22 +4,27 @@
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-import { DonateButton } from "@components/settings";
+import { Flex } from "@components/Flex";
+import { DonateButton, InviteButton } from "@components/settings/DonateButton";
+import BadgeAPI from "@plugins/_api/badges";
import { DONOR_ROLE_ID, VC_GUILD_ID } from "@utils/constants";
-import { Button, GuildMemberStore } from "@webpack/common";
-import BadgeAPI from "plugins/_api/badges";
+import { GuildMemberStore } from "@webpack/common";
export const isDonor = (userId: string) => !!(
BadgeAPI.getDonorBadges(userId)?.length > 0
|| GuildMemberStore?.getMember(VC_GUILD_ID, userId)?.roles.includes(DONOR_ROLE_ID)
);
-export function DonateButtonComponent() {
+export function DonateButtonComponent({ donated = false }) {
return (
-
+
+
+
+
);
}
diff --git a/src/components/settings/tabs/vencord/NotificationSettings.tsx b/src/components/settings/tabs/vencord/NotificationSettings.tsx
index 084ee118f..36fcdfc2b 100644
--- a/src/components/settings/tabs/vencord/NotificationSettings.tsx
+++ b/src/components/settings/tabs/vencord/NotificationSettings.tsx
@@ -7,6 +7,7 @@
import { openNotificationLogModal } from "@api/Notifications/notificationLog";
import { useSettings } from "@api/Settings";
import { BaseText } from "@components/BaseText";
+import { Button } from "@components/Button";
import { ErrorCard } from "@components/ErrorCard";
import { Flex } from "@components/Flex";
import { FormSwitch } from "@components/FormSwitch";
@@ -15,7 +16,7 @@ import { Paragraph } from "@components/Paragraph";
import { Margins } from "@utils/margins";
import { identity } from "@utils/misc";
import { ModalCloseButton, ModalContent, ModalHeader, ModalRoot, ModalSize, openModal } from "@utils/modal";
-import { Button, Select, Slider } from "@webpack/common";
+import { Select, Slider } from "@webpack/common";
export function NotificationSection() {
return (
@@ -53,7 +54,7 @@ export function openNotificationSettingsModal() {
}
function NotificationSettings() {
- const settings = useSettings().notifications;
+ const settings = useSettings(["notifications.*"]).notifications;
return (
diff --git a/src/components/settings/tabs/vencord/VencordTab.css b/src/components/settings/tabs/vencord/VencordTab.css
index 2b2394c71..cc4a52c54 100644
--- a/src/components/settings/tabs/vencord/VencordTab.css
+++ b/src/components/settings/tabs/vencord/VencordTab.css
@@ -4,7 +4,7 @@
}
.vc-donatebutton {
- background-color: var(--background-color) !important;
+ background-color: var(--background-base-low) !important;
border-color: var(--vc-donatebutton) !important;
filter: brightness(1);
border-width: .1rem !important;
@@ -18,11 +18,11 @@
.vc-joindiscordbutton {
- background-color: var(--button-secondary-background) !important;
+ background-color: var(--redesign-button-secondary-background) !important;
}
.vc-joindiscordbutton:hover {
- background-color: var(--button-secondary-background-hover) !important;
+ background-color: var(--redesign-button-secondary-pressed-background) !important;
}
.vc-settings-card-buttons {
@@ -47,3 +47,8 @@
text-align: center;
margin-top: 10px;
}
+
+.vc-vencord-tab-settings-link {
+ color: var(--text-link);
+ display: inline-block;
+}
\ No newline at end of file
diff --git a/src/components/settings/tabs/vencord/index.tsx b/src/components/settings/tabs/vencord/index.tsx
index 0c9afbde5..79dc4f987 100644
--- a/src/components/settings/tabs/vencord/index.tsx
+++ b/src/components/settings/tabs/vencord/index.tsx
@@ -8,23 +8,27 @@ import "./VencordTab.css";
import { openNotificationLogModal } from "@api/Notifications/notificationLog";
import { useSettings } from "@api/Settings";
+import { classNameFactory } from "@api/Styles";
+import { Alert } from "@components/Alert";
+import { Button } from "@components/Button";
import { Divider } from "@components/Divider";
+import { Flex } from "@components/Flex";
import { FormSwitch } from "@components/FormSwitch";
import { Heading } from "@components/Heading";
import { FolderIcon, GithubIcon, LogIcon, PaintbrushIcon, RestartIcon } from "@components/Icons";
import { Paragraph } from "@components/Paragraph";
import { openContributorModal, openPluginModal, SettingsTab, wrapTab } from "@components/settings";
-import { DonateButton, InviteButton } from "@components/settings/DonateButton";
import { QuickAction, QuickActionCard } from "@components/settings/QuickAction";
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 { DONOR_ROLE_ID, GUILD_ID, IS_MAC, IS_WINDOWS, VC_DONOR_ROLE_ID, VC_GUILD_ID } from "@utils/constants";
import { Margins } from "@utils/margins";
import { identity, isAnyPluginDev } from "@utils/misc";
import { relaunch } from "@utils/native";
-import { Button, Flex, GuildMemberStore, React, Select, UserStore } from "@webpack/common";
+import { GuildMemberStore, React, Select, UserStore } from "@webpack/common";
import BadgeAPI from "plugins/_api/badges";
+import { DonateButtonComponent } from "./DonateButton";
import { openNotificationSettingsModal } from "./NotificationSettings";
const DEFAULT_DONATE_IMAGE = "https://cdn.discordapp.com/emojis/1026533090627174460.png";
@@ -36,6 +40,8 @@ const COZY_CONTRIB_IMAGE = "https://cdn.discordapp.com/emojis/102653307095587233
const DONOR_BACKGROUND_IMAGE = "https://media.discordapp.net/stickers/1311070116305436712.png?size=2048";
const CONTRIB_BACKGROUND_IMAGE = "https://media.discordapp.net/stickers/1311070166481895484.png?size=2048";
+const cl = classNameFactory("vc-vencord-tab-");
+
type KeysOfType
= {
[K in keyof Object]: Object[K] extends Type ? K : never;
}[keyof Object];
@@ -48,9 +54,7 @@ function EquicordSettings() {
[],
);
- const isWindows = navigator.platform.toLowerCase().startsWith("win");
- const isMac = navigator.platform.toLowerCase().startsWith("mac");
- const needsVibrancySettings = IS_DISCORD_DESKTOP && isMac;
+ const needsVibrancySettings = IS_DISCORD_DESKTOP && IS_MAC;
const user = UserStore?.getCurrentUser();
@@ -65,58 +69,64 @@ function EquicordSettings() {
{
key: "useQuickCss",
title: "Enable Custom CSS",
+ description: "Load custom CSS from the QuickCSS editor. This allows you to customize Discord's appearance with your own styles.",
restartRequired: true,
warning: { enabled: false },
},
!IS_WEB && {
key: "enableReactDevtools",
title: "Enable React Developer Tools",
+ description: "Enable the React Developer Tools extension for debugging Discord's React components. Useful for plugin development.",
restartRequired: true,
warning: { enabled: false },
},
!IS_WEB &&
- (!IS_DISCORD_DESKTOP || !isWindows
+ (!IS_DISCORD_DESKTOP || !IS_WINDOWS
? {
key: "frameless",
title: "Disable the Window Frame",
+ description: "Remove the native window frame for a cleaner look. You can still move the window by dragging the title bar area.",
restartRequired: true,
warning: { enabled: false },
}
: {
key: "winNativeTitleBar",
- title:
- "Use Windows' native title bar instead of Discord's custom one",
+ title: "Use Windows' native title bar instead of Discord's custom one",
+ description: "Replace Discord's custom title bar with the standard Windows title bar. This may improve compatibility with some window management tools.",
restartRequired: true,
warning: { enabled: false },
}),
!IS_WEB && {
key: "transparent",
title: "Enable Window Transparency",
- description: "A theme that supports transparency is required or this will do nothing. Stops the window from being resizable as a side effect",
+ description: "Make the Discord window transparent. A theme that supports transparency is required or this will do nothing.",
restartRequired: true,
warning: {
- enabled: isWindows,
- message: "Enabling this will prevent you from snapping this window.",
+ enabled: true,
+ message: IS_WINDOWS
+ ? "This will stop the window from being resizable and prevents you from snapping the window to screen edges."
+ : "This will stop the window from being resizable.",
},
},
IS_DISCORD_DESKTOP && {
key: "disableMinSize",
title: "Disable Minimum Window Size",
+ description: "Allow the Discord window to be resized smaller than its default minimum size. Useful for tiling window managers or small screens.",
restartRequired: true,
warning: { enabled: false },
},
!IS_WEB &&
- isWindows && {
+ IS_WINDOWS && {
key: "winCtrlQ",
- title:
- "Register Ctrl+Q as shortcut to close Discord (Alternative to Alt+F4)",
+ title: "Register Ctrl+Q as shortcut to close Discord",
+ description: "Add Ctrl+Q as a keyboard shortcut to close Discord. This provides an alternative to Alt+F4 for quickly closing the application.",
restartRequired: true,
warning: { enabled: false },
},
];
return (
-
+
{(isEquicordDonor(user?.id) || isVencordDonor(user?.id)) ? (
-
+
) : (
openContributorModal(user)}
- />
+ >
+
+
)}
-
- Quick Actions
+ Quick Actions
+
+ Common actions you might want to perform. These shortcuts give you quick access to frequently used features without navigating through menus.
+
-
+
+
+ VencordNative.quickCss.openEditor()}
+ />
+ {!IS_WEB && (
+ )}
+ {!IS_WEB && (
VencordNative.quickCss.openEditor()}
+ Icon={FolderIcon}
+ text="Open Settings Folder"
+ action={() => VencordNative.settings.openFolder()}
/>
- {!IS_WEB && (
-
- )}
- {!IS_WEB && (
- VencordNative.settings.openFolder()}
- />
- )}
-
- VencordNative.native.openExternal(
- "https://github.com/" + gitRemote,
+ )}
+
+ VencordNative.native.openExternal(
+ "https://github.com/" + gitRemote,
+ )
+ }
+ />
+
+
+
+
+ Client Settings
+
+ Configure how Equicord behaves and integrates with Discord. These settings affect the Discord client's appearance and behavior.
+
+
+ You can customize where this settings section appears in Discord's settings menu by configuring the{" "}
+ openPluginModal(Vencord.Plugins.plugins.Settings)}
+ style={{ cursor: "pointer", color: "var(--text-link)" }}
+ >
+ Settings Plugin
+ .
+
+
+ {Switches.filter((s): s is Exclude => !!s).map(
+ s => (
+ (settings[s.key] = v)}
+ title={s.title}
+ description={
+ s.warning.enabled ? (
+ <>
+ {s.description}
+
+ {s.warning.message}
+
+
+ ) : (
+ s.description
)
}
+ hideBorder
/>
-
-
-
-
-
-
- Settings
-
- Hint: You can change the position of this settings section in the{" "}
-
- !
-
-
- {Switches.map(
- s =>
- s && (
- (settings[s.key] = v)}
- title={s.title}
- description={
- s.warning.enabled ? (
- <>
- {s.description}
-
- {s.warning.message}
-
-
- ) : (
- s.description
- )
- }
- />
- ),
- )}
-
+ ),
+ )}
{needsVibrancySettings && (
<>
-
- Window vibrancy style (requires restart)
-
+
+
+ Window Vibrancy
+
+ Customize the macOS window vibrancy effect. This controls the blur and transparency style of the Discord window. Changes require a restart to take effect.
+
)}
-
-
-
-
-
-
-
- );
-}
+
-function DonateButtonComponent() {
- return (
-
-
-
-
+ Notifications
+
+ Configure how Equicord handles notifications. You can customize when and how you receive alerts, or view a history of past notifications.
+
+
+
+
+
+
+
);
}
diff --git a/src/debug/runReporter.ts b/src/debug/runReporter.ts
index a7292013b..679c40bc3 100644
--- a/src/debug/runReporter.ts
+++ b/src/debug/runReporter.ts
@@ -4,12 +4,12 @@
* SPDX-License-Identifier: GPL-3.0-or-later
*/
+import { addPatch } from "@api/PluginManager";
import { initWs } from "@plugins/devCompanion.dev/initWs";
import { Logger } from "@utils/Logger";
import * as Webpack from "@webpack";
-import { getBuildNumber, patchTimings } from "webpack/patchWebpack";
+import { getBuildNumber, patches, patchTimings } from "@webpack/patcher";
-import { addPatch, patches } from "../plugins";
import { loadLazyChunks } from "./loadLazyChunks";
import { reporterData } from "./reporterData";
@@ -125,7 +125,7 @@ async function runReporter() {
}
// Imported in webpack for reporterData, wrap to avoid running reporter
-// Run after the Vencord object has been created.
-// We need to add extra properties to it, and it is only created after all of Vencord code has ran
+// Run after the Equicord object has been created.
+// We need to add extra properties to it, and it is only created after all of Equicord code has ran
if (IS_REPORTER)
setTimeout(runReporter, 0);
diff --git a/src/equicordplugins/_api/headerBar.ts b/src/equicordplugins/_api/headerBar.ts
new file mode 100644
index 000000000..074aadf3a
--- /dev/null
+++ b/src/equicordplugins/_api/headerBar.ts
@@ -0,0 +1,31 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2025 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { EquicordDevs } from "@utils/constants";
+import definePlugin from "@utils/types";
+
+export default definePlugin({
+ name: "HeaderBarAPI",
+ description: "API to add buttons to the header bar and channel toolbar.",
+ authors: [EquicordDevs.Prism],
+
+ patches: [
+ {
+ find: '?"BACK_FORWARD_NAVIGATION":',
+ replacement: {
+ match: /(?<=\i\.Fragment,\{children:\[.{1,500}className:\i\}\))(?=\])/,
+ replace: ",...Vencord.Api.HeaderBar._addHeaderBarButtons()"
+ }
+ },
+ {
+ find: "Missing channel in Channel.renderHeaderToolbar",
+ replacement: {
+ match: /(?<=renderHeaderToolbar",\(\)=>\{.{1,200}let (\i)=\[\];)/,
+ replace: "Vencord.Api.HeaderBar._addChannelToolbarButtons($1);"
+ }
+ }
+ ]
+});
diff --git a/src/equicordplugins/_api/userArea.ts b/src/equicordplugins/_api/userArea.ts
new file mode 100644
index 000000000..4f1010323
--- /dev/null
+++ b/src/equicordplugins/_api/userArea.ts
@@ -0,0 +1,36 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2025 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { EquicordDevs } from "@utils/constants";
+import definePlugin from "@utils/types";
+
+export default definePlugin({
+ name: "UserAreaAPI",
+ description: "API to add buttons to the user area panel.",
+ authors: [EquicordDevs.Prism],
+
+ patches: [
+ {
+ find: "#{intl::ACCOUNT_SPEAKING_WHILE_MUTED}",
+ replacement: {
+ match: /(className:(\i)\.buttons,.{0,50}?children:\[)/,
+ replace: "$1...$self.renderButtons(arguments[0],$2),"
+ }
+ }
+ ],
+
+ renderButtons(props: { nameplate?: any; }, styles: { iconForeground?: string; }) {
+ return Vencord.Api.UserArea._renderButtons({
+ nameplate: props.nameplate,
+ iconForeground: props.nameplate != null ? styles.iconForeground : void 0,
+ hideTooltips: this.shouldHideTooltips()
+ });
+ },
+
+ shouldHideTooltips() {
+ return Vencord.Plugins.isPluginEnabled("BetterUserArea") && Vencord.Plugins.plugins.BetterUserArea.settings?.store?.removeButtonTooltips;
+ }
+});
diff --git a/src/equicordplugins/_misc/clanBadges.css b/src/equicordplugins/_misc/clanBadges.css
deleted file mode 100644
index 6e577ba70..000000000
--- a/src/equicordplugins/_misc/clanBadges.css
+++ /dev/null
@@ -1,3 +0,0 @@
-[class*="chipletContainerInner_"]:has([src *="/clan-badges/"]) {
- display: none;
-}
diff --git a/src/equicordplugins/_misc/styles.css b/src/equicordplugins/_misc/styles.css
deleted file mode 100644
index 41ce53d89..000000000
--- a/src/equicordplugins/_misc/styles.css
+++ /dev/null
@@ -1,11 +0,0 @@
-.plugin-warning {
- font-size: 16px !important;
- background-color: var(--info-warning-background) !important;
- color: var(--info-warning-foreground) !important;
- border: 1px solid var(--info-warning-foreground) !important;
- border-radius: 5px !important;
- font-weight: bold;
- padding: 6px 10px;
- text-align: center;
- margin-top: 10px;
-}
diff --git a/src/equicordplugins/absRPC/index.tsx b/src/equicordplugins/absRPC/index.tsx
index 3032e860e..fcf29d36f 100644
--- a/src/equicordplugins/absRPC/index.tsx
+++ b/src/equicordplugins/absRPC/index.tsx
@@ -72,6 +72,7 @@ const applicationId = "1381423044907503636";
const logger = new Logger("AudioBookShelfRichPresence");
let authToken: string | null = null;
+let updateInterval: NodeJS.Timeout | undefined;
async function getApplicationAsset(key: string): Promise {
return (await ApplicationAssetUtils.fetchAssetIds(applicationId, [key]))[0];
@@ -105,11 +106,12 @@ export default definePlugin({
start() {
this.updatePresence();
- this.updateInterval = setInterval(() => { this.updatePresence(); }, 10000);
+ updateInterval = setInterval(() => { this.updatePresence(); }, 10000);
},
stop() {
- clearInterval(this.updateInterval);
+ clearInterval(updateInterval);
+ updateInterval = undefined;
},
async authenticate(): Promise {
diff --git a/src/equicordplugins/alwaysExpandProfiles/index.ts b/src/equicordplugins/alwaysExpandProfiles/index.ts
index e06f8179c..c78baea4f 100644
--- a/src/equicordplugins/alwaysExpandProfiles/index.ts
+++ b/src/equicordplugins/alwaysExpandProfiles/index.ts
@@ -4,13 +4,10 @@
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-import { migratePluginSettings } from "@api/Settings";
import { Devs } from "@utils/constants";
import { openUserProfile } from "@utils/discord";
import definePlugin from "@utils/types";
-import { User } from "@vencord/discord-types";
-migratePluginSettings("AlwaysExpandProfiles", "AlwaysExpandProfile");
export default definePlugin({
name: "AlwaysExpandProfiles",
description: "Always expands profile popouts to the full modal",
@@ -19,13 +16,13 @@ export default definePlugin({
{
find: '"view-profile"',
replacement: {
- match: /(user:(\i).*?"PRESS_VIEW_PROFILE".{0,200})return/,
- replace: "$1return $self.openUserProfile($2);"
+ match: /("PRESS_VIEW_PROFILE".{0,200})return(?<=userId:(\i\.id).*?)/,
+ replace: "$1return $self.openUserModal($2);"
},
all: true
},
],
- openUserProfile(user: User) {
- openUserProfile(user.id);
+ openUserModal(userId: string) {
+ openUserProfile(userId);
}
});
diff --git a/src/equicordplugins/anammox/index.ts b/src/equicordplugins/anammox/index.ts
index 463351649..76325941b 100644
--- a/src/equicordplugins/anammox/index.ts
+++ b/src/equicordplugins/anammox/index.ts
@@ -105,7 +105,7 @@ export default definePlugin({
{
// Gift button
find: '"sticker")',
- replacement: { match: /&&\i\.push\(\([^&]*?,"gift"\)\)/, replace: "", },
+ replacement: { match: /&&\i\.push\(\{[^&]*?,"gift"\)\}\)/, replace: "", },
predicate: () => settings.store.gift,
},
{
diff --git a/src/equicordplugins/animalese/index.ts b/src/equicordplugins/animalese/index.ts
index 265c2e0d6..1f8ccb568 100644
--- a/src/equicordplugins/animalese/index.ts
+++ b/src/equicordplugins/animalese/index.ts
@@ -222,16 +222,11 @@ export default definePlugin({
}
},
- start() {
- // Only subscribe once!
- const init = async () => {
- if (!audioContext) {
- audioContext = new AudioContext();
- await initSoundBuffers();
- }
- init();
- };
- init();
+ async start() {
+ if (!audioContext) {
+ audioContext = new AudioContext();
+ await initSoundBuffers();
+ }
},
stop() {
diff --git a/src/equicordplugins/arRPCBun.web/index.tsx b/src/equicordplugins/arRPCBun.web/index.tsx
deleted file mode 100644
index 012c4f45d..000000000
--- a/src/equicordplugins/arRPCBun.web/index.tsx
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2025 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { popNotice, showNotice } from "@api/Notices";
-import { definePluginSettings } from "@api/Settings";
-import { EquicordDevs } from "@utils/constants";
-import { Logger } from "@utils/Logger";
-import { isAnyPluginDev, isEquicordGuild } from "@utils/misc";
-import definePlugin, { OptionType, ReporterTestable } from "@utils/types";
-import { findByCodeLazy } from "@webpack";
-import { ApplicationAssetUtils, FluxDispatcher, Toasts, UserStore } from "@webpack/common";
-
-const fetchApplicationsRPC = findByCodeLazy('"Invalid Origin"', ".application");
-const logger = new Logger("arRPCBun");
-
-async function lookupAsset(applicationId: string, key: string): Promise {
- return (await ApplicationAssetUtils.fetchAssetIds(applicationId, [key]))[0];
-}
-
-const apps: any = {};
-async function lookupApp(applicationId: string): Promise {
- const socket: any = {};
- await fetchApplicationsRPC(socket, applicationId);
- return socket.application;
-}
-
-let ws: WebSocket;
-
-export const settings = definePluginSettings({
- oldVerNotice: {
- type: OptionType.BOOLEAN,
- description: "old version notice for why arrpc bun doesnt work",
- default: false,
- hidden: true
- },
- oneTimeNotice: {
- type: OptionType.BOOLEAN,
- description: "One time notice for showing arrpc disabled",
- default: false,
- hidden: true
- },
-});
-
-
-export default definePlugin({
- name: "arRPCBun",
- description: "arRPCBun integration",
- authors: [EquicordDevs.creations],
- reporterTestable: ReporterTestable.None,
- enabledByDefault: IS_EQUIBOP,
- settings,
-
- commands: [
- {
- name: "arrpc-debug",
- description: "Show arRPCBun debug information",
- predicate: ctx => {
- const result = isAnyPluginDev(UserStore.getCurrentUser()?.id) || isEquicordGuild(ctx?.guild?.id, true);
- return result;
- },
- execute: () => {
- const arrpcStatus = IS_EQUIBOP ? VesktopNative.arrpc?.getStatus?.() : null;
-
- let content = "";
-
- if (IS_EQUIBOP) {
- const version = VesktopNative.app.getVersion();
- const gitHash = VesktopNative.app.getGitHash?.();
- const shortHash = gitHash?.slice(0, 7);
-
- content += `Equibop: v${version}`;
- if (shortHash) {
- content += ` • [${shortHash}]()`;
- }
- content += "\n";
- }
-
- if (arrpcStatus) {
- content += `Running: ${arrpcStatus.running ? "Yes" : "No"}\n`;
- content += `Enabled: ${arrpcStatus.enabled ? "Yes" : "No"}\n`;
-
- if (arrpcStatus.running) {
- content += `Port: ${arrpcStatus.port}\n`;
- content += `PID: ${arrpcStatus.pid}\n`;
-
- if (arrpcStatus.uptime) {
- const seconds = Math.floor(arrpcStatus.uptime / 1000);
- const minutes = Math.floor(seconds / 60);
- const hours = Math.floor(minutes / 60);
-
- if (hours > 0) {
- content += `Uptime: ${hours}h ${minutes % 60}m ${seconds % 60}s\n`;
- } else if (minutes > 0) {
- content += `Uptime: ${minutes}m ${seconds % 60}s\n`;
- } else {
- content += `Uptime: ${seconds}s\n`;
- }
- }
- }
-
- const info = [
- arrpcStatus.restartCount > 0 && ["Restarts", arrpcStatus.restartCount],
- arrpcStatus.bunPath && ["Bun", arrpcStatus.bunPath],
- arrpcStatus.warnings?.length && ["Warnings", arrpcStatus.warnings.join(", ")],
- arrpcStatus.lastError && ["Last Error", arrpcStatus.lastError],
- arrpcStatus.lastExitCode && arrpcStatus.lastExitCode !== 0 && ["Exit Code", arrpcStatus.lastExitCode]
- ].filter(Boolean);
-
- content += info.map(([type, value]) => `${type}: ${value}`).join("\n");
- } else {
- if (ws) {
- content += ws.readyState === WebSocket.OPEN
- ? "WebSocket: Connected to external arRPCBun server\n"
- : `WebSocket: ${["Connecting", "Open", "Closing", "Closed"][ws.readyState]}\n`;
- } else {
- content += "WebSocket: Not connected\n";
- }
- }
-
- return { content };
- },
- },
- ],
-
- async handleEvent(e: MessageEvent) {
- const data = JSON.parse(e.data);
-
- const { activity } = data;
- const assets = activity?.assets;
-
- if (assets?.large_image) assets.large_image = await lookupAsset(activity.application_id, assets.large_image);
- if (assets?.small_image) assets.small_image = await lookupAsset(activity.application_id, assets.small_image);
-
- if (activity) {
- const appId = activity.application_id;
- apps[appId] ||= await lookupApp(appId);
-
- const app = apps[appId];
- activity.name ||= app.name;
- }
-
- FluxDispatcher.dispatch({ type: "LOCAL_ACTIVITY_UPDATE", ...data });
- },
-
- async start() {
- // only works on 3.0.8+
- if (IS_EQUIBOP) {
- const version = VesktopNative.app.getVersion();
- const [major, minor, patch] = version.split(".").map(Number);
-
- if (major < 3 || (major === 3 && minor === 0 && patch < 8) && !settings.store.oldVerNotice) {
- logger.error(`Equibop ${version} is too old. Requires 3.0.8+ for arRPCBun fix.`);
- showNotice(`arRPCBun requires Equibop 3.0.8+. You have ${version}. Update Equibop to use this plugin.`, "OK", () => {
- settings.store.oldVerNotice = true;
- popNotice();
- });
- return;
- }
- }
-
- // disable WebRichPresence to avoid conflicts
- const webRPC = Vencord.Plugins.plugins.WebRichPresence;
- if (webRPC && Vencord.Plugins.isPluginEnabled("WebRichPresence")) {
- logger.info("Disabling WebRichPresence to avoid conflicts");
- Vencord.Plugins.stopPlugin(webRPC);
- }
-
- // get arRPC status from Equibop if available, otherwise use defaults
- const arrpcStatus = IS_EQUIBOP ? VesktopNative.arrpc?.getStatus?.() : null;
-
- // if on Equibop and arRPC is disabled AND not running, warn user
- if (IS_EQUIBOP && !arrpcStatus?.enabled && !arrpcStatus?.running && !settings.store.oneTimeNotice) {
- logger.warn("Equibop's built-in arRPC is disabled and not running");
- showNotice("arRPC is not running. Enable it in Equibop settings, or run your own arRPCBun server.", "OK", () => {
- settings.store.oneTimeNotice = true;
- popNotice();
- });
- return;
- }
-
- const host = arrpcStatus?.host || "127.0.0.1";
- const port = arrpcStatus?.port || 1337;
-
- const wsUrl = `ws://${host}:${port}`;
- logger.info(`Connecting to arRPCBun at ${wsUrl}${arrpcStatus?.host ? "" : " (using defaults)"}`);
-
- if (ws) ws.close();
- ws = new WebSocket(wsUrl);
-
- ws.onmessage = this.handleEvent;
-
- ws.onerror = error => {
- logger.error("WebSocket error:", error);
- };
-
- ws.onclose = () => {
- logger.info("WebSocket closed");
- };
-
- const connectionSuccessful = await new Promise(res => setTimeout(() => res(ws.readyState === WebSocket.OPEN), 5000));
- if (!connectionSuccessful) {
- logger.error("Failed to connect to arRPCBun");
- showNotice("Failed to connect to arRPCBun, is it running?", "Retry", () => {
- popNotice();
- this.start();
- });
- return;
- }
-
- logger.info("Successfully connected to arRPCBun");
- Toasts.show({
- message: "Connected to arRPCBun",
- type: Toasts.Type.SUCCESS,
- id: Toasts.genId(),
- options: {
- duration: 1000,
- position: Toasts.Position.BOTTOM
- }
- });
- },
-
- stop() {
- FluxDispatcher.dispatch({ type: "LOCAL_ACTIVITY_UPDATE", activity: null });
- ws?.close();
- logger.info("Stopped arRPCBun connection");
- }
-});
diff --git a/src/equicordplugins/bannersEverywhere/index.tsx b/src/equicordplugins/bannersEverywhere/index.tsx
index b6f5b8984..1ddb255d8 100644
--- a/src/equicordplugins/bannersEverywhere/index.tsx
+++ b/src/equicordplugins/bannersEverywhere/index.tsx
@@ -5,20 +5,17 @@
*/
import * as DataStore from "@api/DataStore";
+import { isPluginEnabled } from "@api/PluginManager";
import { definePluginSettings } from "@api/Settings";
import { disableStyle, enableStyle } from "@api/Styles";
+import usrbg from "@plugins/usrbg";
import { Devs } from "@utils/constants";
-import definePlugin, { OptionType, Plugin } from "@utils/types";
+import definePlugin, { OptionType } from "@utils/types";
import { User } from "@vencord/discord-types";
import { findStoreLazy } from "@webpack";
import style from "./style.css?managed";
-interface iUSRBG extends Plugin {
- userHasBackground(userId: string);
- getImageUrl(userId: string): string | null;
-}
-
interface Nameplate {
imgAlt: string;
palette: {
@@ -138,8 +135,8 @@ export default definePlugin({
},
getBanner(userId: string): string | undefined {
- if (Vencord.Plugins.isPluginEnabled("USRBG") && (Vencord.Plugins.plugins.USRBG as iUSRBG).userHasBackground(userId)) {
- let banner = (Vencord.Plugins.plugins.USRBG as iUSRBG).getImageUrl(userId);
+ if (isPluginEnabled(usrbg.name) && usrbg.userHasBackground(userId)) {
+ let banner = usrbg.getImageUrl(userId);
if (banner === null) banner = "";
return banner;
}
diff --git a/src/equicordplugins/baseDecoder/index.tsx b/src/equicordplugins/baseDecoder/index.tsx
index bb0cf2bb9..d645c2b2a 100644
--- a/src/equicordplugins/baseDecoder/index.tsx
+++ b/src/equicordplugins/baseDecoder/index.tsx
@@ -23,7 +23,7 @@ import ErrorBoundary from "@components/ErrorBoundary";
import { Flex } from "@components/Flex";
import { Heading } from "@components/Heading";
import { EquicordDevs } from "@utils/constants";
-import { copyWithToast } from "@utils/misc";
+import { copyWithToast } from "@utils/discord";
import { closeModal, ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalRoot, ModalSize, openModal } from "@utils/modal";
import definePlugin, { OptionType } from "@utils/types";
import { Button, ChannelStore } from "@webpack/common";
@@ -82,7 +82,7 @@ function openDecodedBase64Modal(decodedContent) {
: null;
};
+interface TabNumberBadgeProps {
+ number: number;
+ position: "left" | "right";
+ isSelected: boolean;
+ isCompact: boolean;
+ isHovered: boolean;
+}
+
+export const TabNumberBadge = ({ number, position, isSelected, isCompact, isHovered }: TabNumberBadgeProps) => {
+ // hide badge if:
+ // 1. tab is currently selected
+ // 2. tab is compact AND not hovered
+ const shouldHide = isSelected || (isCompact && !isHovered);
+
+ if (shouldHide) return null;
+
+ return (
+
+ {number}
+
+ );
+};
+
function ChannelTabContent(props: ChannelTabsProps & {
guild?: Guild,
channel?: Channel;
@@ -113,11 +139,15 @@ function ChannelTabContent(props: ChannelTabsProps & {
const [isTyping, status, isMobile] = useStateFromStores(
[TypingStore, PresenceStore],
- () => [
- !!((Object.keys(TypingStore.getTypingUsers(props.channelId)) as string[]).filter(id => id !== userId).length),
- PresenceStore.getStatus(recipients?.[0]) as string,
- PresenceStore.isMobileOnline(recipients?.[0]) as boolean
- ]
+ () => {
+ const recipientId = recipients?.[0] ?? "";
+
+ return [
+ !!((Object.keys(TypingStore.getTypingUsers(props.channelId)) as string[]).filter(id => id !== userId).length),
+ PresenceStore.getStatus(recipientId),
+ PresenceStore.isMobileOnline(recipientId)
+ ];
+ }
);
if (guild) {
@@ -204,7 +234,9 @@ function ChannelTabContent(props: ChannelTabsProps & {
"__shop__": { label: "Shop", Icon: ShopIcon },
"__library__": { label: "Library", Icon: () => LibraryIcon(20, 20) },
"__discovery__": { label: "Discovery", Icon: DiscoveryIcon },
- "__nitro__": { label: "Nitro", Icon: NitroIcon }
+ "__nitro__": { label: "Nitro", Icon: NitroIcon },
+ "__icymi__": { label: "ICYMI", Icon: ICYMIIcon },
+ "__activity__": { label: "Activity", Icon: ActivityIcon },
};
const pageConfig = specialPagesConfig[channelId];
@@ -245,6 +277,9 @@ export default function ChannelTab(props: ChannelTabsProps & { index: number; })
const [isClosing, setIsClosing] = useState(false);
const [isDragging, setIsDragging] = useState(false);
const [isDropTarget, setIsDropTarget] = useState(false);
+ const [isHovered, setIsHovered] = useState(false);
+
+ const { showTabNumbers, tabNumberPosition } = settings.use(["showTabNumbers", "tabNumberPosition"]);
useEffect(() => {
if (isEntering) {
@@ -271,6 +306,7 @@ export default function ChannelTab(props: ChannelTabsProps & { index: number; })
const startX = e.clientX;
const startWidth = ref.current?.getBoundingClientRect().width || 0;
const baseWidth = 192; // 12rem in pixels (assuming 16px base font)
+ let pendingScale = settings.store.tabWidthScale;
document.body.style.cursor = "ew-resize";
document.body.style.userSelect = "none";
@@ -282,7 +318,12 @@ export default function ChannelTab(props: ChannelTabsProps & { index: number; })
// 50% and 200% scale
const clampedScale = Math.max(0.5, Math.min(2, newScale));
- settings.store.tabWidthScale = Math.round(clampedScale * 100);
+ pendingScale = Math.round(clampedScale * 100);
+
+ // update CSS variable immediately for visual feedback
+ if (ref.current) {
+ ref.current.style.setProperty("--tab-width-scale", String(pendingScale / 100));
+ }
};
const handleMouseUp = () => {
@@ -290,6 +331,12 @@ export default function ChannelTab(props: ChannelTabsProps & { index: number; })
document.removeEventListener("mouseup", handleMouseUp);
document.body.style.cursor = "";
document.body.style.userSelect = "";
+
+ settings.store.tabWidthScale = pendingScale;
+
+ if (ref.current) {
+ ref.current.style.removeProperty("--tab-width-scale");
+ }
};
document.addEventListener("mousemove", handleMouseMove);
@@ -396,6 +443,8 @@ export default function ChannelTab(props: ChannelTabsProps & { index: number; })
})}
key={index}
ref={ref}
+ onMouseEnter={() => setIsHovered(true)}
+ onMouseLeave={() => setIsHovered(false)}
onAuxClick={e => {
if (e.button === 1 /* middle click */)
closeTab(id);
@@ -410,7 +459,29 @@ export default function ChannelTab(props: ChannelTabsProps & { index: number; })
className={cl("tab-inner")}
data-compact={compact}
>
+ {/* left position badge */}
+ {showTabNumbers && tabNumberPosition === "left" && (
+
+ )}
+
+
+ {/* right position badge */}
+ {showTabNumbers && tabNumberPosition === "right" && (
+
+ )}
@@ -421,7 +492,7 @@ export default function ChannelTab(props: ChannelTabsProps & { index: number; })
setTimeout(() => closeTab(id), 150);
}}
>
-