3.81.1

* feat(event): Spring Fling 2017

* fix(sprites): adjustments
Also enables pastel hair/skin purchases

bower.json

@@ -30,7 +30,7 @@
     "bootstrap-tour": "0.10.1",
     "css-social-buttons": "samcollins/css-social-buttons#v1.1.1 ",
     "github-buttons": "mdo/github-buttons#v3.0.0",
-    "hello": "1.13.4",
+    "hello": "1.14.1",
     "jquery": "2.1.0",
     "jquery-colorbox": "1.4.36",
     "jquery-ui": "1.10.3",

migrations/groups/habitrpg-jackalopes.js

@@ -0,0 +1,46 @@
+var migrationName = 'Jackalopes for Unlimited Subscribers';
+
+/*
+ * This migration will find users with unlimited subscriptions who are also eligible for Jackalope mounts, and award them
+ */
+import Bluebird from 'bluebird';
+
+import { model as Group } from '../../website/server/models/group';
+import { model as User } from '../../website/server/models/user';
+import * as payments from '../../website/server/libs/payments';
+
+async function handOutJackalopes () {
+  let promises = [];
+  let cursor = User.find({
+    'purchased.plan.customerId':'habitrpg',
+  }).cursor();
+
+  cursor.on('data', async function(user) {
+    console.log('User: ' + user._id);
+
+    let groupList = [];
+    if (user.party._id) groupList.push(user.party._id);
+    groupList = groupList.concat(user.guilds);
+
+    let subscribedGroup =
+      await Group.findOne({
+        '_id': {$in: groupList},
+        'purchased.plan.planId': 'group_monthly',
+        'purchased.plan.dateTerminated': null,
+      },
+      {'_id':1}
+    );
+
+    if (subscribedGroup) {
+      User.update({'_id':user._id},{$set:{'items.mounts.Jackalope-RoyalPurple':true}}).exec();
+      promises.push(user.save());
+    }
+  });
+
+  cursor.on('close', async function() {
+    console.log('done');
+    return await Bluebird.all(promises);
+  });
+};
+
+module.exports = handOutJackalopes;

migrations/groups/update-groups-with-group-plans.js

@@ -1,30 +1,33 @@
-var migrationName = 'ResyncGroupPlanMembers';
-var authorName = 'TheHollidayInn'; // in case script author needs to know when their ...
-var authorUuid = ''; //... own data is done
-
-/*
- * This migrations will iterate through all groups with a group plan a subscription and resync the free
- * subscription to all members
- */
-
-import Bluebird from 'bluebird';
-
-import { model as Group } from '../../website/server/models/group';
-import * as payments from '../../website/server/libs/payments';
-
-async function updateGroupsWithGroupPlans () {
-    let groups = await Group.find({
-      'purchased.plan.planId': 'group_monthly',
-      'purchased.plan.dateTerminated': null,
-    }).exec();
-
-    let promises = [];
-    groups.forEach(function(group) {
-      promises.push(payments.addSubscriptionToGroupUsers(group));
-      promises.push(group.save())
-    });
-
-    return await Bluebird.all(promises);
-};
-
-module.exports = updateGroupsWithGroupPlans;
+var migrationName = 'ResyncGroupPlanMembers';
+var authorName = 'TheHollidayInn'; // in case script author needs to know when their ...
+var authorUuid = ''; //... own data is done
+
+/*
+ * This migrations will iterate through all groups with a group plan a subscription and resync the free
+ * subscription to all members
+ */
+
+import Bluebird from 'bluebird';
+
+import { model as Group } from '../../website/server/models/group';
+import * as payments from '../../website/server/libs/payments';
+
+async function updateGroupsWithGroupPlans () {
+  let cursor = Group.find({
+    'purchased.plan.planId': 'group_monthly',
+    'purchased.plan.dateTerminated': null,
+  }).cursor();
+
+  let promises = [];
+
+  cursor.on('data', function(group) {
+    promises.push(payments.addSubscriptionToGroupUsers(group));
+    promises.push(group.save())
+  });
+
+  cursor.on('close', async function() {
+    return await Bluebird.all(promises);
+  });
+};
+
+module.exports = updateGroupsWithGroupPlans;

npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "3.79.1",
+  "version": "3.81.1",
   "dependencies": {
     "@slack/client": {
       "version": "3.8.1",
@@ -484,14 +484,14 @@
       "resolved": "https://registry.npmjs.org/atob/-/atob-1.1.3.tgz"
     },
     "autoprefixer": {
-      "version": "6.7.6",
+      "version": "6.7.7",
       "from": "autoprefixer@>=6.4.0 <7.0.0",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.6.tgz"
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz"
     },
     "aws-sdk": {
-      "version": "2.26.0",
+      "version": "2.27.0",
       "from": "aws-sdk@>=2.0.25 <3.0.0",
-      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.26.0.tgz",
+      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.27.0.tgz",
       "dependencies": {
         "lodash": {
           "version": "3.5.0",
@@ -974,6 +974,11 @@
       "from": "body-parser@>=1.15.0 <2.0.0",
       "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.17.1.tgz",
       "dependencies": {
+        "debug": {
+          "version": "2.6.1",
+          "from": "debug@2.6.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.1.tgz"
+        },
         "qs": {
           "version": "6.4.0",
           "from": "qs@6.4.0",
@@ -1529,7 +1534,7 @@
     },
     "browserslist": {
       "version": "1.7.6",
-      "from": "browserslist@>=1.7.5 <2.0.0",
+      "from": "browserslist@>=1.7.6 <2.0.0",
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.6.tgz"
     },
     "bson": {
@@ -1656,7 +1661,7 @@
     },
     "caniuse-db": {
       "version": "1.0.30000634",
-      "from": "caniuse-db@>=1.0.30000628 <2.0.0",
+      "from": "caniuse-db@>=1.0.30000634 <2.0.0",
       "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000634.tgz"
     },
     "capture-stack-trace": {
@@ -2097,6 +2102,12 @@
       "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.0.tgz",
       "dev": true,
       "dependencies": {
+        "debug": {
+          "version": "2.6.1",
+          "from": "debug@2.6.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.1.tgz",
+          "dev": true
+        },
         "finalhandler": {
           "version": "1.0.0",
           "from": "finalhandler@1.0.0",
@@ -2430,9 +2441,9 @@
       "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-3.10.0.tgz"
     },
     "csso": {
-      "version": "2.3.1",
+      "version": "2.3.2",
       "from": "csso@>=2.3.1 <2.4.0",
-      "resolved": "https://registry.npmjs.org/csso/-/csso-2.3.1.tgz"
+      "resolved": "https://registry.npmjs.org/csso/-/csso-2.3.2.tgz"
     },
     "csv": {
       "version": "0.3.7",
@@ -2472,9 +2483,9 @@
       "resolved": "https://registry.npmjs.org/cwise/-/cwise-1.0.9.tgz",
       "dependencies": {
         "uglify-js": {
-          "version": "2.8.11",
+          "version": "2.8.12",
           "from": "uglify-js@>=2.6.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.11.tgz"
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.12.tgz"
         }
       }
     },
@@ -2536,9 +2547,9 @@
       "resolved": "https://registry.npmjs.org/deap/-/deap-1.0.0.tgz"
     },
     "debug": {
-      "version": "2.6.1",
+      "version": "2.6.2",
       "from": "debug@>=2.0.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.1.tgz"
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.2.tgz"
     },
     "debug-fabulous": {
       "version": "0.0.4",
@@ -3249,6 +3260,12 @@
           "from": "debug@2.3.3",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
           "dev": true
+        },
+        "ws": {
+          "version": "1.1.2",
+          "from": "ws@1.1.2",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-1.1.2.tgz",
+          "dev": true
         }
       }
     },
@@ -3263,6 +3280,12 @@
           "from": "debug@2.3.3",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
           "dev": true
+        },
+        "ws": {
+          "version": "1.1.2",
+          "from": "ws@1.1.2",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-1.1.2.tgz",
+          "dev": true
         }
       }
     },
@@ -4108,6 +4131,700 @@
       "from": "fs.realpath@>=1.0.0 <2.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
     },
+    "fsevents": {
+      "version": "1.1.1",
+      "from": "fsevents@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.1.tgz",
+      "optional": true,
+      "dependencies": {
+        "abbrev": {
+          "version": "1.1.0",
+          "from": "abbrev@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz",
+          "optional": true
+        },
+        "ansi-regex": {
+          "version": "2.1.1",
+          "from": "ansi-regex@>=2.0.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"
+        },
+        "ansi-styles": {
+          "version": "2.2.1",
+          "from": "ansi-styles@>=2.2.1 <3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "optional": true
+        },
+        "aproba": {
+          "version": "1.1.1",
+          "from": "aproba@>=1.0.3 <2.0.0",
+          "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.1.1.tgz",
+          "optional": true
+        },
+        "are-we-there-yet": {
+          "version": "1.1.2",
+          "from": "are-we-there-yet@>=1.1.2 <1.2.0",
+          "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.2.tgz",
+          "optional": true
+        },
+        "asn1": {
+          "version": "0.2.3",
+          "from": "asn1@>=0.2.3 <0.3.0",
+          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
+          "optional": true
+        },
+        "assert-plus": {
+          "version": "0.2.0",
+          "from": "assert-plus@>=0.2.0 <0.3.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
+          "optional": true
+        },
+        "asynckit": {
+          "version": "0.4.0",
+          "from": "asynckit@>=0.4.0 <0.5.0",
+          "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+          "optional": true
+        },
+        "aws-sign2": {
+          "version": "0.6.0",
+          "from": "aws-sign2@>=0.6.0 <0.7.0",
+          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
+          "optional": true
+        },
+        "aws4": {
+          "version": "1.6.0",
+          "from": "aws4@>=1.2.1 <2.0.0",
+          "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
+          "optional": true
+        },
+        "balanced-match": {
+          "version": "0.4.2",
+          "from": "balanced-match@>=0.4.1 <0.5.0",
+          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz"
+        },
+        "bcrypt-pbkdf": {
+          "version": "1.0.1",
+          "from": "bcrypt-pbkdf@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
+          "optional": true
+        },
+        "block-stream": {
+          "version": "0.0.9",
+          "from": "block-stream@*",
+          "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz"
+        },
+        "boom": {
+          "version": "2.10.1",
+          "from": "boom@>=2.0.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"
+        },
+        "brace-expansion": {
+          "version": "1.1.6",
+          "from": "brace-expansion@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz"
+        },
+        "buffer-shims": {
+          "version": "1.0.0",
+          "from": "buffer-shims@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz"
+        },
+        "caseless": {
+          "version": "0.11.0",
+          "from": "caseless@>=0.11.0 <0.12.0",
+          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
+          "optional": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "from": "chalk@>=1.1.1 <2.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "optional": true
+        },
+        "code-point-at": {
+          "version": "1.1.0",
+          "from": "code-point-at@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz"
+        },
+        "combined-stream": {
+          "version": "1.0.5",
+          "from": "combined-stream@>=1.0.5 <1.1.0",
+          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz"
+        },
+        "commander": {
+          "version": "2.9.0",
+          "from": "commander@>=2.9.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
+          "optional": true
+        },
+        "concat-map": {
+          "version": "0.0.1",
+          "from": "concat-map@0.0.1",
+          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+        },
+        "console-control-strings": {
+          "version": "1.1.0",
+          "from": "console-control-strings@>=1.1.0 <1.2.0",
+          "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz"
+        },
+        "core-util-is": {
+          "version": "1.0.2",
+          "from": "core-util-is@>=1.0.0 <1.1.0",
+          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+        },
+        "cryptiles": {
+          "version": "2.0.5",
+          "from": "cryptiles@>=2.0.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
+          "optional": true
+        },
+        "dashdash": {
+          "version": "1.14.1",
+          "from": "dashdash@>=1.12.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+          "optional": true,
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "from": "assert-plus@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+              "optional": true
+            }
+          }
+        },
+        "debug": {
+          "version": "2.2.0",
+          "from": "debug@>=2.2.0 <2.3.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+          "optional": true
+        },
+        "deep-extend": {
+          "version": "0.4.1",
+          "from": "deep-extend@>=0.4.0 <0.5.0",
+          "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.1.tgz",
+          "optional": true
+        },
+        "delayed-stream": {
+          "version": "1.0.0",
+          "from": "delayed-stream@>=1.0.0 <1.1.0",
+          "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
+        },
+        "delegates": {
+          "version": "1.0.0",
+          "from": "delegates@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+          "optional": true
+        },
+        "ecc-jsbn": {
+          "version": "0.1.1",
+          "from": "ecc-jsbn@>=0.1.1 <0.2.0",
+          "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
+          "optional": true
+        },
+        "escape-string-regexp": {
+          "version": "1.0.5",
+          "from": "escape-string-regexp@>=1.0.2 <2.0.0",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+          "optional": true
+        },
+        "extend": {
+          "version": "3.0.0",
+          "from": "extend@>=3.0.0 <3.1.0",
+          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz",
+          "optional": true
+        },
+        "extsprintf": {
+          "version": "1.0.2",
+          "from": "extsprintf@1.0.2",
+          "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz"
+        },
+        "forever-agent": {
+          "version": "0.6.1",
+          "from": "forever-agent@>=0.6.1 <0.7.0",
+          "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+          "optional": true
+        },
+        "form-data": {
+          "version": "2.1.2",
+          "from": "form-data@>=2.1.1 <2.2.0",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.2.tgz",
+          "optional": true
+        },
+        "fs.realpath": {
+          "version": "1.0.0",
+          "from": "fs.realpath@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
+        },
+        "fstream": {
+          "version": "1.0.10",
+          "from": "fstream@>=1.0.2 <2.0.0",
+          "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.10.tgz"
+        },
+        "fstream-ignore": {
+          "version": "1.0.5",
+          "from": "fstream-ignore@>=1.0.5 <1.1.0",
+          "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz",
+          "optional": true
+        },
+        "gauge": {
+          "version": "2.7.3",
+          "from": "gauge@>=2.7.1 <2.8.0",
+          "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.3.tgz",
+          "optional": true
+        },
+        "generate-function": {
+          "version": "2.0.0",
+          "from": "generate-function@>=2.0.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",
+          "optional": true
+        },
+        "generate-object-property": {
+          "version": "1.2.0",
+          "from": "generate-object-property@>=1.1.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
+          "optional": true
+        },
+        "getpass": {
+          "version": "0.1.6",
+          "from": "getpass@>=0.1.1 <0.2.0",
+          "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz",
+          "optional": true,
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "from": "assert-plus@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+              "optional": true
+            }
+          }
+        },
+        "glob": {
+          "version": "7.1.1",
+          "from": "glob@>=7.0.5 <8.0.0",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz"
+        },
+        "graceful-fs": {
+          "version": "4.1.11",
+          "from": "graceful-fs@>=4.1.2 <5.0.0",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz"
+        },
+        "graceful-readlink": {
+          "version": "1.0.1",
+          "from": "graceful-readlink@>=1.0.0",
+          "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
+          "optional": true
+        },
+        "har-validator": {
+          "version": "2.0.6",
+          "from": "har-validator@>=2.0.6 <2.1.0",
+          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz",
+          "optional": true
+        },
+        "has-ansi": {
+          "version": "2.0.0",
+          "from": "has-ansi@>=2.0.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+          "optional": true
+        },
+        "has-unicode": {
+          "version": "2.0.1",
+          "from": "has-unicode@>=2.0.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+          "optional": true
+        },
+        "hawk": {
+          "version": "3.1.3",
+          "from": "hawk@>=3.1.3 <3.2.0",
+          "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
+          "optional": true
+        },
+        "hoek": {
+          "version": "2.16.3",
+          "from": "hoek@>=2.0.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
+        },
+        "http-signature": {
+          "version": "1.1.1",
+          "from": "http-signature@>=1.1.0 <1.2.0",
+          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
+          "optional": true
+        },
+        "inflight": {
+          "version": "1.0.6",
+          "from": "inflight@>=1.0.4 <2.0.0",
+          "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "from": "inherits@>=2.0.1 <2.1.0",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
+        },
+        "ini": {
+          "version": "1.3.4",
+          "from": "ini@>=1.3.0 <1.4.0",
+          "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
+          "optional": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "from": "is-fullwidth-code-point@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"
+        },
+        "is-my-json-valid": {
+          "version": "2.15.0",
+          "from": "is-my-json-valid@>=2.12.4 <3.0.0",
+          "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.15.0.tgz",
+          "optional": true
+        },
+        "is-property": {
+          "version": "1.0.2",
+          "from": "is-property@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
+          "optional": true
+        },
+        "is-typedarray": {
+          "version": "1.0.0",
+          "from": "is-typedarray@>=1.0.0 <1.1.0",
+          "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+          "optional": true
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "from": "isarray@>=1.0.0 <1.1.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
+        },
+        "isstream": {
+          "version": "0.1.2",
+          "from": "isstream@>=0.1.2 <0.2.0",
+          "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+          "optional": true
+        },
+        "jodid25519": {
+          "version": "1.0.2",
+          "from": "jodid25519@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz",
+          "optional": true
+        },
+        "jsbn": {
+          "version": "0.1.1",
+          "from": "jsbn@>=0.1.0 <0.2.0",
+          "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+          "optional": true
+        },
+        "json-schema": {
+          "version": "0.2.3",
+          "from": "json-schema@0.2.3",
+          "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+          "optional": true
+        },
+        "json-stringify-safe": {
+          "version": "5.0.1",
+          "from": "json-stringify-safe@>=5.0.1 <5.1.0",
+          "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+          "optional": true
+        },
+        "jsonpointer": {
+          "version": "4.0.1",
+          "from": "jsonpointer@>=4.0.0 <5.0.0",
+          "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz",
+          "optional": true
+        },
+        "jsprim": {
+          "version": "1.3.1",
+          "from": "jsprim@>=1.2.2 <2.0.0",
+          "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.3.1.tgz",
+          "optional": true
+        },
+        "mime-db": {
+          "version": "1.26.0",
+          "from": "mime-db@>=1.26.0 <1.27.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.26.0.tgz"
+        },
+        "mime-types": {
+          "version": "2.1.14",
+          "from": "mime-types@>=2.1.7 <2.2.0",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.14.tgz"
+        },
+        "minimatch": {
+          "version": "3.0.3",
+          "from": "minimatch@>=3.0.2 <4.0.0",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz"
+        },
+        "minimist": {
+          "version": "0.0.8",
+          "from": "minimist@0.0.8",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+        },
+        "mkdirp": {
+          "version": "0.5.1",
+          "from": "mkdirp@>=0.5.1 <0.6.0",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"
+        },
+        "ms": {
+          "version": "0.7.1",
+          "from": "ms@0.7.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
+          "optional": true
+        },
+        "node-pre-gyp": {
+          "version": "0.6.33",
+          "from": "node-pre-gyp@>=0.6.29 <0.7.0",
+          "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.33.tgz",
+          "optional": true
+        },
+        "nopt": {
+          "version": "3.0.6",
+          "from": "nopt@>=3.0.6 <3.1.0",
+          "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
+          "optional": true
+        },
+        "npmlog": {
+          "version": "4.0.2",
+          "from": "npmlog@>=4.0.1 <5.0.0",
+          "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.0.2.tgz",
+          "optional": true
+        },
+        "number-is-nan": {
+          "version": "1.0.1",
+          "from": "number-is-nan@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"
+        },
+        "oauth-sign": {
+          "version": "0.8.2",
+          "from": "oauth-sign@>=0.8.1 <0.9.0",
+          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
+          "optional": true
+        },
+        "object-assign": {
+          "version": "4.1.1",
+          "from": "object-assign@>=4.1.0 <5.0.0",
+          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+          "optional": true
+        },
+        "once": {
+          "version": "1.4.0",
+          "from": "once@>=1.3.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz"
+        },
+        "path-is-absolute": {
+          "version": "1.0.1",
+          "from": "path-is-absolute@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
+        },
+        "pinkie": {
+          "version": "2.0.4",
+          "from": "pinkie@>=2.0.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+          "optional": true
+        },
+        "pinkie-promise": {
+          "version": "2.0.1",
+          "from": "pinkie-promise@>=2.0.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+          "optional": true
+        },
+        "process-nextick-args": {
+          "version": "1.0.7",
+          "from": "process-nextick-args@>=1.0.6 <1.1.0",
+          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"
+        },
+        "punycode": {
+          "version": "1.4.1",
+          "from": "punycode@>=1.4.1 <2.0.0",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+          "optional": true
+        },
+        "qs": {
+          "version": "6.3.1",
+          "from": "qs@>=6.3.0 <6.4.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.3.1.tgz",
+          "optional": true
+        },
+        "rc": {
+          "version": "1.1.7",
+          "from": "rc@>=1.1.6 <1.2.0",
+          "resolved": "https://registry.npmjs.org/rc/-/rc-1.1.7.tgz",
+          "optional": true,
+          "dependencies": {
+            "minimist": {
+              "version": "1.2.0",
+              "from": "minimist@>=1.2.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+              "optional": true
+            }
+          }
+        },
+        "readable-stream": {
+          "version": "2.2.2",
+          "from": "readable-stream@>=2.0.0 <3.0.0||>=1.1.13 <2.0.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz",
+          "optional": true
+        },
+        "request": {
+          "version": "2.79.0",
+          "from": "request@>=2.79.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.79.0.tgz",
+          "optional": true
+        },
+        "rimraf": {
+          "version": "2.5.4",
+          "from": "rimraf@>=2.5.4 <2.6.0",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz"
+        },
+        "semver": {
+          "version": "5.3.0",
+          "from": "semver@>=5.3.0 <5.4.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
+          "optional": true
+        },
+        "set-blocking": {
+          "version": "2.0.0",
+          "from": "set-blocking@>=2.0.0 <2.1.0",
+          "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+          "optional": true
+        },
+        "signal-exit": {
+          "version": "3.0.2",
+          "from": "signal-exit@>=3.0.0 <4.0.0",
+          "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+          "optional": true
+        },
+        "sntp": {
+          "version": "1.0.9",
+          "from": "sntp@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
+          "optional": true
+        },
+        "sshpk": {
+          "version": "1.10.2",
+          "from": "sshpk@>=1.7.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.10.2.tgz",
+          "optional": true,
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "from": "assert-plus@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+              "optional": true
+            }
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "from": "string_decoder@>=0.10.0 <0.11.0",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "from": "string-width@>=1.0.1 <2.0.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"
+        },
+        "stringstream": {
+          "version": "0.0.5",
+          "from": "stringstream@>=0.0.4 <0.1.0",
+          "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
+          "optional": true
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "from": "strip-ansi@>=3.0.1 <4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"
+        },
+        "strip-json-comments": {
+          "version": "2.0.1",
+          "from": "strip-json-comments@>=2.0.1 <2.1.0",
+          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+          "optional": true
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "from": "supports-color@>=2.0.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "optional": true
+        },
+        "tar": {
+          "version": "2.2.1",
+          "from": "tar@>=2.2.1 <2.3.0",
+          "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz"
+        },
+        "tar-pack": {
+          "version": "3.3.0",
+          "from": "tar-pack@>=3.3.0 <3.4.0",
+          "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.3.0.tgz",
+          "optional": true,
+          "dependencies": {
+            "once": {
+              "version": "1.3.3",
+              "from": "once@>=1.3.3 <1.4.0",
+              "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
+              "optional": true
+            },
+            "readable-stream": {
+              "version": "2.1.5",
+              "from": "readable-stream@>=2.1.4 <2.2.0",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz",
+              "optional": true
+            }
+          }
+        },
+        "tough-cookie": {
+          "version": "2.3.2",
+          "from": "tough-cookie@>=2.3.0 <2.4.0",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
+          "optional": true
+        },
+        "tunnel-agent": {
+          "version": "0.4.3",
+          "from": "tunnel-agent@>=0.4.1 <0.5.0",
+          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
+          "optional": true
+        },
+        "tweetnacl": {
+          "version": "0.14.5",
+          "from": "tweetnacl@>=0.14.0 <0.15.0",
+          "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+          "optional": true
+        },
+        "uid-number": {
+          "version": "0.0.6",
+          "from": "uid-number@>=0.0.6 <0.1.0",
+          "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz",
+          "optional": true
+        },
+        "util-deprecate": {
+          "version": "1.0.2",
+          "from": "util-deprecate@>=1.0.1 <1.1.0",
+          "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+        },
+        "uuid": {
+          "version": "3.0.1",
+          "from": "uuid@>=3.0.0 <4.0.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz",
+          "optional": true
+        },
+        "verror": {
+          "version": "1.3.6",
+          "from": "verror@1.3.6",
+          "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz",
+          "optional": true
+        },
+        "wide-align": {
+          "version": "1.1.0",
+          "from": "wide-align@>=1.1.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.0.tgz",
+          "optional": true
+        },
+        "wrappy": {
+          "version": "1.0.2",
+          "from": "wrappy@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
+        },
+        "xtend": {
+          "version": "4.0.1",
+          "from": "xtend@>=4.0.0 <5.0.0",
+          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+          "optional": true
+        }
+      }
+    },
     "fstream": {
       "version": "1.0.11",
       "from": "fstream@>=1.0.2 <2.0.0",
@@ -4724,9 +5441,9 @@
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"
         },
         "uglify-js": {
-          "version": "2.8.11",
+          "version": "2.8.12",
           "from": "uglify-js@>=2.4.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.11.tgz"
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.12.tgz"
         }
       }
     },
@@ -5369,9 +6086,9 @@
           "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.0.8.tgz"
         },
         "uglify-js": {
-          "version": "2.8.11",
+          "version": "2.8.12",
           "from": "uglify-js@>=2.8.0 <2.9.0",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.11.tgz"
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.12.tgz"
         }
       }
     },
@@ -5953,9 +6670,9 @@
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz"
     },
     "is-buffer": {
-      "version": "1.1.4",
+      "version": "1.1.5",
       "from": "is-buffer@>=1.0.2 <2.0.0",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.4.tgz"
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz"
     },
     "is-builtin-module": {
       "version": "1.0.0",
@@ -6315,9 +7032,9 @@
           "dev": true
         },
         "uglify-js": {
-          "version": "2.8.11",
+          "version": "2.8.12",
           "from": "uglify-js@>=2.6.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.11.tgz",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.12.tgz",
           "dev": true,
           "optional": true,
           "dependencies": {
@@ -6392,9 +7109,9 @@
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz"
         },
         "uglify-js": {
-          "version": "2.8.11",
+          "version": "2.8.12",
           "from": "uglify-js@>=2.4.19 <3.0.0",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.11.tgz",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.12.tgz",
           "dependencies": {
             "source-map": {
               "version": "0.5.6",
@@ -6753,9 +7470,9 @@
           "dev": true
         },
         "uglify-js": {
-          "version": "2.8.11",
+          "version": "2.8.12",
           "from": "uglify-js@>=2.6.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.11.tgz",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.12.tgz",
           "dev": true,
           "optional": true
         },
@@ -7386,6 +8103,11 @@
       "from": "lodash.templatesettings@>=3.0.0 <4.0.0",
       "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz"
     },
+    "lodash.throttle": {
+      "version": "4.1.1",
+      "from": "lodash.throttle@>=4.1.1 <5.0.0",
+      "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz"
+    },
     "lodash.uniq": {
       "version": "4.5.0",
       "from": "lodash.uniq@>=4.3.0 <5.0.0",
@@ -7954,7 +8676,14 @@
     "morgan": {
       "version": "1.8.1",
       "from": "morgan@>=1.7.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.8.1.tgz"
+      "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.8.1.tgz",
+      "dependencies": {
+        "debug": {
+          "version": "2.6.1",
+          "from": "debug@2.6.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.1.tgz"
+        }
+      }
     },
     "mout": {
       "version": "0.9.1",
@@ -8536,9 +9265,9 @@
       "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz"
     },
     "normalize-url": {
-      "version": "1.9.0",
+      "version": "1.9.1",
       "from": "normalize-url@>=1.4.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.0.tgz"
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz"
     },
     "npmconf": {
       "version": "2.1.2",
@@ -9181,7 +9910,7 @@
     },
     "postcss": {
       "version": "5.2.16",
-      "from": "postcss@>=5.2.15 <6.0.0",
+      "from": "postcss@>=5.2.16 <6.0.0",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.16.tgz",
       "dependencies": {
         "supports-color": {
@@ -9656,9 +10385,9 @@
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz"
         },
         "uglify-js": {
-          "version": "2.8.11",
+          "version": "2.8.12",
           "from": "uglify-js@>=2.6.1 <3.0.0",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.11.tgz",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.12.tgz",
           "dependencies": {
             "source-map": {
               "version": "0.5.6",
@@ -12150,6 +12879,11 @@
         }
       }
     },
+    "vue-mugen-scroll": {
+      "version": "0.2.1",
+      "from": "vue-mugen-scroll@>=0.2.1 <0.3.0",
+      "resolved": "https://registry.npmjs.org/vue-mugen-scroll/-/vue-mugen-scroll-0.2.1.tgz"
+    },
     "vue-router": {
       "version": "2.3.0",
       "from": "vue-router@>=2.0.0-rc.5 <3.0.0",
@@ -12220,9 +12954,9 @@
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz"
         },
         "uglify-js": {
-          "version": "2.8.11",
+          "version": "2.8.12",
           "from": "uglify-js@>=2.7.5 <3.0.0",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.11.tgz",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.12.tgz",
           "dependencies": {
             "yargs": {
               "version": "3.10.0",
@@ -12415,9 +13149,9 @@
       "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.1.tgz"
     },
     "ws": {
-      "version": "1.1.2",
+      "version": "1.1.4",
       "from": "ws@>=1.0.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-1.1.2.tgz"
+      "resolved": "https://registry.npmjs.org/ws/-/ws-1.1.4.tgz"
     },
     "wtf-8": {
       "version": "1.0.0",

package.json

@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "3.79.1",
+  "version": "3.81.1",
   "main": "./website/server/index.js",
   "dependencies": {
     "@slack/client": "^3.8.1",
@@ -116,6 +116,7 @@
     "vinyl-source-stream": "^1.1.0",
     "vue": "^2.1.0",
     "vue-loader": "^11.0.0",
+    "vue-mugen-scroll": "^0.2.1",
     "vue-router": "^2.0.0-rc.5",
     "vue-style-loader": "^2.0.0",
     "vue-template-compiler": "^2.1.10",

test/api/v3/integration/groups/GET-groups.test.js

@@ -7,6 +7,7 @@ import {
 import {
   TAVERN_ID,
 } from '../../../../../website/server/models/group';
+import apiMessages from '../../../../../website/server/libs/apiMessages';
 
 describe('GET /groups', () => {
   let user;
@@ -14,6 +15,7 @@ describe('GET /groups', () => {
   const NUMBER_OF_PUBLIC_GUILDS_USER_IS_MEMBER = 1;
   const NUMBER_OF_USERS_PRIVATE_GUILDS = 1;
   const NUMBER_OF_GROUPS_USER_CAN_VIEW = 5;
+  const GUILD_PER_PAGE = 30;
 
   before(async () => {
     await resetHabiticaDB();
@@ -98,6 +100,60 @@ describe('GET /groups', () => {
       .to.eventually.have.a.lengthOf(NUMBER_OF_PUBLIC_GUILDS);
   });
 
+  describe('public guilds pagination', () => {
+    it('req.query.paginate must be a boolean string', async () => {
+      await expect(user.get('/groups?paginate=aString&type=publicGuilds'))
+        .to.eventually.be.rejected.and.eql({
+          code: 400,
+          error: 'BadRequest',
+          message: 'Invalid request parameters.',
+        });
+    });
+
+    it('req.query.paginate can only be true when req.query.type includes publicGuilds', async () => {
+      await expect(user.get('/groups?paginate=true&type=notPublicGuilds'))
+        .to.eventually.be.rejected.and.eql({
+          code: 400,
+          error: 'BadRequest',
+          message: apiMessages('guildsOnlyPaginate'),
+        });
+    });
+
+    it('req.query.page can\'t be negative', async () => {
+      await expect(user.get('/groups?paginate=true&page=-1&type=publicGuilds'))
+        .to.eventually.be.rejected.and.eql({
+          code: 400,
+          error: 'BadRequest',
+          message: 'Invalid request parameters.',
+        });
+    });
+
+    it('returns 30 guilds per page ordered by number of members', async () => {
+      await user.update({balance: 9000});
+      let groups = await Promise.all(_.times(60, (i) => {
+        return generateGroup(user, {
+          name: `public guild ${i} - is member`,
+          type: 'guild',
+          privacy: 'public',
+        });
+      }));
+
+      // update group number 32 and not the first to make sure sorting works
+      await groups[32].update({name: 'guild with most members', memberCount: 199});
+      await groups[33].update({name: 'guild with less members', memberCount: -100});
+
+      let page0 = await expect(user.get('/groups?type=publicGuilds&paginate=true'))
+        .to.eventually.have.a.lengthOf(GUILD_PER_PAGE);
+      expect(page0[0].name).to.equal('guild with most members');
+
+      await expect(user.get('/groups?type=publicGuilds&paginate=true&page=1'))
+        .to.eventually.have.a.lengthOf(GUILD_PER_PAGE);
+      let page2 = await expect(user.get('/groups?type=publicGuilds&paginate=true&page=2'))
+        .to.eventually.have.a.lengthOf(1 + 2); // 1 created now, 2 by other tests
+      expect(page2[2].name).to.equal('guild with less members');
+    });
+  });
+
   it('returns all the user\'s guilds when guilds passed in as query', async () => {
     await expect(user.get('/groups?type=guilds'))
       .to.eventually.have.a.lengthOf(NUMBER_OF_PUBLIC_GUILDS_USER_IS_MEMBER + NUMBER_OF_USERS_PRIVATE_GUILDS);

test/api/v3/unit/libs/amazonPayments.test.js

@@ -383,6 +383,72 @@ describe('Amazon Payments', () => {
         groupId,
       });
     });
+
+    it('subscribes with amazon with price to existing users', async () => {
+      user = new User();
+      user.guilds.push(groupId);
+      await user.save();
+      group.memberCount = 2;
+      await group.save();
+      sub.key = 'group_monthly';
+      sub.price = 9;
+      amount = 12;
+
+      await amzLib.subscribe({
+        billingAgreementId,
+        sub,
+        coupon,
+        user,
+        groupId,
+        headers,
+      });
+
+      expect(amazonSetBillingAgreementDetailsSpy).to.be.calledOnce;
+      expect(amazonSetBillingAgreementDetailsSpy).to.be.calledWith({
+        AmazonBillingAgreementId: billingAgreementId,
+        BillingAgreementAttributes: {
+          SellerNote: amzLib.constants.SELLER_NOTE_SUBSCRIPTION,
+          SellerBillingAgreementAttributes: {
+            SellerBillingAgreementId: common.uuid(),
+            StoreName: amzLib.constants.STORE_NAME,
+            CustomInformation: amzLib.constants.SELLER_NOTE_SUBSCRIPTION,
+          },
+        },
+      });
+
+      expect(amazonConfirmBillingAgreementSpy).to.be.calledOnce;
+      expect(amazonConfirmBillingAgreementSpy).to.be.calledWith({
+        AmazonBillingAgreementId: billingAgreementId,
+      });
+
+      expect(amazongAuthorizeOnBillingAgreementSpy).to.be.calledOnce;
+      expect(amazongAuthorizeOnBillingAgreementSpy).to.be.calledWith({
+        AmazonBillingAgreementId: billingAgreementId,
+        AuthorizationReferenceId: common.uuid().substring(0, 32),
+        AuthorizationAmount: {
+          CurrencyCode: amzLib.constants.CURRENCY_CODE,
+          Amount: amount,
+        },
+        SellerAuthorizationNote: amzLib.constants.SELLER_NOTE_ATHORIZATION_SUBSCRIPTION,
+        TransactionTimeout: 0,
+        CaptureNow: true,
+        SellerNote: amzLib.constants.SELLER_NOTE_ATHORIZATION_SUBSCRIPTION,
+        SellerOrderAttributes: {
+          SellerOrderId: common.uuid(),
+          StoreName: amzLib.constants.STORE_NAME,
+        },
+      });
+
+      expect(createSubSpy).to.be.calledOnce;
+      expect(createSubSpy).to.be.calledWith({
+        user,
+        customerId: billingAgreementId,
+        paymentMethod: amzLib.constants.PAYMENT_METHOD,
+        sub,
+        headers,
+        groupId,
+      });
+    });
   });
 
   describe('cancelSubscription', () => {

test/api/v3/unit/libs/apiMessages.js

@@ -0,0 +1,31 @@
+import apiMessages from '../../../../../website/server/libs/apiMessages';
+
+describe('API Messages', () => {
+  const message = 'Only public guilds support pagination.';
+  it('returns an API message', () => {
+    expect(apiMessages('guildsOnlyPaginate')).to.equal(message);
+  });
+
+  it('throws if the API message does not exist', () => {
+    expect(() => apiMessages('iDoNotExist')).to.throw;
+  });
+
+  it('clones the passed variables', () => {
+    let vars = {a: 1};
+    sandbox.stub(_, 'clone').returns({});
+    apiMessages('guildsOnlyPaginate', vars);
+    expect(_.clone).to.have.been.called.once;
+    expect(_.clone).to.have.been.calledWith(vars);
+  });
+
+  it('pass the message through _.template', () => {
+    let vars = {a: 1};
+    let stub = sinon.stub().returns('string');
+    sandbox.stub(_, 'template').returns(stub);
+    apiMessages('guildsOnlyPaginate', vars);
+    expect(_.template).to.have.been.called.once;
+    expect(_.template).to.have.been.calledWith(message);
+    expect(stub).to.have.been.called.once;
+    expect(stub).to.have.been.calledWith(vars);
+  });
+});

test/api/v3/unit/libs/stripePayments.test.js

@@ -395,6 +395,50 @@ describe('Stripe Payments', () => {
         subscriptionId,
       });
     });
+
+    it('subscribes a group with the correct number of group members', async () => {
+      token = 'test-token';
+      sub = data.sub;
+      groupId = group._id;
+      email = 'test@test.com';
+      headers = {};
+      user = new User();
+      user.guilds.push(groupId);
+      await user.save();
+      group.memberCount = 2;
+      await group.save();
+
+      await stripePayments.checkout({
+        token,
+        user,
+        gift,
+        sub,
+        groupId,
+        email,
+        headers,
+        coupon,
+      }, stripe);
+
+      expect(stripeCreateCustomerSpy).to.be.calledOnce;
+      expect(stripeCreateCustomerSpy).to.be.calledWith({
+        email,
+        metadata: { uuid: user._id },
+        card: token,
+        plan: sub.key,
+        quantity: 4,
+      });
+
+      expect(stripePaymentsCreateSubSpy).to.be.calledOnce;
+      expect(stripePaymentsCreateSubSpy).to.be.calledWith({
+        user,
+        customerId: customerIdResponse,
+        paymentMethod: 'Stripe',
+        sub,
+        headers,
+        groupId,
+        subscriptionId,
+      });
+    });
   });
 
   describe('edit subscription', () => {

test/api/v3/unit/models/user.test.js

@@ -210,4 +210,47 @@ describe('User Model', () => {
       expect(user.hasNotCancelled()).to.be.false;
     });
   });
+
+  context('pre-save hook', () => {
+    it('does not try to award achievements when achievements or items not selected in query', async () => {
+      let user = new User();
+      user = await user.save(); // necessary for user.isSelected to work correctly
+
+      // Create conditions for the Beast Master achievement to be awarded
+      user.achievements.beastMasterCount = 3;
+      expect(user.achievements.beastMaster).to.not.equal(true); // verify that it was not awarded initially
+
+      user = await user.save();
+      // verify that it's been awarded
+      expect(user.achievements.beastMaster).to.equal(true);
+
+      // reset the user
+      user.achievements.beastMasterCount = 0;
+      user.achievements.beastMaster = false;
+
+      user = await user.save();
+      // verify it's been removed
+      expect(user.achievements.beastMaster).to.equal(false);
+
+      // fetch the user without selecting the 'items' field
+      user = await User.findById(user._id).select('-items').exec();
+      expect(user.isSelected('items')).to.equal(false);
+
+      // create the conditions for the beast master achievement but this time it should not be awarded
+      user.achievements.beastMasterCount = 3;
+      user = await user.save();
+      expect(user.achievements.beastMaster).to.equal(false);
+
+      // reset
+      user.achievements.beastMasterCount = 0;
+      user = await user.save();
+
+      // this time with achievements not selected
+      user = await User.findById(user._id).select('-achievements').exec();
+      expect(user.isSelected('achievements')).to.equal(false);
+      user.achievements.beastMasterCount = 3;
+      user = await user.save();
+      expect(user.achievements.beastMaster).to.not.equal(true);
+    });
+  });
 });

test/common/shouldDo.test.js

@@ -1,310 +1,310 @@
-import { shouldDo, DAY_MAPPING } from '../../website/common/script/cron';
-import moment from 'moment';
-import 'moment-recur';
+// import { shouldDo, DAY_MAPPING } from '../../website/common/script/cron';
+// import moment from 'moment';
+// import 'moment-recur';
 
-describe('shouldDo', () => {
-  let day, dailyTask;
-  let options = {};
+// describe('shouldDo', () => {
+//   let day, dailyTask;
+//   let options = {};
 
-  beforeEach(() => {
-    day = new Date();
-    dailyTask = {
-      completed: 'false',
-      everyX: 1,
-      frequency: 'weekly',
-      type: 'daily',
-      repeat: {
-        su: true,
-        s: true,
-        f: true,
-        th: true,
-        w: true,
-        t: true,
-        m: true,
-      },
-      startDate: new Date(),
-    };
-  });
+//   beforeEach(() => {
+//     day = new Date();
+//     dailyTask = {
+//       completed: 'false',
+//       everyX: 1,
+//       frequency: 'weekly',
+//       type: 'daily',
+//       repeat: {
+//         su: true,
+//         s: true,
+//         f: true,
+//         th: true,
+//         w: true,
+//         t: true,
+//         m: true,
+//       },
+//       startDate: new Date(),
+//     };
+//   });
 
-  it('leaves Daily inactive before start date', () => {
-    dailyTask.startDate = moment().add(1, 'days').toDate();
+//   it('leaves Daily inactive before start date', () => {
+//     dailyTask.startDate = moment().add(1, 'days').toDate();
 
-    expect(shouldDo(day, dailyTask, options)).to.equal(false);
-  });
+//     expect(shouldDo(day, dailyTask, options)).to.equal(false);
+//   });
 
-  context('Every X Days', () => {
-    it('leaves Daily inactive in between X Day intervals', () => {
-      dailyTask.startDate = moment().subtract(1, 'days').toDate();
-      dailyTask.frequency = 'daily';
-      dailyTask.everyX = 2;
+//   context('Every X Days', () => {
+//     it('leaves Daily inactive in between X Day intervals', () => {
+//       dailyTask.startDate = moment().subtract(1, 'days').toDate();
+//       dailyTask.frequency = 'daily';
+//       dailyTask.everyX = 2;
 
-      expect(shouldDo(day, dailyTask, options)).to.equal(false);
-    });
+//       expect(shouldDo(day, dailyTask, options)).to.equal(false);
+//     });
 
-    it('activates Daily on multiples of X Days', () => {
-      dailyTask.startDate = moment().subtract(7, 'days').toDate();
-      dailyTask.frequency = 'daily';
-      dailyTask.everyX = 7;
+//     it('activates Daily on multiples of X Days', () => {
+//       dailyTask.startDate = moment().subtract(7, 'days').toDate();
+//       dailyTask.frequency = 'daily';
+//       dailyTask.everyX = 7;
 
-      expect(shouldDo(day, dailyTask, options)).to.equal(true);
-    });
-  });
+//       expect(shouldDo(day, dailyTask, options)).to.equal(true);
+//     });
+//   });
 
-  context('Certain Days of the Week', () => {
-    it('leaves Daily inactive if day of the week does not match', () => {
-      dailyTask.repeat = {
-        su: false,
-        s: false,
-        f: false,
-        th: false,
-        w: false,
-        t: false,
-        m: false,
-      };
+//   context('Certain Days of the Week', () => {
+//     it('leaves Daily inactive if day of the week does not match', () => {
+//       dailyTask.repeat = {
+//         su: false,
+//         s: false,
+//         f: false,
+//         th: false,
+//         w: false,
+//         t: false,
+//         m: false,
+//       };
 
-      for (let weekday of [0, 1, 2, 3, 4, 5, 6]) {
-        day = moment().day(weekday).toDate();
+//       for (let weekday of [0, 1, 2, 3, 4, 5, 6]) {
+//         day = moment().day(weekday).toDate();
 
-        expect(shouldDo(day, dailyTask, options)).to.equal(false);
-      }
-    });
+//         expect(shouldDo(day, dailyTask, options)).to.equal(false);
+//       }
+//     });
 
-    it('leaves Daily inactive if day of the week does not match and active on the day it matches', () => {
-      dailyTask.repeat = {
-        su: false,
-        s: false,
-        f: false,
-        th: true,
-        w: false,
-        t: false,
-        m: false,
-      };
+//     it('leaves Daily inactive if day of the week does not match and active on the day it matches', () => {
+//       dailyTask.repeat = {
+//         su: false,
+//         s: false,
+//         f: false,
+//         th: true,
+//         w: false,
+//         t: false,
+//         m: false,
+//       };
 
-      for (let weekday of [0, 1, 2, 3, 4, 5, 6]) {
-        day = moment().add(1, 'weeks').day(weekday).toDate();
+//       for (let weekday of [0, 1, 2, 3, 4, 5, 6]) {
+//         day = moment().add(1, 'weeks').day(weekday).toDate();
 
-        if (weekday === 4) {
-          expect(shouldDo(day, dailyTask, options)).to.equal(true);
-        } else {
-          expect(shouldDo(day, dailyTask, options)).to.equal(false);
-        }
-      }
-    });
+//         if (weekday === 4) {
+//           expect(shouldDo(day, dailyTask, options)).to.equal(true);
+//         } else {
+//           expect(shouldDo(day, dailyTask, options)).to.equal(false);
+//         }
+//       }
+//     });
 
-    it('activates Daily on matching days of the week', () => {
-      expect(shouldDo(day, dailyTask, options)).to.equal(true);
-    });
-  });
+//     it('activates Daily on matching days of the week', () => {
+//       expect(shouldDo(day, dailyTask, options)).to.equal(true);
+//     });
+//   });
 
-  context('Every X Weeks', () => {
-    it('leaves daily inactive if it has not been the specified number of weeks', () => {
-      dailyTask.everyX = 3;
-      let tomorrow = moment().add(1, 'day').toDate();
+//   context('Every X Weeks', () => {
+//     it('leaves daily inactive if it has not been the specified number of weeks', () => {
+//       dailyTask.everyX = 3;
+//       let tomorrow = moment().add(1, 'day').toDate();
 
-      expect(shouldDo(tomorrow, dailyTask, options)).to.equal(false);
-    });
+//       expect(shouldDo(tomorrow, dailyTask, options)).to.equal(false);
+//     });
 
-    it('leaves daily inactive if on every (x) week on weekday it is incorrect weekday', () => {
-      dailyTask.repeat = {
-        su: false,
-        s: false,
-        f: false,
-        th: false,
-        w: false,
-        t: false,
-        m: false,
-      };
+//     it('leaves daily inactive if on every (x) week on weekday it is incorrect weekday', () => {
+//       dailyTask.repeat = {
+//         su: false,
+//         s: false,
+//         f: false,
+//         th: false,
+//         w: false,
+//         t: false,
+//         m: false,
+//       };
 
-      day = moment();
-      dailyTask.repeat[DAY_MAPPING[day.day()]] = true;
-      dailyTask.everyX = 3;
-      let threeWeeksFromTodayPlusOne = day.add(1, 'day').add(3, 'weeks').toDate();
+//       day = moment();
+//       dailyTask.repeat[DAY_MAPPING[day.day()]] = true;
+//       dailyTask.everyX = 3;
+//       let threeWeeksFromTodayPlusOne = day.add(1, 'day').add(3, 'weeks').toDate();
 
-      expect(shouldDo(threeWeeksFromTodayPlusOne, dailyTask, options)).to.equal(false);
-    });
+//       expect(shouldDo(threeWeeksFromTodayPlusOne, dailyTask, options)).to.equal(false);
+//     });
 
-    it('activates Daily on matching week', () => {
-      dailyTask.everyX = 3;
-      let threeWeeksFromToday = moment().add(3, 'weeks').toDate();
+//     it('activates Daily on matching week', () => {
+//       dailyTask.everyX = 3;
+//       let threeWeeksFromToday = moment().add(3, 'weeks').toDate();
 
-      expect(shouldDo(threeWeeksFromToday, dailyTask, options)).to.equal(true);
-    });
+//       expect(shouldDo(threeWeeksFromToday, dailyTask, options)).to.equal(true);
+//     });
 
-    it('activates Daily on every (x) week on weekday', () => {
-      dailyTask.repeat = {
-        su: false,
-        s: false,
-        f: false,
-        th: false,
-        w: false,
-        t: false,
-        m: false,
-      };
+//     it('activates Daily on every (x) week on weekday', () => {
+//       dailyTask.repeat = {
+//         su: false,
+//         s: false,
+//         f: false,
+//         th: false,
+//         w: false,
+//         t: false,
+//         m: false,
+//       };
 
-      day = moment();
-      dailyTask.repeat[DAY_MAPPING[day.day()]] = true;
-      dailyTask.everyX = 3;
-      let threeWeeksFromToday = day.add(6, 'weeks').day(day.day()).toDate();
+//       day = moment();
+//       dailyTask.repeat[DAY_MAPPING[day.day()]] = true;
+//       dailyTask.everyX = 3;
+//       let threeWeeksFromToday = day.add(6, 'weeks').day(day.day()).toDate();
 
-      expect(shouldDo(threeWeeksFromToday, dailyTask, options)).to.equal(true);
-    });
-  });
+//       expect(shouldDo(threeWeeksFromToday, dailyTask, options)).to.equal(true);
+//     });
+//   });
 
-  context('Monthly - Every X Months on a specified date', () => {
-    it('leaves daily inactive if not day of the month', () => {
-      dailyTask.everyX = 1;
-      dailyTask.frequency = 'monthly';
-      dailyTask.daysOfMonth = [15];
-      let tomorrow = moment().add(1, 'day').toDate();// @TODO: make sure this is not the 15
+//   context('Monthly - Every X Months on a specified date', () => {
+//     it('leaves daily inactive if not day of the month', () => {
+//       dailyTask.everyX = 1;
+//       dailyTask.frequency = 'monthly';
+//       dailyTask.daysOfMonth = [15];
+//       let tomorrow = moment().add(1, 'day').toDate();// @TODO: make sure this is not the 15
 
-      expect(shouldDo(tomorrow, dailyTask, options)).to.equal(false);
-    });
+//       expect(shouldDo(tomorrow, dailyTask, options)).to.equal(false);
+//     });
 
-    it('activates Daily on matching day of month', () => {
-      day = moment();
-      dailyTask.everyX = 1;
-      dailyTask.frequency = 'monthly';
-      dailyTask.daysOfMonth = [day.date()];
-      day = day.add(1, 'months').date(day.date()).toDate();
+//     it('activates Daily on matching day of month', () => {
+//       day = moment();
+//       dailyTask.everyX = 1;
+//       dailyTask.frequency = 'monthly';
+//       dailyTask.daysOfMonth = [day.date()];
+//       day = day.add(1, 'months').date(day.date()).toDate();
 
-      expect(shouldDo(day, dailyTask, options)).to.equal(true);
-    });
+//       expect(shouldDo(day, dailyTask, options)).to.equal(true);
+//     });
 
-    it('leaves daily inactive if not on date of the x month', () => {
-      dailyTask.everyX = 2;
-      dailyTask.frequency = 'monthly';
-      dailyTask.daysOfMonth = [15];
-      let tomorrow = moment().add(2, 'months').add(1, 'day').toDate();
+//     it('leaves daily inactive if not on date of the x month', () => {
+//       dailyTask.everyX = 2;
+//       dailyTask.frequency = 'monthly';
+//       dailyTask.daysOfMonth = [15];
+//       let tomorrow = moment().add(2, 'months').add(1, 'day').toDate();
 
-      expect(shouldDo(tomorrow, dailyTask, options)).to.equal(false);
-    });
+//       expect(shouldDo(tomorrow, dailyTask, options)).to.equal(false);
+//     });
 
-    it('activates Daily if on date of the x month', () => {
-      dailyTask.everyX = 2;
-      dailyTask.frequency = 'monthly';
-      dailyTask.daysOfMonth = [15];
-      day = moment().add(2, 'months').date(15).toDate();
-      expect(shouldDo(day, dailyTask, options)).to.equal(true);
-    });
-  });
+//     it('activates Daily if on date of the x month', () => {
+//       dailyTask.everyX = 2;
+//       dailyTask.frequency = 'monthly';
+//       dailyTask.daysOfMonth = [15];
+//       day = moment().add(2, 'months').date(15).toDate();
+//       expect(shouldDo(day, dailyTask, options)).to.equal(true);
+//     });
+//   });
 
-  context('Monthly - Certain days of the nth Week', () => {
-    it('leaves daily inactive if not the correct week of the month on the day of the start date', () => {
-      dailyTask.repeat = {
-        su: false,
-        s: false,
-        f: false,
-        th: false,
-        w: false,
-        t: false,
-        m: false,
-      };
+//   context('Monthly - Certain days of the nth Week', () => {
+//     it('leaves daily inactive if not the correct week of the month on the day of the start date', () => {
+//       dailyTask.repeat = {
+//         su: false,
+//         s: false,
+//         f: false,
+//         th: false,
+//         w: false,
+//         t: false,
+//         m: false,
+//       };
 
-      let today = moment('01/27/2017');
-      let week = today.monthWeek();
-      let dayOfWeek = today.day();
-      dailyTask.startDate = today.toDate();
-      dailyTask.weeksOfMonth = [week];
-      dailyTask.repeat[DAY_MAPPING[dayOfWeek]] = true;
-      dailyTask.everyX = 1;
-      dailyTask.frequency = 'monthly';
-      day = moment('02/23/2017');
+//       let today = moment('01/27/2017');
+//       let week = today.monthWeek();
+//       let dayOfWeek = today.day();
+//       dailyTask.startDate = today.toDate();
+//       dailyTask.weeksOfMonth = [week];
+//       dailyTask.repeat[DAY_MAPPING[dayOfWeek]] = true;
+//       dailyTask.everyX = 1;
+//       dailyTask.frequency = 'monthly';
+//       day = moment('02/23/2017');
 
-      expect(shouldDo(day, dailyTask, options)).to.equal(false);
-    });
+//       expect(shouldDo(day, dailyTask, options)).to.equal(false);
+//     });
 
-    it('activates Daily if correct week of the month on the day of the start date', () => {
-      dailyTask.repeat = {
-        su: false,
-        s: false,
-        f: false,
-        th: false,
-        w: false,
-        t: false,
-        m: false,
-      };
+//     it('activates Daily if correct week of the month on the day of the start date', () => {
+//       dailyTask.repeat = {
+//         su: false,
+//         s: false,
+//         f: false,
+//         th: false,
+//         w: false,
+//         t: false,
+//         m: false,
+//       };
 
-      let today = moment('01/27/2017');
-      let week = today.monthWeek();
-      let dayOfWeek = today.day();
-      dailyTask.startDate = today.toDate();
-      dailyTask.weeksOfMonth = [week];
-      dailyTask.repeat[DAY_MAPPING[dayOfWeek]] = true;
-      dailyTask.everyX = 1;
-      dailyTask.frequency = 'monthly';
-      day = moment('02/24/2017');
+//       let today = moment('01/27/2017');
+//       let week = today.monthWeek();
+//       let dayOfWeek = today.day();
+//       dailyTask.startDate = today.toDate();
+//       dailyTask.weeksOfMonth = [week];
+//       dailyTask.repeat[DAY_MAPPING[dayOfWeek]] = true;
+//       dailyTask.everyX = 1;
+//       dailyTask.frequency = 'monthly';
+//       day = moment('02/24/2017');
 
-      expect(shouldDo(day, dailyTask, options)).to.equal(true);
-    });
+//       expect(shouldDo(day, dailyTask, options)).to.equal(true);
+//     });
 
-    it('leaves daily inactive if not day of the month with every x month on weekday', () => {
-      dailyTask.repeat = {
-        su: false,
-        s: false,
-        f: false,
-        th: false,
-        w: false,
-        t: false,
-        m: false,
-      };
+//     it('leaves daily inactive if not day of the month with every x month on weekday', () => {
+//       dailyTask.repeat = {
+//         su: false,
+//         s: false,
+//         f: false,
+//         th: false,
+//         w: false,
+//         t: false,
+//         m: false,
+//       };
 
-      let today = moment('01/26/2017');
-      let week = today.monthWeek();
-      let dayOfWeek = today.day();
-      dailyTask.startDate = today.toDate();
-      dailyTask.weeksOfMonth = [week];
-      dailyTask.repeat[DAY_MAPPING[dayOfWeek]] = true;
-      dailyTask.everyX = 2;
-      dailyTask.frequency = 'monthly';
+//       let today = moment('01/26/2017');
+//       let week = today.monthWeek();
+//       let dayOfWeek = today.day();
+//       dailyTask.startDate = today.toDate();
+//       dailyTask.weeksOfMonth = [week];
+//       dailyTask.repeat[DAY_MAPPING[dayOfWeek]] = true;
+//       dailyTask.everyX = 2;
+//       dailyTask.frequency = 'monthly';
 
-      day = moment('03/24/2017');
+//       day = moment('03/24/2017');
 
-      expect(shouldDo(day, dailyTask, options)).to.equal(false);
-    });
+//       expect(shouldDo(day, dailyTask, options)).to.equal(false);
+//     });
 
-    it('activates Daily if on nth weekday of the x month', () => {
-      dailyTask.repeat = {
-        su: false,
-        s: false,
-        f: false,
-        th: false,
-        w: false,
-        t: false,
-        m: false,
-      };
+//     it('activates Daily if on nth weekday of the x month', () => {
+//       dailyTask.repeat = {
+//         su: false,
+//         s: false,
+//         f: false,
+//         th: false,
+//         w: false,
+//         t: false,
+//         m: false,
+//       };
 
-      let today = moment('01/27/2017');
-      let week = today.monthWeek();
-      let dayOfWeek = today.day();
-      dailyTask.startDate = today.toDate();
-      dailyTask.weeksOfMonth = [week];
-      dailyTask.repeat[DAY_MAPPING[dayOfWeek]] = true;
-      dailyTask.everyX = 2;
-      dailyTask.frequency = 'monthly';
+//       let today = moment('01/27/2017');
+//       let week = today.monthWeek();
+//       let dayOfWeek = today.day();
+//       dailyTask.startDate = today.toDate();
+//       dailyTask.weeksOfMonth = [week];
+//       dailyTask.repeat[DAY_MAPPING[dayOfWeek]] = true;
+//       dailyTask.everyX = 2;
+//       dailyTask.frequency = 'monthly';
 
-      day = moment('03/24/2017');
+//       day = moment('03/24/2017');
 
-      expect(shouldDo(day, dailyTask, options)).to.equal(true);
-    });
-  });
+//       expect(shouldDo(day, dailyTask, options)).to.equal(true);
+//     });
+//   });
 
-  context('Every X Years', () => {
-    it('leaves daily inactive if not the correct year', () => {
-      day = moment();
-      dailyTask.everyX = 2;
-      dailyTask.frequency = 'yearly';
-      day = day.add(1, 'day').toDate();
+//   context('Every X Years', () => {
+//     it('leaves daily inactive if not the correct year', () => {
+//       day = moment();
+//       dailyTask.everyX = 2;
+//       dailyTask.frequency = 'yearly';
+//       day = day.add(1, 'day').toDate();
 
-      expect(shouldDo(day, dailyTask, options)).to.equal(false);
-    });
+//       expect(shouldDo(day, dailyTask, options)).to.equal(false);
+//     });
 
-    it('activates Daily on matching year', () => {
-      day = moment();
-      dailyTask.everyX = 2;
-      dailyTask.frequency = 'yearly';
-      day = day.add(2, 'years').toDate();
+//     it('activates Daily on matching year', () => {
+//       day = moment();
+//       dailyTask.everyX = 2;
+//       dailyTask.frequency = 'yearly';
+//       day = day.add(2, 'years').toDate();
 
-      expect(shouldDo(day, dailyTask, options)).to.equal(true);
-    });
-  });
-});
+//       expect(shouldDo(day, dailyTask, options)).to.equal(true);
+//     });
+//   });
+// });

test/content/translaotr.js

@@ -4,7 +4,7 @@ import translator from '../../website/common/script/content/translation';
 describe('Translator', () => {
   it('returns error message if string is not properly formatted', () => {
     let improperlyFormattedString = translator('petName', {attr: 0})();
-    expect(improperlyFormattedString).to.eql(STRING_ERROR_MSG);
+    expect(improperlyFormattedString).to.match(STRING_ERROR_MSG);
   });
 
   it('returns an error message if string does not exist', () => {

test/helpers/content.helper.js

@@ -2,7 +2,7 @@ require('./globals.helper');
 import i18n from '../../website/common/script/i18n';
 i18n.translations = require('../../website/server/libs/i18n').translations;
 
-export const STRING_ERROR_MSG = 'Error processing the string. Please see Help > Report a Bug.';
+export const STRING_ERROR_MSG = /^Error processing the string ".*". Please see Help > Report a Bug.$/;
 export const STRING_DOES_NOT_EXIST_MSG = /^String '.*' not found.$/;
 
 export function expectValidTranslationString (attribute) {

test/helpers/mongo.js

@@ -74,6 +74,7 @@ export async function resetHabiticaDB () {
               name: 'HabitRPG',
               type: 'guild',
               privacy: 'public',
+              memberCount: 0,
             }, (insertErr2) => {
               if (insertErr2) return reject(insertErr2);
 

website/assets/sprites/css/index.css

@@ -1,9 +1,9 @@
 /* Comment out for holiday events */
-.npc_ian {
+/* .npc_ian {
   background: url("/npc_ian.gif") no-repeat;
   width: 78px;
   height: 135px;
-}
+} */
 
 .quest_burnout {
   background: url("/quest_burnout.gif") no-repeat;

website/assets/sprites/dist/spritesmith-largeSprites-0.css

@@ -1,30 +1,30 @@
 .promo_android {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1651px -180px;
+  background-position: -1651px -296px;
   width: 175px;
   height: 175px;
 }
 .promo_backgrounds_armoire_201602 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -565px -703px;
+  background-position: -845px -1041px;
   width: 141px;
   height: 294px;
 }
 .promo_backgrounds_armoire_201603 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -707px -703px;
+  background-position: -987px -1041px;
   width: 141px;
   height: 294px;
 }
 .promo_backgrounds_armoire_201604 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1265px -442px;
+  background-position: -141px -1041px;
   width: 140px;
   height: 441px;
 }
 .promo_backgrounds_armoire_201605 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1406px 0px;
+  background-position: -1265px -442px;
   width: 140px;
   height: 441px;
 }
@@ -54,25 +54,25 @@
 }
 .promo_backgrounds_armoire_201610 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -141px -1041px;
+  background-position: -1406px -442px;
   width: 140px;
   height: 441px;
 }
 .promo_backgrounds_armoire_201611 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1124px -442px;
+  background-position: -1124px 0px;
   width: 140px;
   height: 441px;
 }
 .promo_backgrounds_armoire_201612 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1265px 0px;
+  background-position: -1124px -442px;
   width: 140px;
   height: 441px;
 }
 .promo_backgrounds_armoire_201701 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1124px 0px;
+  background-position: -1265px 0px;
   width: 140px;
   height: 441px;
 }
@@ -96,43 +96,43 @@
 }
 .promo_chairs_glasses {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1757px -532px;
+  background-position: -1827px 0px;
   width: 51px;
   height: 210px;
 }
 .promo_checkin_incentives {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -423px -703px;
+  background-position: -703px -1041px;
   width: 141px;
   height: 294px;
 }
 .promo_classes_fall_2014 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1066px -1337px;
+  background-position: -1066px -1336px;
   width: 321px;
   height: 100px;
 }
 .promo_classes_fall_2015 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -980px -1189px;
+  background-position: -423px -896px;
   width: 377px;
   height: 99px;
 }
 .promo_classes_fall_2016 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1547px 0px;
+  background-position: -1547px -296px;
   width: 103px;
   height: 348px;
 }
 .promo_coffee_mug {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1651px 0px;
+  background-position: -1547px -645px;
   width: 200px;
   height: 179px;
 }
 .promo_contrib_spotlight_Keith {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1547px -1118px;
+  background-position: -181px -1735px;
   width: 87px;
   height: 111px;
 }
@@ -144,25 +144,25 @@
 }
 .promo_contrib_spotlight_blade {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1547px -1006px;
+  background-position: -91px -1735px;
   width: 89px;
   height: 111px;
 }
 .promo_contrib_spotlight_cantras {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1547px -1230px;
+  background-position: -269px -1735px;
   width: 87px;
   height: 109px;
 }
 .promo_contrib_spotlight_megan {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1547px -894px;
+  background-position: -984px -748px;
   width: 90px;
   height: 111px;
 }
 .promo_contrib_spotlight_shanaqui {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1547px -782px;
+  background-position: 0px -1735px;
   width: 90px;
   height: 111px;
 }
@@ -180,13 +180,13 @@
 }
 .promo_dilatoryDistress {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1481px -1644px;
+  background-position: -1879px -788px;
   width: 90px;
   height: 90px;
 }
 .promo_egg_mounts {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -703px -1041px;
+  background-position: -423px -748px;
   width: 280px;
   height: 147px;
 }
@@ -198,49 +198,49 @@
 }
 .promo_enchanted_armoire_201507 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -796px -1644px;
+  background-position: -1547px -1378px;
   width: 217px;
   height: 90px;
 }
 .promo_enchanted_armoire_201508 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1651px -1342px;
+  background-position: -1270px -1224px;
   width: 180px;
   height: 90px;
 }
 .promo_enchanted_armoire_201509 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -546px -1735px;
+  background-position: -1879px -970px;
   width: 90px;
   height: 90px;
 }
 .promo_enchanted_armoire_201511 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -982px -442px;
+  background-position: -840px -442px;
   width: 122px;
   height: 90px;
 }
 .promo_enchanted_armoire_201601 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -819px -1735px;
+  background-position: -1879px -1516px;
   width: 90px;
   height: 90px;
 }
 .promo_floral_potions {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1651px -532px;
+  background-position: -1547px -1001px;
   width: 105px;
   height: 273px;
 }
 .promo_ghost_potions {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1406px -442px;
+  background-position: -423px -1041px;
   width: 140px;
   height: 441px;
 }
 .promo_habitica {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1651px -356px;
+  background-position: -1547px -825px;
   width: 175px;
   height: 175px;
 }
@@ -252,13 +252,13 @@
 }
 .promo_habitoween_2016 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -282px -1041px;
+  background-position: -1406px 0px;
   width: 140px;
   height: 441px;
 }
 .promo_haunted_hair {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1547px -644px;
+  background-position: -1124px -884px;
   width: 100px;
   height: 137px;
 }
@@ -270,199 +270,199 @@
 }
 .promo_item_notif {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -853px -600px;
+  background-position: -1547px -1275px;
   width: 249px;
   height: 102px;
 }
 .promo_jackalope {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -703px -1189px;
+  background-position: -1547px -148px;
   width: 276px;
   height: 147px;
 }
 .promo_mystery_201405 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: 0px -1735px;
+  background-position: -1879px -1334px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201406 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1449px -1189px;
+  background-position: -1879px -418px;
   width: 90px;
   height: 96px;
 }
 .promo_mystery_201407 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1809px -669px;
+  background-position: -1827px -412px;
   width: 42px;
   height: 62px;
 }
 .promo_mystery_201408 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1051px -915px;
+  background-position: -1765px -1378px;
   width: 60px;
   height: 71px;
 }
 .promo_mystery_201409 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1390px -1644px;
+  background-position: -1879px -879px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201410 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -982px -533px;
+  background-position: -840px -533px;
   width: 72px;
   height: 63px;
 }
 .promo_mystery_201411 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1663px -1644px;
+  background-position: -1879px -606px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201412 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1809px -602px;
+  background-position: -1827px -345px;
   width: 42px;
   height: 66px;
 }
 .promo_mystery_201501 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1792px -806px;
+  background-position: -1827px -211px;
   width: 48px;
   height: 63px;
 }
 .promo_mystery_201502 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -273px -1735px;
+  background-position: -1879px -1425px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201503 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -364px -1735px;
+  background-position: -1879px -1698px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201504 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1482px -1337px;
+  background-position: -1469px -1132px;
   width: 60px;
   height: 69px;
 }
 .promo_mystery_201505 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -728px -1735px;
+  background-position: -1879px -1152px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201506 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1809px -532px;
+  background-position: -1827px -275px;
   width: 42px;
   height: 69px;
 }
 .promo_mystery_201507 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -990px -703px;
+  background-position: -1879px 0px;
   width: 90px;
   height: 105px;
 }
 .promo_mystery_201508 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1014px -1644px;
+  background-position: -477px -1644px;
   width: 93px;
   height: 90px;
 }
 .promo_mystery_201509 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1572px -1644px;
+  background-position: -1879px -1607px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201510 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1388px -1337px;
+  background-position: -383px -1644px;
   width: 93px;
   height: 90px;
 }
 .promo_mystery_201511 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1754px -1644px;
+  background-position: -571px -1644px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201512 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -990px -915px;
+  background-position: -1748px -730px;
   width: 60px;
   height: 81px;
 }
 .promo_mystery_201601 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -840px -442px;
+  background-position: -699px -448px;
   width: 120px;
   height: 90px;
 }
 .promo_mystery_201602 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -182px -1735px;
+  background-position: -1879px -697px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201603 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -91px -1735px;
+  background-position: -1879px -515px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201604 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1296px -1644px;
+  background-position: -289px -1644px;
   width: 93px;
   height: 90px;
 }
 .promo_mystery_201605 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -455px -1735px;
+  background-position: -1879px -1243px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201606 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -699px -448px;
+  background-position: -1879px -212px;
   width: 90px;
   height: 105px;
 }
 .promo_mystery_201607 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -637px -1735px;
+  background-position: -1879px -1061px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201608 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1108px -1644px;
+  background-position: -1388px -1336px;
   width: 93px;
   height: 90px;
 }
 .promo_mystery_201609 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1202px -1644px;
+  background-position: -1451px -1224px;
   width: 93px;
   height: 90px;
 }
 .promo_mystery_201610 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1771px -1194px;
+  background-position: -1748px -645px;
   width: 63px;
   height: 84px;
 }
 .promo_mystery_201611 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1358px -1189px;
+  background-position: -1879px -318px;
   width: 90px;
   height: 99px;
 }
@@ -474,37 +474,37 @@
 }
 .promo_mystery_201701 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -990px -809px;
+  background-position: -1879px -106px;
   width: 90px;
   height: 105px;
 }
 .promo_mystery_201702 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1264px -1041px;
+  background-position: -704px -748px;
   width: 279px;
   height: 147px;
 }
 .promo_mystery_3014 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -578px -1644px;
+  background-position: -1270px -1041px;
   width: 217px;
   height: 90px;
 }
 .promo_new_hair_fall2016 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -423px -1041px;
+  background-position: -282px -1041px;
   width: 140px;
   height: 441px;
 }
 .promo_orca {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1124px -884px;
+  background-position: -982px -442px;
   width: 105px;
   height: 105px;
 }
 .promo_partyhats {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1651px -1433px;
+  background-position: -982px -548px;
   width: 115px;
   height: 47px;
 }
@@ -520,39 +520,51 @@
   width: 60px;
   height: 60px;
 }
+.promo_pastel_skin_hair {
+  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
+  background-position: -423px -600px;
+  width: 354px;
+  height: 147px;
+}
+.customize-option.promo_pastel_skin_hair {
+  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
+  background-position: -448px -615px;
+  width: 60px;
+  height: 60px;
+}
 .promo_peppermint_flame {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1651px -954px;
+  background-position: -1651px -472px;
   width: 140px;
   height: 147px;
 }
 .promo_pet_skins {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1651px -806px;
+  background-position: -1653px -1001px;
   width: 140px;
   height: 147px;
 }
 .customize-option.promo_pet_skins {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1676px -821px;
+  background-position: -1678px -1016px;
   width: 60px;
   height: 60px;
 }
 .promo_pyromancer {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1265px -884px;
+  background-position: -1653px -1149px;
   width: 113px;
   height: 113px;
 }
 .promo_rainbow_armor {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1547px -1340px;
+  background-position: -357px -1735px;
   width: 92px;
   height: 103px;
 }
 .promo_seasonal_shop_fall_2016 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -984px -1041px;
+  background-position: -1547px 0px;
   width: 279px;
   height: 147px;
 }
@@ -564,28 +576,34 @@
 }
 .promo_splashyskins {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1651px -1102px;
+  background-position: -1270px -1132px;
   width: 198px;
   height: 91px;
 }
 .customize-option.promo_splashyskins {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1676px -1117px;
+  background-position: -1295px -1147px;
   width: 60px;
   height: 60px;
 }
 .promo_spooky_sparkles_fall_2016 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -849px -703px;
+  background-position: -1129px -1041px;
   width: 140px;
   height: 294px;
 }
 .promo_spring_classes_2016 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -703px -1337px;
+  background-position: -703px -1336px;
   width: 362px;
   height: 102px;
 }
+.promo_spring_classes_2017 {
+  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
+  background-position: -778px -600px;
+  width: 309px;
+  height: 147px;
+}
 .promo_springclasses2014 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
   background-position: 0px -1644px;
@@ -594,31 +612,19 @@
 }
 .promo_springclasses2015 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -289px -1644px;
+  background-position: -801px -896px;
   width: 288px;
   height: 90px;
 }
 .promo_staff_spotlight_Lemoness {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1547px -349px;
+  background-position: -1723px -825px;
   width: 102px;
   height: 146px;
 }
-.promo_staff_spotlight_Viirus {
-  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1651px -1194px;
-  width: 119px;
-  height: 147px;
-}
 .promo_staff_spotlight_paglias {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1547px -496px;
+  background-position: -1265px -884px;
   width: 99px;
   height: 147px;
 }
-.promo_summer_classes_2014 {
-  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -423px -600px;
-  width: 429px;
-  height: 102px;
-}

website/assets/sprites/dist/spritesmith-largeSprites-1.css

@@ -1,6 +1,24 @@
+.promo_staff_spotlight_Viirus {
+  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
+  background-position: -139px -1054px;
+  width: 119px;
+  height: 147px;
+}
+.promo_steampunk_3017 {
+  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
+  background-position: -141px -440px;
+  width: 140px;
+  height: 441px;
+}
+.promo_summer_classes_2014 {
+  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
+  background-position: -885px -591px;
+  width: 429px;
+  height: 102px;
+}
 .promo_summer_classes_2015 {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -553px -615px;
+  background-position: -584px -882px;
   width: 300px;
   height: 88px;
 }
@@ -12,13 +30,13 @@
 }
 .promo_takeThis_gear {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -441px -882px;
+  background-position: -885px -882px;
   width: 114px;
   height: 87px;
 }
 .promo_takethis_armor {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -556px -882px;
+  background-position: -1000px -882px;
   width: 114px;
   height: 87px;
 }
@@ -30,19 +48,19 @@
 }
 .promo_turkey_day_2016 {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: 0px -440px;
+  background-position: -282px -440px;
   width: 140px;
   height: 441px;
 }
 .promo_unconventional_armor {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1283px -666px;
+  background-position: -1315px -591px;
   width: 60px;
   height: 60px;
 }
 .promo_unconventional_armor2 {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1283px -591px;
+  background-position: -1283px -694px;
   width: 70px;
   height: 74px;
 }
@@ -54,13 +72,13 @@
 }
 .promo_veteran_pets {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -553px -704px;
+  background-position: -576px -796px;
   width: 146px;
   height: 75px;
 }
 .promo_winter_classes_2016 {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -452px -296px;
+  background-position: -223px -882px;
   width: 360px;
   height: 90px;
 }
@@ -72,31 +90,31 @@
 }
 .promo_winter_fireworks {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -302px -882px;
+  background-position: 0px -1054px;
   width: 138px;
   height: 147px;
 }
 .promo_winterclasses2015 {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -885px -757px;
+  background-position: -452px -296px;
   width: 325px;
   height: 110px;
 }
 .promo_wintery_skins {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -141px -440px;
+  background-position: 0px -440px;
   width: 140px;
   height: 441px;
 }
 .customize-option.promo_wintery_skins {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -166px -455px;
+  background-position: -25px -455px;
   width: 60px;
   height: 60px;
 }
 .promo_winteryhair {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1211px -757px;
+  background-position: -423px -796px;
   width: 152px;
   height: 75px;
 }
@@ -108,7 +126,7 @@
 }
 .npc_viirus {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: 0px -1033px;
+  background-position: -259px -1054px;
   width: 108px;
   height: 90px;
 }
@@ -120,7 +138,7 @@
 }
 .promo_backtoschool {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -151px -882px;
+  background-position: -1132px -694px;
   width: 150px;
   height: 150px;
 }
@@ -132,7 +150,7 @@
 }
 .promo_startingover {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1132px -591px;
+  background-position: -730px -440px;
   width: 150px;
   height: 150px;
 }
@@ -150,43 +168,43 @@
 }
 .scene_coding {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1186px -440px;
+  background-position: -694px -615px;
   width: 150px;
   height: 150px;
 }
 .scene_eco_friendly {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -589px -440px;
+  background-position: 0px -882px;
   width: 222px;
   height: 171px;
 }
 .scene_habits {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -282px -440px;
+  background-position: -423px -440px;
   width: 306px;
   height: 174px;
 }
 .scene_phone_peek {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: 0px -882px;
+  background-position: -1186px -440px;
   width: 150px;
   height: 150px;
 }
 .welcome_basic_avatars {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1126px -96px;
+  background-position: -885px -694px;
   width: 246px;
   height: 165px;
 }
 .welcome_promo_party {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -282px -615px;
+  background-position: -423px -615px;
   width: 270px;
   height: 180px;
 }
 .welcome_sample_tasks {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -885px -591px;
+  background-position: -1126px -96px;
   width: 246px;
   height: 165px;
 }

website/assets/sprites/dist/spritesmith-main-17.css

@@ -0,0 +1,174 @@
+.Pet-Wolf-Peppermint {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: 0px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Red {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -82px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-RoyalPurple {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -82px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Shade {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -164px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Skeleton {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: 0px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Spooky {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -82px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Thunderstorm {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -164px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Veteran {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -246px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-White {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -246px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Zombie {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: 0px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet_HatchingPotion_Base {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -164px -200px;
+  width: 48px;
+  height: 51px;
+}
+.Pet_HatchingPotion_CottonCandyBlue {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -213px -200px;
+  width: 48px;
+  height: 51px;
+}
+.Pet_HatchingPotion_CottonCandyPink {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -262px -200px;
+  width: 48px;
+  height: 51px;
+}
+.Pet_HatchingPotion_Cupid {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -328px 0px;
+  width: 48px;
+  height: 51px;
+}
+.Pet_HatchingPotion_Desert {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -377px -156px;
+  width: 48px;
+  height: 51px;
+}
+.Pet_HatchingPotion_Floral {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -328px -104px;
+  width: 48px;
+  height: 51px;
+}
+.Pet_HatchingPotion_Ghost {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -328px -156px;
+  width: 48px;
+  height: 51px;
+}
+.Pet_HatchingPotion_Golden {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -328px -208px;
+  width: 48px;
+  height: 51px;
+}
+.Pet_HatchingPotion_Holly {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: 0px -300px;
+  width: 48px;
+  height: 51px;
+}
+.Pet_HatchingPotion_Peppermint {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -49px -300px;
+  width: 48px;
+  height: 51px;
+}
+.Pet_HatchingPotion_Purple {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -98px -300px;
+  width: 48px;
+  height: 51px;
+}
+.Pet_HatchingPotion_Red {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -147px -300px;
+  width: 48px;
+  height: 51px;
+}
+.Pet_HatchingPotion_RoyalPurple {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -196px -300px;
+  width: 48px;
+  height: 51px;
+}
+.Pet_HatchingPotion_Shade {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -245px -300px;
+  width: 48px;
+  height: 51px;
+}
+.Pet_HatchingPotion_Skeleton {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -294px -300px;
+  width: 48px;
+  height: 51px;
+}
+.Pet_HatchingPotion_Spooky {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -377px 0px;
+  width: 48px;
+  height: 51px;
+}
+.Pet_HatchingPotion_Thunderstorm {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -377px -52px;
+  width: 48px;
+  height: 51px;
+}
+.Pet_HatchingPotion_White {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -377px -104px;
+  width: 48px;
+  height: 51px;
+}
+.Pet_HatchingPotion_Zombie {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -328px -52px;
+  width: 48px;
+  height: 51px;
+}