From 6b4123b84595407a5cf44a3d6f8cab5dec7f41b8 Mon Sep 17 00:00:00 2001
From: Cadence Ember <cadence@disroot.org>
Date: Wed, 11 Feb 2026 01:10:31 +1300
Subject: [PATCH] More accurate flags check in setup

---
 scripts/setup.js | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/scripts/setup.js b/scripts/setup.js
index 07ded56..26272a6 100644
--- a/scripts/setup.js
+++ b/scripts/setup.js
@@ -184,17 +184,21 @@ function defineEchoHandler() {
 			}
 		})
 
-		const mandatoryIntentFlags = DiscordTypes.ApplicationFlags.GatewayMessageContent | DiscordTypes.ApplicationFlags.GatewayMessageContentLimited
-		if (!(client.flags & mandatoryIntentFlags)) {
+		const intentFlagPossibilities = [
+			DiscordTypes.ApplicationFlags.GatewayMessageContent | DiscordTypes.ApplicationFlags.GatewayPresence,
+			DiscordTypes.ApplicationFlags.GatewayMessageContentLimited | DiscordTypes.ApplicationFlags.GatewayPresenceLimited
+		]
+		const intentFlagMask = intentFlagPossibilities.reduce((a, c) => a | c, 0)
+		if (!intentFlagPossibilities.includes(client.flags & intentFlagMask)) {
 			console.log(`On that same page, scroll down to Privileged Gateway Intents and enable all switches.`)
 			await prompt({
 				type: "invisible",
 				name: "intents",
 				message: "Press Enter when you've enabled them",
-				validate: async token => {
+				validate: async () => {
 					process.stdout.write(magenta("checking, please wait..."))
 					client = await snow.requestHandler.request(`/applications/@me`, {}, "get", "json")
-					if (client.flags & mandatoryIntentFlags) {
+					if (intentFlagPossibilities.includes(client.flags & intentFlagMask)) {
 						return true
 					} else {
 						return "Switches have not been enabled yet"
@@ -220,7 +224,7 @@ function defineEchoHandler() {
 			type: "invisible",
 			name: "description",
 			message: "Press Enter to acknowledge",
-			validate: async token => {
+			validate: async () => {
 				process.stdout.write(magenta("checking, please wait..."))
 				client = await snow.requestHandler.request(`/applications/@me`, {}, "get", "json")
 				if (client.description?.match(/out.of.your.element/i)) {
@@ -237,7 +241,8 @@ function defineEchoHandler() {
 		const clientSecretResponse = await prompt({
 			type: "input",
 			name: "discord_client_secret",
-			message: "Client secret"
+			message: "Client secret",
+			validate: secret => !!secret
 		})
 
 		const expectedUri = `${bridgeOriginResponse.bridge_origin}/oauth`
@@ -247,7 +252,7 @@ function defineEchoHandler() {
 				type: "invisible",
 				name: "redirect_uri",
 				message: "Press Enter when you've added it",
-				validate: async token => {
+				validate: async () => {
 					process.stdout.write(magenta("checking, please wait..."))
 					client = await snow.requestHandler.request(`/applications/@me`, {}, "get", "json")
 					if (client.redirect_uris.includes(expectedUri)) {