From 77c1894483388232a0f320db32fa839a549b63ef Mon Sep 17 00:00:00 2001
From: steveseguin <punkrawker@gmail.com>
Date: Sat, 20 Apr 2024 15:30:22 -0400
Subject: [PATCH] fix for presets /w &labels

---
 index.html |  6 +++---
 lib.js     | 16 +++++++++++++---
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/index.html b/index.html
index dab028c..cf1a748 100644
--- a/index.html
+++ b/index.html
@@ -1641,7 +1641,7 @@
 							<i class="las la-compact-disc"></i>
 							<span data-translate="record-remote"> Record Remote</span>
 						</button>
-						<button data-action-type="recorder-google-drive-remote" title="The Remote Guest will record their local stream to their local drive. *experimental*" onclick="requestGoogleDriveRecord(this)">
+						<button data-action-type="recorder-google-drive-remote" title="The Remote Guest will record their local stream and upload it to your Google Drive. *experimental*" onclick="requestGoogleDriveRecord(this)">
 							<i class="las la-compact-disc"></i>
 							<span data-translate="google-drive-record"> Google Drive</span>
 						</button>
@@ -2749,7 +2749,7 @@
 			// session.decrypted = session.decodeInvite("U2FsdGVkX1+d58DFIHoO3EQZSuX86ch4PqW2ouztnJ0="); // get a code from invite.cam
 			
 		</script>
-		<script type="text/javascript" crossorigin="anonymous" id="lib-js" src="./lib.js?ver=1152"></script>
-		<script type="text/javascript" crossorigin="anonymous" id="main-js" src="./main.js?ver=862"></script>
+		<script type="text/javascript" crossorigin="anonymous" id="lib-js" src="./lib.js?ver=1154"></script>
+		<script type="text/javascript" crossorigin="anonymous" id="main-js" src="./main.js?ver=864"></script>
 	</body>
 </html>
diff --git a/lib.js b/lib.js
index 1c540d1..d952483 100644
--- a/lib.js
+++ b/lib.js
@@ -249,6 +249,8 @@ if (urlParams.has('invite') || urlParams.has('i') || urlParams.has('code')){
 				presetString = "?"+presetString;
 			}
 			
+			session.preset =  presetString;
+			
 			let newURL = presetString + "&" + urlParams.toString();
 			newURL = newURL.replace(/\?/g, "&");
 			newURL = newURL.replace(/\&/, "?");
@@ -383,7 +385,15 @@ function updateURL(param, force = false, cleanUrl = false) {
 	if (session.sticky) {
 		setStorage("settings", encodeURI(window.location.href), 999);
 	}
+	
 	urlParams = new URLSearchParams(window.location.search);
+	
+	if (session.preset){
+		let newURL = session.preset + "&" + urlParams.toString();
+		newURL = newURL.replace(/\?/g, "&");
+		newURL = newURL.replace(/\&/, "?");
+		urlParams = new URLSearchParams(newURL);
+	}
 }
 
 /* function changeGuestSettings(ele){
@@ -19601,7 +19611,7 @@ async function changeSlot(event, ele){
 	}
 }
 
-function setSlot(ele, slot){
+function setSlot(ele, slot){ 
 	log("setSlot()");
 	getById("slotPicker").classList.add("hidden");
 	if (slot!==null){
@@ -39835,9 +39845,9 @@ function smdInfo(){
 }
 
 function getGuestTarget(type, id){
-	var element = document.querySelectorAll('[data-action-type="'+type+'"][data-sid="'+id+'"]'); // data-sid="P5MQpia"
+	var element = document.querySelectorAll('[data-sid="'+id+'"] > [data-action-type="'+type+'"]'); // data-sid="P5MQpia"
 	if (!element.length){
-		return element = getRightOrderedElement('[data-action-type="'+type+'"][data--u-u-i-d]', id);
+		return element = getRightOrderedElement('[data--u-u-i-d] [data-action-type="'+type+'"]', id);
 	} else {
 		element = element[0];
 	}