From d3ba0346af3590629c6dd6b1db81e20493f310df Mon Sep 17 00:00:00 2001
From: Matteo Pagliazzi <matteopagliazzi@gmail.com>
Date: Fri, 13 Nov 2020 15:42:46 +0100
Subject: [PATCH] Move more analytics to server (#12782)

* track events on the client by default, remove unused ones

* fix lint, remove some calls to updateUser

* remove dead code from guide.js
---
 .../src/components/achievements/dropCapReached.vue   |  4 ++--
 website/client/src/components/groups/group.vue       |  7 -------
 .../header/notifications/dropCapReached.vue          |  2 +-
 .../client/src/components/header/userDropdown.vue    |  2 +-
 website/client/src/components/shops/buyModal.vue     |  9 ---------
 website/client/src/components/static/header.vue      |  2 +-
 website/client/src/components/static/home.vue        |  7 -------
 .../client/src/components/tasks/yesterdailyModal.vue |  3 ---
 website/client/src/libs/analytics.js                 | 12 ++++++------
 website/client/src/mixins/guide.js                   |  6 ------
 website/client/src/mixins/scoreTask.js               |  2 --
 website/client/src/router/index.js                   |  8 --------
 12 files changed, 11 insertions(+), 53 deletions(-)

diff --git a/website/client/src/components/achievements/dropCapReached.vue b/website/client/src/components/achievements/dropCapReached.vue
index 0c01057752..a804fd78fa 100644
--- a/website/client/src/components/achievements/dropCapReached.vue
+++ b/website/client/src/components/achievements/dropCapReached.vue
@@ -232,7 +232,7 @@ export default {
         eventCategory: 'drop-cap-reached',
         eventAction: 'click',
         eventLabel: 'Drop Cap Reached > Modal > Wiki',
-      }, { trackOnServer: true });
+      });
     },
     toLearnMore () {
       Analytics.track({
@@ -240,7 +240,7 @@ export default {
         eventCategory: 'drop-cap-reached',
         eventAction: 'click',
         eventLabel: 'Drop Cap Reached > Modal > Subscriptions',
-      }, { trackOnServer: true });
+      });
 
       this.close();
       this.$router.push('/user/settings/subscription');
diff --git a/website/client/src/components/groups/group.vue b/website/client/src/components/groups/group.vue
index 6ddfa2aa84..4ab1d79b75 100644
--- a/website/client/src/components/groups/group.vue
+++ b/website/client/src/components/groups/group.vue
@@ -622,13 +622,6 @@ export default {
       await this.$store.dispatch('guilds:join', { groupId: this.group._id, type: 'guild' });
     },
     clickLeave () {
-      Analytics.track({
-        hitType: 'event',
-        eventCategory: 'button',
-        eventAction: 'click',
-        eventLabel: 'Leave Party',
-      });
-
       // @TODO: Get challenges and ask to keep or remove
       if (!window.confirm('Are you sure you want to leave?')) return; // eslint-disable-line no-alert
       const keep = true;
diff --git a/website/client/src/components/header/notifications/dropCapReached.vue b/website/client/src/components/header/notifications/dropCapReached.vue
index 6fcab511d2..34a133b64e 100644
--- a/website/client/src/components/header/notifications/dropCapReached.vue
+++ b/website/client/src/components/header/notifications/dropCapReached.vue
@@ -36,7 +36,7 @@ export default {
         eventCategory: 'drop-cap-reached',
         eventAction: 'click',
         eventLabel: 'Drop Cap Reached > Notification Click',
-      }, { trackOnServer: true });
+      });
     },
   },
 };
diff --git a/website/client/src/components/header/userDropdown.vue b/website/client/src/components/header/userDropdown.vue
index cb058247b0..8434defbef 100644
--- a/website/client/src/components/header/userDropdown.vue
+++ b/website/client/src/components/header/userDropdown.vue
@@ -183,7 +183,7 @@ export default {
         eventCategory: 'button',
         eventAction: 'click',
         eventLabel: 'User Dropdown > Subscriptions',
-      }, { trackOnServer: true });
+      });
 
       this.$router.push({ name: 'subscription' });
     },
diff --git a/website/client/src/components/shops/buyModal.vue b/website/client/src/components/shops/buyModal.vue
index 170b5436b8..2a4a793c20 100644
--- a/website/client/src/components/shops/buyModal.vue
+++ b/website/client/src/components/shops/buyModal.vue
@@ -386,7 +386,6 @@ import size from 'lodash/size';
 import reduce from 'lodash/reduce';
 import moment from 'moment';
 
-import * as Analytics from '@/libs/analytics';
 import spellsMixin from '@/mixins/spells';
 import planGemLimits from '@/../../common/script/libs/planGemLimits';
 import numberInvalid from '@/mixins/numberInvalid';
@@ -611,14 +610,6 @@ export default {
       }
     },
     purchaseGems () {
-      if (this.item.key === 'rebirth_orb') {
-        Analytics.track({
-          hitType: 'event',
-          eventCategory: 'button',
-          eventAction: 'click',
-          eventLabel: 'Gems > Rebirth',
-        });
-      }
       this.$root.$emit('bv::show::modal', 'buy-gems');
     },
     togglePinned () {
diff --git a/website/client/src/components/static/header.vue b/website/client/src/components/static/header.vue
index 8362b91c29..92f328f792 100644
--- a/website/client/src/components/static/header.vue
+++ b/website/client/src/components/static/header.vue
@@ -286,13 +286,13 @@ export default {
       }
 
       // @TODO duplicate of code in home.vue
+
       Analytics.track({
         hitType: 'event',
         eventCategory: 'button',
         eventAction: 'click',
         eventLabel: 'Play',
       });
-
       this.$router.push('/register');
     },
     scrollToMobileApp () {
diff --git a/website/client/src/components/static/home.vue b/website/client/src/components/static/home.vue
index 9c11bd6175..2fc5c2eb0e 100644
--- a/website/client/src/components/static/home.vue
+++ b/website/client/src/components/static/home.vue
@@ -897,13 +897,6 @@ export default {
     },
   },
   mounted () {
-    Analytics.track({
-      hitType: 'pageview',
-      eventCategory: 'page',
-      eventAction: 'landing page',
-      page: '/static/home',
-    });
-
     hello.init({
       facebook: process.env.FACEBOOK_KEY, // eslint-disable-line
       // windows: WINDOWS_CLIENT_ID,
diff --git a/website/client/src/components/tasks/yesterdailyModal.vue b/website/client/src/components/tasks/yesterdailyModal.vue
index e9ff600968..0a24fbac8a 100644
--- a/website/client/src/components/tasks/yesterdailyModal.vue
+++ b/website/client/src/components/tasks/yesterdailyModal.vue
@@ -82,7 +82,6 @@
 
 <script>
 import moment from 'moment';
-import * as Analytics from '@/libs/analytics';
 import { mapState } from '@/libs/store';
 import scoreTask from '@/mixins/scoreTask';
 import Task from './task';
@@ -181,8 +180,6 @@ export default {
 
       this.isLoading = false;
       this.$root.$emit('bv::hide::modal', 'yesterdaily');
-
-      Analytics.updateUser();
     },
   },
 };
diff --git a/website/client/src/libs/analytics.js b/website/client/src/libs/analytics.js
index 3b2bed28ec..14648d70e3 100644
--- a/website/client/src/libs/analytics.js
+++ b/website/client/src/libs/analytics.js
@@ -88,14 +88,14 @@ export function track (properties, options = {}) {
     if (_doesNotHaveRequiredFields(properties)) return;
     if (_doesNotHaveAllowedHitType(properties)) return;
 
-    const trackOnServer = options && options.trackOnServer === true;
-    if (trackOnServer === true) {
-      // Track an event on the server
-      const store = getStore();
-      store.dispatch('analytics:trackEvent', properties);
-    } else {
+    const trackOnClient = options && options.trackOnClient === true;
+    // Track events on the server by default
+    if (trackOnClient === true) {
       amplitude.getInstance().logEvent(properties.eventAction, properties);
       window.ga('send', properties);
+    } else {
+      const store = getStore();
+      store.dispatch('analytics:trackEvent', properties);
     }
   });
 }
diff --git a/website/client/src/mixins/guide.js b/website/client/src/mixins/guide.js
index d116a6d9ca..fb7b45c07e 100644
--- a/website/client/src/mixins/guide.js
+++ b/website/client/src/mixins/guide.js
@@ -143,12 +143,6 @@ export default {
 
       return null;
     },
-    hoyo (user) {
-      // @TODO: What is was the timeout for?
-      // @TODO move to analytics
-      window.amplitude.setUserId(user._id);
-      window.ga('set', { userId: user._id });
-    },
     goto (chapter, page, force) {
       if (chapter === 'intro' && this.user.flags.welcomed !== true) {
         // @TODO: Add dispatch User.set({'flags.welcomed': true});
diff --git a/website/client/src/mixins/scoreTask.js b/website/client/src/mixins/scoreTask.js
index dbd006f5dc..9e2596676d 100644
--- a/website/client/src/mixins/scoreTask.js
+++ b/website/client/src/mixins/scoreTask.js
@@ -1,6 +1,5 @@
 import Vue from 'vue';
 
-import * as Analytics from '@/libs/analytics';
 import notifications from './notifications';
 import scoreTask from '@/../../common/script/ops/scoreTask';
 import { mapState } from '@/libs/store';
@@ -64,7 +63,6 @@ export default {
 
       this.playTaskScoreSound(task, direction);
 
-      Analytics.updateUser();
       const response = await this.$store.dispatch('tasks:score', {
         taskId: task._id,
         direction,
diff --git a/website/client/src/router/index.js b/website/client/src/router/index.js
index fea7dfd109..fc11ea018c 100644
--- a/website/client/src/router/index.js
+++ b/website/client/src/router/index.js
@@ -1,7 +1,6 @@
 import Vue from 'vue';
 import VueRouter from 'vue-router';
 import getStore from '@/store';
-import * as Analytics from '@/libs/analytics';
 import handleRedirect from './handleRedirect';
 
 import ParentPage from '@/components/parentPage';
@@ -412,13 +411,6 @@ router.beforeEach((to, from, next) => {
     });
   }
 
-  Analytics.track({
-    hitType: 'pageview',
-    eventCategory: 'navigation',
-    eventAction: 'navigate',
-    page: to.name || to.path,
-  });
-
   if ((to.name === 'userProfile' || to.name === 'userProfilePage') && from.name !== null) {
     let startingPage = 'profile';
     if (to.params.startingPage !== undefined) {