From cd2bf8d1dc15b15a8709745a4f6b2d53a0c8cc1d Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Tue, 23 Feb 2021 11:45:34 +0100
Subject: [PATCH 1/3] added matomo for remix and remix-beta

---
 apps/remix-ide/src/index.html | 36 +++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/apps/remix-ide/src/index.html b/apps/remix-ide/src/index.html
index 8d28e606333..d28aa0b1b08 100644
--- a/apps/remix-ide/src/index.html
+++ b/apps/remix-ide/src/index.html
@@ -34,18 +34,26 @@
 		<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
 		<!-- Matomo -->
 		<script type="text/javascript">
-			var _paq = window._paq = window._paq || []
-			/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
-			_paq.push(['disableCookies']);
-			_paq.push(['enableLinkTracking']);
-			_paq.push(['trackPageView']);
-			(function() {
-				var u="https://matomo.ethereum.org/";
-				_paq.push(['setTrackerUrl', u+'matomo.php'])
-				_paq.push(['setSiteId', '27'])
-				var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]
-				g.type='text/javascript'; g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s)
-			})()
+			if (window.location.hostname.includes('remix')) {
+				var _paq = window._paq = window._paq || []
+				/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+				_paq.push(['disableCookies']);
+				_paq.push(['enableLinkTracking']);
+				_paq.push(['trackPageView']);
+				(function() {
+					var u="https://matomo.ethereum.org/";
+					_paq.push(['setTrackerUrl', u+'matomo.php'])
+					if (window.location.hostname === 'remix.ethereum.org') {
+						_paq.push(['setSiteId', '23'])
+					} else if (window.location.hostname === 'remix-alpha.ethereum.org') {
+						_paq.push(['setSiteId', '27'])
+					} else if (window.location.hostname === 'remix-beta.ethereum.org') {
+						_paq.push(['setSiteId', '25'])
+					}
+					var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]
+					g.type='text/javascript'; g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s)
+				})()
+			}
 		</script>
 		<!-- End Matomo Code -->
 	</head>
@@ -70,8 +78,8 @@
 				}
 				return params
 			}
-	const defaultVersion = '0.8.0'
-        let versionToLoad = urlParams().appVersion ? urlParams().appVersion : defaultVersion
+			const defaultVersion = '0.8.0'
+			let versionToLoad = urlParams().appVersion ? urlParams().appVersion : defaultVersion
                 
 			let assets = {
 				'0.8.0': ['https://use.fontawesome.com/releases/v5.8.1/css/all.css', 'assets/css/pygment_trac.css'],

From 56e19147678c02c800630ebcafd1bc2ce31359dc Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Tue, 23 Feb 2021 12:14:25 +0100
Subject: [PATCH 2/3] stronger check

---
 apps/remix-ide/src/index.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/remix-ide/src/index.html b/apps/remix-ide/src/index.html
index d28aa0b1b08..376929ac720 100644
--- a/apps/remix-ide/src/index.html
+++ b/apps/remix-ide/src/index.html
@@ -34,7 +34,9 @@
 		<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
 		<!-- Matomo -->
 		<script type="text/javascript">
-			if (window.location.hostname.includes('remix')) {
+			if (window.location.hostname === 'remix.ethereum.org' ||
+				window.location.hostname === 'remix-alpha.ethereum.org' ||
+				window.location.hostname === 'remix-beta.ethereum.org') {
 				var _paq = window._paq = window._paq || []
 				/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
 				_paq.push(['disableCookies']);

From e55dc1072aa3963801ab708808272d4e6f326431 Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Tue, 23 Feb 2021 15:38:35 +0100
Subject: [PATCH 3/3] refactoring

---
 apps/remix-ide/src/index.html | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/apps/remix-ide/src/index.html b/apps/remix-ide/src/index.html
index 376929ac720..d20b3cf4acc 100644
--- a/apps/remix-ide/src/index.html
+++ b/apps/remix-ide/src/index.html
@@ -34,9 +34,12 @@
 		<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
 		<!-- Matomo -->
 		<script type="text/javascript">
-			if (window.location.hostname === 'remix.ethereum.org' ||
-				window.location.hostname === 'remix-alpha.ethereum.org' ||
-				window.location.hostname === 'remix-beta.ethereum.org') {
+			const domains = {
+				'remix-alpha.ethereum.org': 27,
+				'remix-beta.ethereum.org': 25,
+				'remix.ethereum.org': 23
+			}
+			if (domains[window.location.hostname]) {
 				var _paq = window._paq = window._paq || []
 				/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
 				_paq.push(['disableCookies']);
@@ -45,13 +48,7 @@
 				(function() {
 					var u="https://matomo.ethereum.org/";
 					_paq.push(['setTrackerUrl', u+'matomo.php'])
-					if (window.location.hostname === 'remix.ethereum.org') {
-						_paq.push(['setSiteId', '23'])
-					} else if (window.location.hostname === 'remix-alpha.ethereum.org') {
-						_paq.push(['setSiteId', '27'])
-					} else if (window.location.hostname === 'remix-beta.ethereum.org') {
-						_paq.push(['setSiteId', '25'])
-					}
+					_paq.push(['setSiteId', domains[window.location.hostname]])
 					var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]
 					g.type='text/javascript'; g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s)
 				})()