krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 15:48:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(analytics): Resolve errors

Browse Source 
Should correct 400 Bad Request errors with Amplitude and cannot read undefined errors in tmp_static_front.
This commit is contained in:
Sabe Jones
2015-06-23 09:30:18 -05:00
parent f8e3120b3a
commit 8b04768b37
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
website/public/js/services/analyticsServices.js
View File

@@ -88,15 +88,17 @@
} }
function _gatherUserStats(user, properties) { function _gatherUserStats(user, properties) {
if (user._id) properties.UUID = user._id; if (user._id) properties.user_id = user._id;
if (user.stats.class) properties.Class = user.stats.class; if (user.stats) {
if (user.stats.exp) properties.Experience = Math.floor(user.stats.exp); properties.Class = user.stats.class;
if (user.stats.gp) properties.Gold = Math.floor(user.stats.gp); properties.Experience = Math.floor(user.stats.exp);
if (user.stats.hp) properties.Health = Math.ceil(user.stats.hp); properties.Gold = Math.floor(user.stats.gp);
if (user.stats.lvl) properties.Level = user.stats.lvl; properties.Health = Math.ceil(user.stats.hp);
if (user.stats.mp) properties.Mana = Math.floor(user.stats.mp); properties.Level = user.stats.lvl;
if (user.contributor.level) properties.contributorLevel = user.contributor.level; properties.Mana = Math.floor(user.stats.mp);
if (user.purchased.plan.planId) properties.subscription = user.purchased.plan.planId; }
if (user.contributor && user.contributor.level) properties.contributorLevel = user.contributor.level;
if (user.purchased && user.purchased.plan.planId) properties.subscription = user.purchased.plan.planId;
} }
function _doesNotHaveRequiredFields(properties) { function _doesNotHaveRequiredFields(properties) {

2
website/src/middleware.js
View File

@@ -180,7 +180,7 @@ module.exports.locals = function(req, res, next) {
language.momentLang = ((!isStaticPage && i18n.momentLangs[language.code]) || undefined); language.momentLang = ((!isStaticPage && i18n.momentLangs[language.code]) || undefined);
var tavern = require('./models/group').tavern; var tavern = require('./models/group').tavern;
var envVars = _.pick(nconf.get(), 'NODE_ENV BASE_URL GA_ID STRIPE_PUB_KEY FACEBOOK_KEY'.split(' ')); var envVars = _.pick(nconf.get(), 'NODE_ENV BASE_URL GA_ID STRIPE_PUB_KEY FACEBOOK_KEY AMPLITUDE_KEY'.split(' '));
res.locals.habitrpg = _.merge(envVars, { res.locals.habitrpg = _.merge(envVars, {
IS_MOBILE: /Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(req.header('User-Agent')), IS_MOBILE: /Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(req.header('User-Agent')),
getManifestFiles: getManifestFiles, getManifestFiles: getManifestFiles,