Adventure Guide Prep (#11883)

* WIP(adventure): prereqs

* WIP(drops): new modal

* WIP(adventure): analytics fixes etc

* feat(adventure): random egg+potion on 2nd task

* fix(lint): noworkies

* fix(modal): correctly construct classes

* fix(tests): expectations and escape

* fix(first-drops): address comments

* fix(first-drops): don't give random drops until first drops

* fix(drops): remove more Level 3 references

* refactor(drops): no need for cloning

* refactor(drops): unnecessary export

* fix(first-drops): force sync

* fix(first-drops): move to server

* fix(first-drops): escape in case we get here with >0 items

* fix(lint): line length

* fix(pet-food): remove unused string

website/common/script/ops/buy/abstractBuyOperation.js

@@ -95,7 +95,7 @@ export class AbstractBuyOperation {
 
     this.extractAndValidateParams(this.user, this.req);
 
-    const resultObj = this.executeChanges(this.user, this.item, this.req);
+    const resultObj = this.executeChanges(this.user, this.item, this.req, this.analytics);
 
     if (this.analytics) {
       this.sendToAnalytics(this.analyticsData());

website/common/script/ops/buy/buyMarketGear.js

@@ -60,7 +60,7 @@ export class BuyMarketGearOperation extends AbstractGoldItemOperation { // eslin
     }
   }
 
-  executeChanges (user, item, req) {
+  executeChanges (user, item, req, analytics) {
     let message;
 
     if (user.preferences.autoEquip) {
@@ -70,7 +70,7 @@ export class BuyMarketGearOperation extends AbstractGoldItemOperation { // eslin
 
     if (!user.achievements.purchasedEquipment && user.addAchievement) {
       user.addAchievement('purchasedEquipment');
-      checkOnboardingStatus(user);
+      checkOnboardingStatus(user, analytics);
     }
 
     removePinnedGearAddPossibleNewOnes(user, `gear.flat.${item.key}`, item.key);

website/common/script/ops/feed.js

@@ -3,6 +3,7 @@ import findIndex from 'lodash/findIndex';
 import get from 'lodash/get';
 import keys from 'lodash/keys';
 import upperFirst from 'lodash/upperFirst';
+import moment from 'moment';
 import i18n from '../i18n';
 import content from '../content/index';
 import {
@@ -34,7 +35,7 @@ function evolve (user, pet, req) {
   }, req.language);
 }
 
-export default function feed (user, req = {}) {
+export default function feed (user, req = {}, analytics) {
   let pet = get(req, 'params.pet');
   const foodK = get(req, 'params.food');
 
@@ -94,7 +95,7 @@ export default function feed (user, req = {}) {
 
     if (!user.achievements.fedPet && user.addAchievement) {
       user.addAchievement('fedPet');
-      checkOnboardingStatus(user);
+      checkOnboardingStatus(user, analytics);
     }
   }
 
@@ -118,6 +119,16 @@ export default function feed (user, req = {}) {
     }
   });
 
+  if (analytics && moment().diff(user.auth.timestamps.created, 'days') < 7) {
+    analytics.track('pet feed', {
+      uuid: user._id,
+      foodKey: food.key,
+      petKey: pet.key,
+      category: 'behavior',
+      headers: req.headers,
+    });
+  }
+
   return [
     user.items.pets[pet.key],
     message,

website/common/script/ops/hatch.js

@@ -3,6 +3,7 @@ import forEach from 'lodash/forEach';
 import get from 'lodash/get';
 import keys from 'lodash/keys';
 import upperFirst from 'lodash/upperFirst';
+import moment from 'moment';
 import i18n from '../i18n';
 import content from '../content/index';
 import {
@@ -13,7 +14,7 @@ import {
 import errorMessage from '../libs/errorMessage';
 import { checkOnboardingStatus } from '../libs/onboarding';
 
-export default function hatch (user, req = {}) {
+export default function hatch (user, req = {}, analytics) {
   const egg = get(req, 'params.egg');
   const hatchingPotion = get(req, 'params.hatchingPotion');
 
@@ -55,7 +56,7 @@ export default function hatch (user, req = {}) {
 
   if (!user.achievements.hatchedPet && user.addAchievement) {
     user.addAchievement('hatchedPet');
-    checkOnboardingStatus(user);
+    checkOnboardingStatus(user, analytics);
   }
 
   forEach(content.animalColorAchievements, achievement => {
@@ -78,6 +79,15 @@ export default function hatch (user, req = {}) {
     }
   });
 
+  if (analytics && moment().diff(user.auth.timestamps.created, 'days') < 7) {
+    analytics.track('pet hatch', {
+      uuid: user._id,
+      petKey: pet,
+      category: 'behavior',
+      headers: req.headers,
+    });
+  }
+
   return [
     user.items,
     i18n.t('messageHatched', req.language),

website/common/script/ops/scoreTask.js

@@ -189,7 +189,7 @@ function _updateCounter (task, direction, times) {
   }
 }
 
-export default function scoreTask (options = {}, req = {}) {
+export default function scoreTask (options = {}, req = {}, analytics) {
   const {
     user, task, direction, times = 1, cron = false,
   } = options;
@@ -347,7 +347,7 @@ export default function scoreTask (options = {}, req = {}) {
 
   if (!user.achievements.completedTask && cron === false && direction === 'up' && user.addAchievement) {
     user.addAchievement('completedTask');
-    checkOnboardingStatus(user);
+    checkOnboardingStatus(user, analytics);
   }
 
   return [delta];