From 7a18a928f0961fcfd8d8194904395649a21457db Mon Sep 17 00:00:00 2001
From: JY Hsu <hsujoyao@gmail.com>
Date: Wed, 2 Oct 2024 01:17:42 +0800
Subject: [PATCH 1/2] fix: Fix google analytics

---
 layouts/partials/analytics.html        |  4 +---
 layouts/partials/google_analytics.html | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 layouts/partials/google_analytics.html

diff --git a/layouts/partials/analytics.html b/layouts/partials/analytics.html
index a619231e4..c82417555 100644
--- a/layouts/partials/analytics.html
+++ b/layouts/partials/analytics.html
@@ -4,9 +4,7 @@
         {{ with .services }}
             <!-- Google Analytics -->
             {{ with .google }}
-                {{ $privacyConfig:= dict (slice "Site" "Config" "Privacy" "GoogleAnalytics") $.Site.Config.Privacy.GoogleAnalytics }}
-                {{ $analyticsConfig := dict (slice "Site" "Config" "Services" "GoogleAnalytics" "ID") .id }}
-                {{ template "_internal/google_analytics.html" (merge $privacyConfig $analyticsConfig) }}
+                {{ partial "google_analytics.html" . }}
             {{ end }}
 
             <!-- Counter.dev -->
diff --git a/layouts/partials/google_analytics.html b/layouts/partials/google_analytics.html
new file mode 100644
index 000000000..7de136c14
--- /dev/null
+++ b/layouts/partials/google_analytics.html
@@ -0,0 +1,22 @@
+{{ if site.Params.features.analytics.enabled }}
+  {{- with site.Params.features.analytics.services.google.id }}
+    {{- if strings.HasPrefix (lower .) "ua-" }}
+      {{- warnf "Google Analytics 4 (GA4) replaced Google Universal Analytics (UA) effective 1 July 2023. See https://support.google.com/analytics/answer/11583528. Create a GA4 property and data stream, then replace the Google Analytics ID in your site configuration with the new value." }}
+    {{- else }}
+      <script async src="https://www.googletagmanager.com/gtag/js?id={{ . }}"></script>
+      <script>
+        var doNotTrack = false;
+        if ({{ site.Config.Privacy.GoogleAnalytics.RespectDoNotTrack }}) {
+          var dnt = (navigator.doNotTrack || window.doNotTrack || navigator.msDoNotTrack);
+          var doNotTrack = (dnt == "1" || dnt == "yes");
+        }
+        if (!doNotTrack) {
+          window.dataLayer = window.dataLayer || [];
+          function gtag(){dataLayer.push(arguments);}
+          gtag('js', new Date());
+          gtag('config', '{{ . }}');
+        }
+      </script>
+    {{- end }}
+  {{- end }}
+{{- end -}}
\ No newline at end of file

From c0ee70591e1d33e920cada8336b1e1fbc709afd2 Mon Sep 17 00:00:00 2001
From: JY Hsu <hsujoyao@gmail.com>
Date: Mon, 21 Oct 2024 23:35:52 +0800
Subject: [PATCH 2/2] fix: Change respectDoNotTrack in GA html template

---
 layouts/partials/google_analytics.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layouts/partials/google_analytics.html b/layouts/partials/google_analytics.html
index 7de136c14..4d451c1a6 100644
--- a/layouts/partials/google_analytics.html
+++ b/layouts/partials/google_analytics.html
@@ -6,7 +6,7 @@
       <script async src="https://www.googletagmanager.com/gtag/js?id={{ . }}"></script>
       <script>
         var doNotTrack = false;
-        if ({{ site.Config.Privacy.GoogleAnalytics.RespectDoNotTrack }}) {
+        if ({{ site.Params.features.analytics.services.google.respectDoNotTrack }}) {
           var dnt = (navigator.doNotTrack || window.doNotTrack || navigator.msDoNotTrack);
           var doNotTrack = (dnt == "1" || dnt == "yes");
         }