diff --git a/migrations/metrics.js b/migrations/metrics.js index 2661342af4..d044011f00 100644 --- a/migrations/metrics.js +++ b/migrations/metrics.js @@ -22,19 +22,20 @@ db.collection('users').find(query, fields).toArray(function(err, items) { var hasBeenActive = item.auth.timestamps && item.auth.timestamps.created && (Math.abs(moment(item.lastCron).diff(item.auth.timestamps.created, 'd')) > 14); - if (hasBeenActive && moment(item.lastCron).isBefore(angularRewrite)) + if (/*hasBeenActive && */moment(item.lastCron).isBefore(angularRewrite)) { stats.lostToDerby++; - if (hasBeenActive && moment(item.lastCron).isAfter(twoWeeksAgo)) - stats.isActive++; - - if (item.auth.local) { - emails.push([item.auth.local.email]); + if (item.auth.local) + emails.push([item.auth.local.email]); // Facebook emails. Kinda dirty, and there's only ~30 available fb emails anyway. // } else if (item.auth.facebook && item.auth.facebook.email) { // emails.push([item.auth.facebook.email]) // } else if (item.auth.facebook && item.auth.facebook.emails && item.auth.facebook.emails[0] && !!item.auth.facebook.emails[0].value) { // emails.push([item.auth.facebook.emails[0].value]) } + if (hasBeenActive && moment(item.lastCron).isAfter(twoWeeksAgo)) { + stats.isActive++; + } + }) stats.emails = _.size(emails); console.log(stats); diff --git a/views/static/front.jade b/views/static/front.jade index fa44be8f4e..70460c2981 100644 --- a/views/static/front.jade +++ b/views/static/front.jade @@ -85,4 +85,5 @@ block content .control-group input(type='password', ng-model='registerVals.confirmPassword', placeholder='Password Confirm', required) .control-group + small By clicking the button below, I agree to the Terms and Conditions and the Privacy Policy. input.btn.btn-primary(type='submit', value='Register')