Merge pull request btouellette#29 from btouellette/master

adding last modified time to gamestates
froggeric · May 10, 2018 · 503b06f · 503b06f
2 parents 751a010 + 82a0cd5
commit 503b06f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/app/gameserver.js b/app/gameserver.js
@@ -268,7 +268,7 @@ module.exports = function(server, sessionStore) {
  if(gamestate && gamestate.userIsInGame(currentUser)) {
  // add the message to the gamestate, trimming to 200 characters and limiting message array length to 500
  message = message.substr(0,200);
- Gamestate.findByIdAndUpdate(gameID, { $push: { messages: { $each: [{ username: currentUser.username, message: message}], $slice: -500 }}}, function(err, gamestate) {
+ Gamestate.findByIdAndUpdate(gameID, { $set: { lastModified: new Date() }, $push: { messages: { $each: [{ username: currentUser.username, message: message}], $slice: -500 }}}, function(err, gamestate) {
  gamestate.populate('players.user', function(err, gamestate) {
  // get distinct list of user IDs in the game
  var distinctUserIDs = gamestate.players.map(function(player) { return player.user._id; }).filter(function(value, index, self) {

diff --git a/app/models/gamestate.js b/app/models/gamestate.js
@@ -85,7 +85,8 @@ var gamestateSchema = mongoose.Schema({
  x: Number,
  y: Number,
  playerIndex: Number // which player placed this tile
- }]
+ }],
+ lastModified: { type: Date, default: new Date() }
 });
 
 function getMeepleFlagFromType(meepleType) {
@@ -791,6 +792,8 @@ gamestateSchema.methods.drawTile = function(callback, autocomplete) {
  for (var key in groupedPlacements) {
  gamestate.activeTile.validPlacements.push(groupedPlacements[key]);
  }
+ gamestate.lastModified = new Date();
+ gamestate.markModified('lastModified');
  if(autocomplete) {
  callback(null, gamestate);
  return;

diff --git a/config/passport.js b/config/passport.js
@@ -34,7 +34,7 @@ module.exports = function(passport) {
  } else { 
  console.log('user found: ' + user.username);
  }
- user.populate('activeGames friends', 'players.user players.active started finished username unusedTiles', function(err, user) {
+ user.populate('activeGames friends', 'players.user players.active started finished username unusedTiles lastModified', function(err, user) {
  if(err) { 
  console.log('passport deserialize populate user err: ' + err); 
  } else { 

diff --git a/views/game.ejs b/views/game.ejs
@@ -211,6 +211,8 @@
 //TODO: add a message to the game chat when a tile is discarded
 
 var userGames = <%- JSON.stringify(user.activeGames) %>;
+userGames.sort(function(a,b) {return (a.lastModified > b.lastModified) ? 1 : ((b.lastModified > a.lastModified) ? -1 : 0);} ); 
+
 var userFriends = <%- JSON.stringify(user.friends) %>;
 var userID = '<%- user._id %>';
 var socket = io.connect('<%- process.env.SOCKET_URL %>');