diff --git a/public/js/controllers/groupsCtrl.js b/public/js/controllers/groupsCtrl.js index b5b38d9fa5..123fc2c625 100644 --- a/public/js/controllers/groupsCtrl.js +++ b/public/js/controllers/groupsCtrl.js @@ -89,6 +89,7 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Groups', '$http', 'A } $scope.nameTagClasses = function(message){ + if (!message) return; // fixme what's triggering this? if (message.contributor) { if (message.contributor.match(/npc/i) || message.contributor.match(/royal/i)) { return 'label-royal'; diff --git a/public/js/services/userServices.js b/public/js/services/userServices.js index 31f285f471..4ea6292192 100644 --- a/public/js/services/userServices.js +++ b/public/js/services/userServices.js @@ -124,7 +124,7 @@ angular.module('userServices', []). settings.auth.apiToken = token; settings.online = true; if (user && user._v) user._v--; // shortcut to always fetch new updates on page reload - this.log({}, cb); + userServices.log({}, cb); } else { alert('Please enter your ID and Token in settings.') } @@ -155,17 +155,16 @@ angular.module('userServices', []). var log = { op: 'set', data: {} }; window.habitrpgShared.helpers.dotSet(k, v, this.user); log.data[k] = v; - this.log(log); + userServices.log(log); }, setMultiple: function(obj){ - var self = this; var log = { op: 'set', data: {} }; _.each(obj, function(v,k){ - window.habitrpgShared.helpers.dotSet(k, v, self.user); + window.habitrpgShared.helpers.dotSet(k, v, userServices.user); log.data[k] = v; }); - self.log(log); + userServices.log(log); }, save: save, diff --git a/src/models/user.js b/src/models/user.js index 0ff0a580f2..c7fea3994f 100644 --- a/src/models/user.js +++ b/src/models/user.js @@ -42,15 +42,14 @@ var UserSchema = new Schema({ loggedin: Date } }, - /* TODO*/ - backer: Schema.Types.Mixed, - /* - # tier: Number - # admin: Boolean - # contributor: Boolean - # tokensApplieds: Boolean - */ + backer: { + tier: Number, + admin: Boolean, + npc: String, + contributor: String, + tokensApplied: Boolean + }, balance: Number, habitIds: Array, @@ -155,12 +154,12 @@ var UserSchema = new Schema({ }, preferences: { armorSet: String, - dayStart: Number, - gender: String, - hair: String, - hideHeader: Boolean, - showHelm: Boolean, - skin: String, + dayStart: {type:Number, 'default': 0}, + gender: {type:String, 'default': 'm'}, + hair: {type:String, 'default':'blond'}, + hideHeader: {type:Boolean, 'default':false}, + showHelm: {type:Boolean, 'default':true}, + skin: {type:String, 'default':'white'}, timezoneOffset: Number }, profile: {