Merge pull request #835 from steveseguin/steves-dev-branch

Version 17.1
steveseguin · Apr 23, 2021 · ce97e74 · ce97e74
2 parents 82214cb + 98f0585
commit ce97e74
Show file tree

Hide file tree

Showing 35 changed files with 12,684 additions and 5,356 deletions.
diff --git a/chat.html b/chat.html
@@ -0,0 +1,159 @@
+<html>
+	<head>
+		<meta charset="utf8" />
+		<meta name="viewport" content="width=device-width, initial-scale=1" />
+		<title>OBSN Chat Overlay</title>
+		<style>
+
+			@font-face {
+			  font-family: 'Cousine';
+			  src: url('fonts/Cousine-Bold.ttf') format('truetype');
+			}
+
+			body {
+				margin:0;
+				padding:0 10px;
+				height:100%;
+				border: 0;
+				display: flex;
+				flex-direction: column-reverse;
+				position:absolute;
+				bottom:0;
+				overflow:hidden;
+				max-width:100%;
+			}
+
+			div {
+				margin:0;
+				background-color: black; 
+				padding: 8px 8px 0px 8px;
+				color: white;
+				font-family: Cousine, monospace;
+				font-size: 3.2em;
+				line-height: 1.1em;
+				letter-spacing: 0.0em;
+				text-transform: uppercase;
+				text-shadow: 0.05em 0.05em 0px rgba(0,0,0,1);
+				max-width:100%;
+				word-wrap: break-word;
+				overflow-wrap: break-word;
+				word-break: break-all;
+				hyphens: auto;
+				display:inline-block;
+			}
+
+
+
+			a {
+				color:white;
+				font-size:1.2em;
+				text-transform: none;
+				word-wrap: break-word;
+				overflow-wrap: break-word;
+				word-wrap: break-word;
+				word-break: break-all;
+				hyphens: auto;
+			}
+			</style>
+		<script>
+
+
+			(function (w) {
+				w.URLSearchParams =
+					w.URLSearchParams ||
+					function (searchString) {
+						var self = this;
+						self.searchString = searchString;
+						self.get = function (name) {
+							var results = new RegExp("[\?&]" + name + "=([^&#]*)").exec(
+								self.searchString
+							);
+							if (results == null) {
+								return null;
+							} else {
+								return decodeURI(results[1]) || 0;
+							}
+						};
+					};
+			})(window);
+			var urlParams = new URLSearchParams(window.location.search);
+
+
+			function loadIframe() {
+
+				var iframe = document.createElement("iframe");
+
+				var view= "";
+				if (urlParams.has("view")) {
+					view = "&view="+(urlParams.get("view") || "");
+				} 
+				var room="";
+				if (urlParams.has("room")) {
+					room = "&room="+urlParams.get("room");
+				}
+
+				var password="";
+				if (urlParams.has("password")) {
+					password = "&password="+urlParams.get("password");
+				}
+
+				iframe.allow = "autoplay";
+				var srcString = "./?novideo&noaudio&label=chatOverlay&scene"+room+view+password;
+
+				iframe.src = srcString;
+				iframe.style.width="0";
+				iframe.style.height="0";
+				iframe.style.border="0";
+
+				document.body.appendChild(iframe);
+
+				////////////  LISTEN FOR EVENTS
+
+				var eventMethod = window.addEventListener ? "addEventListener" : "attachEvent";
+				var eventer = window[eventMethod];
+				var messageEvent = eventMethod === "attachEvent" ? "onmessage" : "message";
+
+
+				/// If you have a routing system setup, you could have just one global listener for all iframes instead.
+
+				eventer(messageEvent, function (e) {
+					if (e.source != iframe.contentWindow){return} // reject messages send from other iframes
+
+					console.log(e);
+					if ("gotChat" in e.data){
+						logData(e.data.gotChat.label,e.data.gotChat.msg);
+					}
+				});
+			}
+
+			function printValues(obj) {
+				var out = "";
+				for (var key in obj) {
+					if (typeof obj[key] === "object") {
+						out += "<br />";
+						out += printValues(obj[key]);
+					} else {
+						if (key.startsWith("_")) {
+						} else {
+							out += "<b>" + key + "</b>: " + obj[key] + "<br />";
+						}
+					}
+				}
+				return out;
+			}
+
+			function logData(type, data) {
+				var span = document.createElement('span');
+				var entry = document.createElement('div');
+				if (type){
+					type = "<i>"+type.replace(/_/g, ' ')+"</i>";
+				}
+				entry.innerHTML = type + data;
+				span.appendChild(entry);
+				document.body.prepend(span);
+			}
+		</script>
+	</head>
+	<body onload="loadIframe();">
+	</body>
+</html>
diff --git a/devices.html b/devices.html
@@ -79,7 +79,7 @@ <h1>🔉 Audio Outputs</h1>
 					setVideoSearchParams(element);
 				}
 				if (type === "audiooutput") {
-					return;
+					setAudioOutputSearchParams(element);
 				}
 
 				/*
@@ -142,6 +142,36 @@ <h1>🔉 Audio Outputs</h1>
 						element.className = "device selected";
 					}
 				}
+
+				/*
+				Only allows for a single audio output device to be selected
+				*/
+				function setAudioOutputSearchParams(info) {
+					// Device was already selected
+					if (info.className === "device selected") {
+						element.className = "device";
+
+
+						// Set the url param to the devices that are left
+						url.searchParams.set("od", device);
+						element.className = "device";
+
+						// If no devices remained, just remove the param completely
+						if (audioInputDevices.length === 0) {
+							url.searchParams.delete("od");
+						}
+					} else {
+						// Device is unselected
+						try {
+							element.parentElement.querySelector('.device.selected').className = "device";
+						} catch (error) {
+							console.log("There was no video device already selected.");
+						}
+
+						url.searchParams.set("od", device);
+						element.className = "device selected";
+					}
+				}
 
 				// Update UI
 				showDeviceIdsPopup();

diff --git a/electron.html b/electron.html
@@ -359,6 +359,9 @@
 }
 function gohere(){
 	var url = modURL(true);
+	if (!(document.getElementById('changeText').value.includes("obs.ninja")) && (document.getElementById('changeText').value.includes("http"))  && (document.getElementById('changeText').value.includes("&sink"))){
+		alert("Notice: The &sink command is domain specific.\nVisit https://YOURDOMAIN.com/electron instead.");
+	}
 	window.location = url;
 };
 getPermssions();