fix umami metrics

webtor-io · Nov 25, 2024 · 88eeb5c · 88eeb5c
1 parent 4ef9a11
commit 88eeb5c
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 20 deletions.
diff --git a/assets/src/js/app/embed/check.js b/assets/src/js/app/embed/check.js
@@ -5,14 +5,9 @@ const sha1 = require('sha1');
 message.send('init');
 const data = await message.receiveOnce('init');
 if (window._umami) {
-    const umami = (await import('../../lib/umami')).init(window, window._umami, {
+    (await import('../../lib/umami')).init(window, Object.assign(window._umami, {
         referrer: data.referer,
-    });
-    if (window._tier !== 'free') {
-        umami.identify({
-            tier: window._tier,
-        });
-    }
+    }));
 }
 const c = await check();
 if (c) {

diff --git a/assets/src/js/app/embed/index.js b/assets/src/js/app/embed/index.js
@@ -1,9 +1,11 @@
 import message from './message';
 import initAsyncView from '../../lib/asyncView';
 
-// (await import('../../lib/umami')).init(window, window._umami, {
-//     referrer: window._embedSettings.referer,
-// });
+if (window._umami) {
+    (await import('../../lib/umami')).init(window, Object.assign(window._umami, {
+        tag: 'embed',
+    }));
+}
 
 function setHeight() {
     const width = document.body.offsetWidth;

diff --git a/assets/src/js/app/layout.js b/assets/src/js/app/layout.js
@@ -9,11 +9,8 @@ function hideProgress() {
 
 if (window._umami) {
     const umami = (await import('../lib/umami')).init(window, window._umami);
-    if (window._tier !== 'free') {
-        umami.identify({
-            tier: window._tier,
-        });
-    }
+    window.umami = umami;
+
 }
 
 window.progress = {

diff --git a/assets/src/js/app/nav.js b/assets/src/js/app/nav.js
@@ -1,5 +1,10 @@
 import av from '../lib/av';
 av(async function() {
+    if (window.umami && window._tier !== 'free') {
+        window.umami.identify({
+            tier: window._tier,
+        });
+    }
     const self = this;
     const themeSelector  = (await import('../lib/themeSelector')).themeSelector;
     themeSelector(this.querySelector('[data-toggle-theme]'));

diff --git a/assets/src/js/lib/umami.js b/assets/src/js/lib/umami.js
@@ -1,4 +1,4 @@
-export function init(window, config, initProps = {}) {
+export function init(window, config) {
     const {
         screen: { width, height },
         navigator: { language },
@@ -10,8 +10,8 @@ export function init(window, config, initProps = {}) {
     const { hostname, href } = location;
     let { referrer } = document;
 
-    if (initProps.referrer) {
-        referrer = initProps.referrer;
+    if (config.referrer) {
+        referrer = config.referrer;
     }
 
     const _data = 'data-';

diff --git a/templates/layouts/main.html b/templates/layouts/main.html
@@ -17,7 +17,6 @@
             {{- if useUmami }}
             window._umami = {{ umamiConfig | json }};
             {{- end }}
-            window._tier = "{{ .Claims | tierName }}"
         </script>
         {{ "layout.js" | asset }}
         {{ "baskerville.css" | asset }}

diff --git a/templates/partials/nav.html b/templates/partials/nav.html
@@ -1,4 +1,7 @@
 {{ define "nav" }}
+<script>
+    window._tier = "{{ .Claims | tierName }}"
+</script>
 <div class="navbar sticky top-0">
     <div class="flex-1">
         <a class="btn btn-sm btn-accent btn-outline" href="/" data-async-target="main">webtor.io</a>

diff --git a/templates/views/embed/post.html b/templates/views/embed/post.html
@@ -31,7 +31,7 @@
         <form class="hidden progress-alert progress-alert-block mb-10 closeable bg-black/50" data-async-progress-log="{{ .Job | makeJobLogURL }}">
             {{ if .DomainSettings.Ads }}
             <div class="font-baskerville text-4xl sm:text-5xl sm:absolute sm:right-0 sm:top-0 p-2 sm:p-4 sm:pt-4 pt-0 z-50 text-center">
-                <a href="{{ domain }}" target="_blank">
+                <a href="{{ domain }}" target="_blank" data-umami-event="embed-click-logo">
                     <span>web</span><span class="text-accent">tor</span>
                 </a>
             </div>