SheWhoReignsSupreme/Equicord
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge branch 'dev'

Browse source
This commit is contained in:
thororen1234 2025-09-24 09:32:45 -04:00
commit 480c976132
No known key found for this signature in database
4 changed files with 33 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Vencord.ts
View file

@ -59,7 +59,7 @@ async function syncSettings() {
// User switched to an account that isn't connected to cloud
showNotification({
title: "Cloud Settings",
body: "Cloud sync was disabled because this account isn't connected to the Vencloud App. You can enable it again by connecting this account in Cloud Settings. (note: it will store your preferences separately)",
body: "Cloud sync was disabled because this account isn't connected to the cloud App. You can enable it again by connecting this account in Cloud Settings. (note: it will store your preferences separately)",
color: "var(--yellow-360)",
onClick: () => SettingsRouter.open("VencordCloud")
});

6
src/components/settings/tabs/sync/CloudTab.tsx
View file

@ -135,11 +135,11 @@ function CloudTab() {
<Forms.FormText variant="text-md/normal" className={Margins.bottom20}>
Equicord comes with a cloud integration allowing settings to be synced across apps and devices.
<br />
We use Vencord's <Link href="https://github.com/Vencord/Backend">cloud source code</Link> to provide our cloud instance which has a 60MB backup cap.
We use our own Equicloud <Link href="https://github.com/Equicord/Equicloud">source code</Link> to provide our cloud instance which has a 60MB backup cap.
<br />
Our <Link href="https://vencord.dev/cloud/privacy">privacy policy</Link> allows you to see what information we store, how we use it, and data retention.
Our <Link href="https://equicord.org/cloud/policy">privacy policy</Link> allows you to see what information we store, how we use it, and data retention.
<br />
The Vencord Cloud repository is AGPL 3.0 licensed so you can host it yourself it you would like.
The Equicloud repository is open source so you can host it yourself it you would like.
<br />
You can swap between Equicord and Vencord's different cloud instances below if needed.
</Forms.FormText>

39
src/equicordplugins/voiceButtons/utils.tsx
View file

@ -102,7 +102,10 @@ export function UserMuteButton({ user }: { user: User; }) {
export function UserDeafenButton({ user }: { user: User; }) {
const isCurrent = (user.id === UserStore.getCurrentUser().id);
const isDeafened = isCurrent && MediaEngineStore.isSelfDeaf() || MediaEngineStore.isLocalMute(user.id) && SoundboardStore.isLocalSoundboardMuted(user.id) && MediaEngineStore.isLocalVideoDisabled(user.id);
const isMuted = MediaEngineStore.isLocalMute(user.id);
const isSoundboardMuted = SoundboardStore.isLocalSoundboardMuted(user.id);
const isVideoDisabled = MediaEngineStore.isLocalVideoDisabled(user.id);
const isDeafened = isCurrent && MediaEngineStore.isSelfDeaf() || isMuted && isSoundboardMuted && isVideoDisabled;
const color = isDeafened ? "var(--status-danger)" : "var(--channels-default)";
return (
<VoiceUserButton
@ -114,16 +117,30 @@ export function UserDeafenButton({ user }: { user: User; }) {
VoiceActions.toggleSelfDeaf();
return;
}
VoiceActions.toggleLocalMute(user.id);
if (settings.store.muteSoundboard) {
VoiceActions.toggleLocalSoundboardMute(user.id);
}
if (settings.store.disableVideo) {
VoiceActions.setDisableLocalVideo(
user.id,
MediaEngineStore.isLocalVideoDisabled(user.id) ? "ENABLED" : "DISABLED",
"default"
);
if (isMuted) {
VoiceActions.toggleLocalMute(user.id);
if (settings.store.muteSoundboard && isSoundboardMuted) {
VoiceActions.toggleLocalSoundboardMute(user.id);
}
if (settings.store.disableVideo && isVideoDisabled) {
VoiceActions.setDisableLocalVideo(
user.id,
"ENABLED",
"default"
);
}
} else {
VoiceActions.toggleLocalMute(user.id);
if (settings.store.muteSoundboard && !isSoundboardMuted) {
VoiceActions.toggleLocalSoundboardMute(user.id);
}
if (settings.store.disableVideo && !isVideoDisabled) {
VoiceActions.setDisableLocalVideo(
user.id,
"DISABLED",
"default"
);
}
}
}}
/>

2
src/utils/settingsSync.ts
View file

@ -176,7 +176,7 @@ export async function getCloudSettings(shouldNotify = true, force = false) {
// User switched to an account that isn't connected to cloud
showNotification({
title: "Cloud Settings",
body: "Cloud sync was disabled because this account isn't connected to the Vencloud App. You can enable it again by connecting this account in Cloud Settings. (note: it will store your preferences separately)",
body: "Cloud sync was disabled because this account isn't connected to the cloud App. You can enable it again by connecting this account in Cloud Settings. (note: it will store your preferences separately)",
color: "var(--yellow-360)",
onClick: () => SettingsRouter.open("VencordCloud")
});