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

SupportHelper: Fix redundant check

Browse source
This commit is contained in:
thororen1234 2026-06-09 22:43:20 -04:00
parent ad28abc843
commit b12df9aa07
No known key found for this signature in database
2 changed files with 34 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
src/plugins/_core/supportHelper.tsx
View file

@ -34,7 +34,7 @@ import { CONTRIB_ROLE_ID, Devs, DONOR_ROLE_ID, EQUICORD_TEAM, GUILD_ID, SUPPORT_
import { sendMessage } from "@utils/discord";
import { Logger } from "@utils/Logger";
import { Margins } from "@utils/margins";
import { isAnyPluginDev, isEquicordGuild, isEquicordSupport, isSupportChannel, tryOrElse } from "@utils/misc";
import { isAnyPluginDev, isEquicordGuild, isEquicordSupport, isKnownIssuesCategory, isSupportChannel, tryOrElse } from "@utils/misc";
import { relaunch } from "@utils/native";
import { onlyOnce } from "@utils/onlyOnce";
import { makeCodeblock } from "@utils/text";
@ -462,7 +462,7 @@ export default definePlugin({
);
}
if (isSupportChannel(props.channel.id) && PermissionStore.can(PermissionsBits.SEND_MESSAGES, props.channel) && equicordSupport) {
if (equicordSupport && isSupportChannel(props.channel.id) && PermissionStore.can(PermissionsBits.SEND_MESSAGES, props.channel)) {
if (props.message.content.includes("/equicord-debug") || props.message.content.includes("/equicord-plugins")) {
buttons.push(
<Button
@ -494,34 +494,34 @@ export default definePlugin({
</Button>
);
}
}
if (equicordSupport || props.channel.parent_id === SUPPORT_CHANNEL_ID) {
const match = CodeBlockRe.exec(props.message.content || props.message.embeds[0]?.rawDescription || "");
if (match) {
buttons.push(
<Button
key="vc-run-snippet"
onClick={async () => {
try {
const result = await AsyncFunction(match[1])();
const stringed = String(result);
if (stringed) {
await sendBotMessage(SelectedChannelStore.getChannelId(), {
content: stringed
});
}
showToast("Success!", Toasts.Type.SUCCESS);
} catch (e) {
new Logger(this.name).error("Error while running snippet:", e);
showToast("Failed to run snippet :(", Toasts.Type.FAILURE);
if (equicordSupport || (isSupportChannel(props.channel.id) || isKnownIssuesCategory(props.channel.parent_id))) {
const match = CodeBlockRe.exec(props.message.content || props.message.embeds[0]?.rawDescription || "");
if (match) {
buttons.push(
<Button
key="vc-run-snippet"
onClick={async () => {
try {
const result = await AsyncFunction(match[1])();
const stringed = String(result);
if (stringed) {
await sendBotMessage(SelectedChannelStore.getChannelId(), {
content: stringed
});
}
}}
>
Run Snippet
</Button>
);
}
showToast("Success!", Toasts.Type.SUCCESS);
} catch (e) {
new Logger(this.name).error("Error while running snippet:", e);
showToast("Failed to run snippet :(", Toasts.Type.FAILURE);
}
}}
>
Run Snippet
</Button>
);
}
}

7
src/utils/misc.ts
View file

@ -19,7 +19,7 @@
import { User } from "@vencord/discord-types";
import { ChannelStore, GuildMemberStore, IconUtils } from "@webpack/common";
import { EQUICORD_HELPERS, EquicordDevsById, GUILD_ID, SUPPORT_CHANNEL_ID, VencordDevsById } from "./constants";
import { EQUICORD_HELPERS, EquicordDevsById, GUILD_ID, KNOWN_ISSUES_CHANNEL_ID, SUPPORT_CHANNEL_ID, VencordDevsById } from "./constants";
/**
* Calls .join(" ") on the arguments
@ -119,6 +119,11 @@ export function isSupportChannel(channelId: string | null | undefined): boolean
return channelId === SUPPORT_CHANNEL_ID;
}
export function isKnownIssuesCategory(channelId: string | null | undefined): boolean {
if (!channelId) return false;
return channelId === KNOWN_ISSUES_CHANNEL_ID;
}
export function isEquicordSupport(userId: string | null | undefined): boolean {
if (!userId) return false;