From d9bef28c5d90c56f5a09b3a40913ca2313eaa2c2 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Thu, 12 Dec 2013 20:23:25 -0700
Subject: [PATCH] migrate flags.rest => preferences.sleep

---
 migrations/20131204_classes.js | 3 +++
 src/controllers/groups.js      | 2 +-
 src/controllers/user.js        | 4 +---
 src/models/user.js             | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/migrations/20131204_classes.js b/migrations/20131204_classes.js
index 4df17ad61a..4913703ba9 100644
--- a/migrations/20131204_classes.js
+++ b/migrations/20131204_classes.js
@@ -24,5 +24,8 @@ db.users.find().forEach(function(user){
   // Delete armorSet
   delete user.preferences.armorSet;
 
+  user.preferences.sleep = user.flags.rest;
+  delete user.flags.rest;
+
   db.users.update({_id:user._id}, user);
 });
\ No newline at end of file
diff --git a/src/controllers/groups.js b/src/controllers/groups.js
index c31c35d107..bd51083f10 100644
--- a/src/controllers/groups.js
+++ b/src/controllers/groups.js
@@ -14,7 +14,7 @@ var api = module.exports;
   ------------------------------------------------------------------------
 */
 
-var partyFields = 'profile preferences stats achievements party backer contributor flags.rest auth.timestamps items';
+var partyFields = 'profile preferences stats achievements party backer contributor auth.timestamps items';
 var nameFields = 'profile.name';
 var challengeFields = '_id name';
 var guildPopulate = {path: 'members', select: nameFields, options: {limit: 15} };
diff --git a/src/controllers/user.js b/src/controllers/user.js
index 89f3a334bf..c7be285db7 100644
--- a/src/controllers/user.js
+++ b/src/controllers/user.js
@@ -226,10 +226,8 @@ api.update = function(req, res, next) {
 api.cron = function(req, res, next) {
   var user = res.locals.user;
   shared.cron(user);
-  if (user.isModified()) {
+  if (user.isModified())
     res.locals.wasModified = true;
-    user.auth.timestamps.loggedin = new Date();
-  }
   user.save(next);
 };
 
diff --git a/src/models/user.js b/src/models/user.js
index 5e3469ecc3..a89d5c6977 100644
--- a/src/models/user.js
+++ b/src/models/user.js
@@ -92,7 +92,6 @@ var UserSchema = new Schema({
     newStuff: {type: Boolean, 'default': false},
     rewrite: {type: Boolean, 'default': true},
     partyEnabled: Boolean, // FIXME do we need this?
-    rest: {type: Boolean, 'default': false}, // fixme - change to preferences.resting once we're off derby
     contributor: Boolean,
     classSelected: {type: Boolean, 'default': false}
   },
@@ -214,7 +213,8 @@ var UserSchema = new Schema({
     timezoneOffset: Number,
     language: String,
     automaticAllocation: Boolean,
-    useCostume: Boolean
+    useCostume: Boolean,
+    sleep: {type: Boolean, 'default': false}
   },
   profile: {
     blurb: String,