Fix collab bug that made it not work for room participants + fix bug …

…where whitelisted emails weren't whitelisted (#2617) fix collab bug that made it not work for room participants + fix bug where whitelisted emails weren't actually whitelisted
hackclub · Nov 26, 2024 · e558f5f · e558f5f
1 parent 0e39c17
commit e558f5f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/components/big-interactive-pages/editor.tsx b/src/components/big-interactive-pages/editor.tsx
@@ -528,7 +528,7 @@ export default function Editor({ persistenceState, cookies, roomState }: EditorP
 	}, [initialCode]);
 
 	return (
-		isNewSaveStrat.value && persistenceState.value.kind === PersistenceStateKind.COLLAB && typeof persistenceState.value.game === 'string' 
+		roomState != undefined && persistenceState.value.kind === PersistenceStateKind.COLLAB && typeof persistenceState.value.game === 'string' 
 		? 
 			(<>
 				<RoomPasswordPopup persistenceState={persistenceState} />

diff --git a/src/lib/game-saving/account.ts b/src/lib/game-saving/account.ts
@@ -347,11 +347,11 @@ async function hashCodeToBigInt(string : string) : Promise<bigint>{
 }
 
 export async function isAccountWhitelistedToUseCollabAndSavingBetaFeatures(id: string, email: string) : Promise<boolean>{
+	if(whitelistedBetaCollabAndSavingStratEmails.includes(email)) return true;
 	if(import.meta.env.PERCENT_OF_USERS_WHITELISTED_FOR_BETA_FEATURE == 0 || import.meta.env.PERCENT_OF_USERS_WHITELISTED_FOR_BETA_FEATURE == undefined) return false;
 	let hashedId = await hashCodeToBigInt(id);
 
-	if(hashedId % BigInt(100) < import.meta.env.PERCENT_OF_USERS_WHITELISTED_FOR_BETA_FEATURE || 
-	whitelistedBetaCollabAndSavingStratEmails.includes(email)){
+	if(hashedId % BigInt(100) < import.meta.env.PERCENT_OF_USERS_WHITELISTED_FOR_BETA_FEATURE){
 		return true
 	}
 	return false;