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

Merge branch 'main' into dev

Browse source
This commit is contained in:
thororen1234 2026-02-02 21:16:25 -05:00
commit 994f14576f
No known key found for this signature in database
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/equicordplugins/voiceRejoin/index.tsx
View file

@ -38,6 +38,11 @@ const settings = definePluginSettings({
{ label: "DMs and Servers", value: "both", default: true },
],
},
applyOnlyToDms: {
type: OptionType.BOOLEAN,
description: "Only apply to DMs.",
default: false,
}
});
export default definePlugin({
@ -76,22 +81,29 @@ export default definePlugin({
const saved = await DataStore.get(DATASTORE_KEY);
if (!saved?.channelId) return;
const channel = ChannelStore.getChannel(saved.channelId);
const isDM = channel.isDM() || channel.isGroupDM() || channel.isMultiUserDM();
const myUserId = UserStore.getCurrentUser().id;
const myVoiceState = VoiceStateStore.getVoiceStateForUser(myUserId);
const preventionMode = settings.store.preventReconnectIfCallEnded;
const timeoutMs = settings.store.rejoinTimeout * 1000;
if (saved.timestamp && Date.now() - saved.timestamp > timeoutMs) {
DataStore.set(DATASTORE_SESSION_KEY, false);
return;
}
const preventionMode = settings.store.preventReconnectIfCallEnded;
if (preventionMode !== "none") {
const channel = ChannelStore.getChannel(saved.channelId);
if (settings.store.applyOnlyToDms && !isDM) {
DataStore.set(DATASTORE_SESSION_KEY, false);
return;
}
if (preventionMode !== "none") {
if (!channel) {
DataStore.set(DATASTORE_SESSION_KEY, false);
return;
}
const isDM = !saved.guildId;
const shouldPrevent =
preventionMode === "both" ||
(preventionMode === "dms" && isDM) ||
@ -110,9 +122,6 @@ export default definePlugin({
}
}
const myUserId = UserStore.getCurrentUser().id;
const myVoiceState = VoiceStateStore.getVoiceStateForUser(myUserId);
if (myVoiceState?.channelId) {
DataStore.set(DATASTORE_SESSION_KEY, false);
return;