From 7abd7090f75769fd332f6dcefc1e7030ec1737f8 Mon Sep 17 00:00:00 2001
From: Josh Creek <8179928+jcreek@users.noreply.github.com>
Date: Sun, 25 Jan 2026 19:58:38 +0000
Subject: [PATCH] fix(*): Fix adsense duplication

---
 src/components/UserNameModal.svelte | 50 ++++++++++++++++-------------
 static/service-worker.js            |  7 ++++
 2 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/src/components/UserNameModal.svelte b/src/components/UserNameModal.svelte
index cac1588..bb91fa7 100644
--- a/src/components/UserNameModal.svelte
+++ b/src/components/UserNameModal.svelte
@@ -1,35 +1,44 @@
 <script>
+	import { onMount } from 'svelte';
+
 	export let closeModal;
 	export let joinRoom;
-  
+
 	let userName = '';
 	let rememberName = false;
-  
+
 	function handleNameChange(event) {
-	  userName = event.target.value;
+		userName = event.target.value;
 	}
-  
+
 	function handleSubmit() {
-	  if (userName.trim() !== '') {
-		joinRoom(userName);
-		if (rememberName && typeof localStorage !== 'undefined') {
-		  localStorage.setItem('userName', userName);
-		  localStorage.setItem('rememberName', true);
-		} else if (typeof localStorage !== 'undefined') {
-		  localStorage.removeItem('userName');
-		  localStorage.removeItem('rememberName');
+		if (userName.trim() !== '') {
+			joinRoom(userName);
+			if (rememberName && typeof localStorage !== 'undefined') {
+				localStorage.setItem('userName', userName);
+				localStorage.setItem('rememberName', true);
+			} else if (typeof localStorage !== 'undefined') {
+				localStorage.removeItem('userName');
+				localStorage.removeItem('rememberName');
+			}
+			closeModal();
 		}
-		closeModal();
-	  }
 	}
-  
+
 	function handleRememberChange(event) {
-	  rememberName = event.target.checked;
+		rememberName = event.target.checked;
 	}
-  
+
+	onMount(() => {
+		if (typeof window !== 'undefined' && window.adsbygoogle) {
+			window.adsbygoogle = window.adsbygoogle || [];
+			window.adsbygoogle.push({});
+		}
+	});
+
 	$: userName = typeof localStorage !== 'undefined' ? localStorage.getItem('userName') || '' : '';
 	$: rememberName = typeof localStorage !== 'undefined' ? localStorage.getItem('rememberName') === 'true' : false;
-  </script>
+</script>
 
 <div class="modal-container">
 	<div class="modal-overlay">
@@ -57,8 +66,6 @@
 			<div class="button-container">
 				<button on:click={handleSubmit}>Save</button>
 			</div>
-			<script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=ca-pub-5812114745839139"
-				crossorigin="anonymous"></script>
 			<!-- Name Entry - Square Ad -->
 			<ins class="adsbygoogle"
 				style="display:block"
@@ -66,9 +73,6 @@
 				data-ad-slot="5531796845"
 				data-ad-format="auto"
 				data-full-width-responsive="true"></ins>
-			<script>
-				(adsbygoogle = window.adsbygoogle || []).push({});
-			</script>
 		</div>
 	</div>
 </div>
diff --git a/static/service-worker.js b/static/service-worker.js
index 3dc7230..5cc8da3 100644
--- a/static/service-worker.js
+++ b/static/service-worker.js
@@ -8,5 +8,12 @@ self.addEventListener('activate', (event) => {
 });
 
 self.addEventListener('fetch', function (event) {
+	if (event.request.method !== 'GET') {
+		return;
+	}
+	const url = new URL(event.request.url);
+	if (url.origin !== self.location.origin) {
+		return;
+	}
 	event.respondWith(fetch(event.request));
 });