diff --git a/src/equicordplugins/questCompleter.discordDesktop/index.tsx b/src/equicordplugins/questCompleter.discordDesktop/index.tsx index b4494f7dc..4cbaf8c27 100644 --- a/src/equicordplugins/questCompleter.discordDesktop/index.tsx +++ b/src/equicordplugins/questCompleter.discordDesktop/index.tsx @@ -71,10 +71,10 @@ async function openCompleteQuestUI() { const applicationId = quest.config.application.id; const applicationName = quest.config.application.name; - const taskName = ["WATCH_VIDEO", "PLAY_ON_DESKTOP", "STREAM_ON_DESKTOP", "PLAY_ACTIVITY", "WATCH_VIDEO_ON_MOBILE"].find(x => quest.config.taskConfig.tasks[x] != null); + const taskName = ["WATCH_VIDEO", "PLAY_ON_DESKTOP", "STREAM_ON_DESKTOP", "PLAY_ACTIVITY", "WATCH_VIDEO_ON_MOBILE"].find(x => quest.config.taskConfigV2.tasks[x] != null); const icon = `https://cdn.discordapp.com/quests/${quest.id}/${theme}/${quest.config.assets.gameTile}`; // @ts-ignore - const secondsNeeded = quest.config.taskConfig.tasks[taskName].target; + const secondsNeeded = quest.config.taskConfigV2.tasks[taskName].target; // @ts-ignore let secondsDone = quest.userStatus?.progress?.[taskName]?.value ?? 0; if (taskName === "WATCH_VIDEO" || taskName === "WATCH_VIDEO_ON_MOBILE") { @@ -155,7 +155,11 @@ async function openCompleteQuestUI() { } }; FluxDispatcher.subscribe("QUESTS_SEND_HEARTBEAT_SUCCESS", fn); - console.log(`Spoofed your game to ${applicationName}.`); + showNotification({ + title: `${applicationName} - Quest Completer`, + body: `Spoofed your application to ${applicationName}.`, + icon: icon, + }); }); } else if (taskName === "STREAM_ON_DESKTOP") { const stream = ApplicationStreamingStore.getAnyStreamForUser(UserStore.getCurrentUser()?.id); @@ -198,7 +202,16 @@ async function openCompleteQuestUI() { } }; FluxDispatcher.subscribe("QUESTS_SEND_HEARTBEAT_SUCCESS", fn); - console.log(`Spoofed your stream to ${applicationName}.`); + showNotification({ + title: `${applicationName} - Quest Completer`, + body: `Stream any window in vc for ${Math.ceil((secondsNeeded - secondsDone) / 60)} more minutes.`, + icon: icon, + }); + showNotification({ + title: `${applicationName} - Quest Completer`, + body: "Remember that you need at least 1 other person to be in the vc!", + icon: icon, + }); } else if (taskName === "PLAY_ACTIVITY") { const channelId = ChannelStore.getSortedPrivateChannels()[0]?.id ?? Object.values(GuildChannelStore.getAllGuilds() as any[]).find(x => x != null && x.VOCAL.length > 0).VOCAL[0].channel.id; const streamKey = `call:${channelId}:1`; diff --git a/src/plugins/_core/supportHelper.tsx b/src/plugins/_core/supportHelper.tsx index c33e0d98b..7a016247e 100644 --- a/src/plugins/_core/supportHelper.tsx +++ b/src/plugins/_core/supportHelper.tsx @@ -22,7 +22,7 @@ import ErrorBoundary from "@components/ErrorBoundary"; import { Flex } from "@components/Flex"; import { Link } from "@components/Link"; import { openUpdaterModal } from "@components/VencordSettings/UpdaterTab"; -import { CONTRIB_ROLE_ID, Devs, DONOR_ROLE_ID, EQUCORD_HELPERS, EQUIBOP_CONTRIB_ROLE_ID, EQUICORD_TEAM, GUILD_ID, SUPPORT_CHANNEL_ID, SUPPORT_CHANNEL_IDS, VC_CONTRIB_ROLE_ID, VC_DONOR_ROLE_ID, VC_GUILD_ID, VC_REGULAR_ROLE_ID, VC_SUPPORT_CHANNEL_ID, VENCORD_CONTRIB_ROLE_ID } from "@utils/constants"; +import { CONTRIB_ROLE_ID, Devs, DONOR_ROLE_ID, EQUCORD_HELPERS, EQUIBOP_CONTRIB_ROLE_ID, EQUICORD_TEAM, GUILD_ID, SUPPORT_CHANNEL_ID, SUPPORT_CHANNEL_IDS, VC_CONTRIB_ROLE_ID, VC_DONOR_ROLE_ID, VC_GUILD_ID, VC_REGULAR_ROLE_ID, VC_SUPPORT_CHANNEL_IDS, VENCORD_CONTRIB_ROLE_ID } from "@utils/constants"; import { sendMessage } from "@utils/discord"; import { Logger } from "@utils/Logger"; import { Margins } from "@utils/margins"; @@ -136,7 +136,9 @@ function generatePluginList() { - +
+ +
Before you ask for help, We do not handle support for users who use 100+ plugins issue could be plugin confliction @@ -201,14 +203,16 @@ export default definePlugin({ const selfId = UserStore.getCurrentUser()?.id; if (!selfId || isPluginDev(selfId) || isEquicordPluginDev(selfId)) return; - if (channelId === VC_SUPPORT_CHANNEL_ID && Vencord.Plugins.isPluginEnabled("VCSupport") && !clicked) { + if (VC_SUPPORT_CHANNEL_IDS.includes(channelId) && Vencord.Plugins.isPluginEnabled("VCSupport") && !clicked) { return Alerts.show({ title: "You are entering the support channel!", body:
- +
+ +
Before you ask for help, Check for updates and if this issue could be caused by Equicord! diff --git a/src/utils/constants.ts b/src/utils/constants.ts index d06e173b3..6c5e8fd4e 100644 --- a/src/utils/constants.ts +++ b/src/utils/constants.ts @@ -37,6 +37,8 @@ export const VC_CONTRIB_ROLE_ID = "1026534353167208489"; export const VC_REGULAR_ROLE_ID = "1026504932959977532"; export const VC_SUPPORT_CATEGORY_ID = "1108135649699180705"; export const VC_KNOWN_ISSUES_CHANNEL_ID = "1222936386626129920"; +export const VESKTOP_SUPPORT_CHANNEL_ID = "1345457031426871417"; +export const VC_SUPPORT_CHANNEL_IDS = [VC_SUPPORT_CHANNEL_ID, VESKTOP_SUPPORT_CHANNEL_ID]; export const GUILD_IDS = [GUILD_ID, VC_GUILD_ID]; export const SUPPORT_CHANNEL_IDS = [SUPPORT_CHANNEL_ID, VC_SUPPORT_CHANNEL_ID];