diff --git a/assets/js/p.js b/assets/js/p.js index c494ab5ec..c1d14937e 100644 --- a/assets/js/p.js +++ b/assets/js/p.js @@ -44,21 +44,29 @@ return window.location.protocol + '//' + window.location.hostname + window.location.pathname + window.location.search; } + function getSourceFromQueryParam() { + const result = window.location.search.match(/[?&](ref|source|utm_source)=([^?&]+)/); + return result ? result[2] : null + } + function getUserData() { var userData = JSON.parse(getCookie('plausible_user')) if (userData) { userData.new_visitor = false - userData.user_agent = decodeURIComponent(userData.user_agent) - userData.referrer = decodeURIComponent(userData.referrer) + if (userData.referrer) { + userData.initial_referrer = userData.referrer && decodeURIComponent(userData.referrer) + } else { + userData.initial_referrer = userData.initial_referrer && decodeURIComponent(userData.initial_referrer) + userData.initial_source = userData.initial_source && decodeURIComponent(userData.initial_source) + } return userData } else { return { uid: pseudoUUIDv4(), new_visitor: true, - user_agent: window.navigator.userAgent, - referrer: window.document.referrer, - screen_width: window.innerWidth + initial_referrer: window.document.referrer, + initial_source: getSourceFromQueryParam(), } } } @@ -66,9 +74,8 @@ function setUserData(payload) { setCookie('plausible_user', JSON.stringify({ uid: payload.uid, - user_agent: encodeURIComponent(payload.user_agent), - referrer: encodeURIComponent(payload.referrer), - screen_width: payload.screen_width + initial_referrer: payload.initial_referrer && encodeURIComponent(payload.initial_referrer), + initial_source: payload.initial_source && encodeURIComponent(payload.initial_source), })) } @@ -81,6 +88,10 @@ payload.name = eventName payload.url = getUrl() payload.domain = CONFIG['domain'] + payload.referrer = window.document.referrer + payload.source = getSourceFromQueryParam() + payload.user_agent = window.navigator.userAgent + payload.screen_width = window.innerWidth var request = new XMLHttpRequest(); request.open('POST', plausibleHost + '/api/event', true); @@ -94,7 +105,6 @@ options && options.callback && options.callback() } } - } function onUnload() { diff --git a/assets/js/plausible.js b/assets/js/plausible.js index 122c18d8c..91fa35d76 100644 --- a/assets/js/plausible.js +++ b/assets/js/plausible.js @@ -76,9 +76,9 @@ function setUserData(payload) { setCookie('plausible_user', JSON.stringify({ - uid: payload.uid, - initial_referrer: payload.initial_referrer && encodeURIComponent(payload.initial_referrer), - initial_source: payload.initial_source && encodeURIComponent(payload.initial_source), + uid: payload.uid, + initial_referrer: payload.initial_referrer && encodeURIComponent(payload.initial_referrer), + initial_source: payload.initial_source && encodeURIComponent(payload.initial_source), })) } @@ -92,8 +92,8 @@ payload.url = getUrl() payload.domain = CONFIG['domain'] payload.referrer = window.document.referrer - payload.user_agent = window.navigator.userAgent payload.source = getSourceFromQueryParam() + payload.user_agent = window.navigator.userAgent payload.screen_width = window.innerWidth var request = new XMLHttpRequest();