Skip to content

Commit

Permalink
fix typo in chat msg, update mongoose
Browse files Browse the repository at this point in the history
  • Loading branch information
btouellette committed Aug 3, 2020
1 parent a7d2cc7 commit b8446c5
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions app/models/gamestate.js
Original file line number Diff line number Diff line change
Expand Up @@ -1502,7 +1502,7 @@ function checkAndFinalizeFeature(placedTile, featureIndex, featureType, gameFini
if(scoringPlayers.length > 0 && scoredPoints > 0) {
message = scoringPlayers.map(function(player) {
return player.user.username + ' (' + player.points + ')';
}).join(' and ') + ' scored ' + scoredPoints + ' for ' + (featureType === 'farm' ? ' a ' : gameFinished ? 'an uncomplete ' : 'a completed ') + featureType;
}).join(' and ') + ' scored ' + scoredPoints + ' for ' + (featureType === 'farm' ? 'a ' : gameFinished ? 'an uncomplete ' : 'a completed ') + featureType;
if(featureInfo.cathedral) {
message += ' with a cathedral';
} else if(featureInfo.inn) {
Expand Down Expand Up @@ -1588,4 +1588,4 @@ function getFeatureIndex(placedTile, type, direction) {
}

// create the model for game information and expose it to our app
module.exports = mongoose.model('Gamestate', gamestateSchema);
module.exports = mongoose.model('Gamestate', gamestateSchema);
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"express": "^4.15.4",
"express-session": "^1.15.5",
"helmet": "^3.8.1",
"mongoose": "^4.11.6",
"mongoose": "^5.9.24",
"moniker": "^0.1.2",
"newrelic": "^2.0.2",
"nodemailer": "^2.7.2",
Expand Down
2 changes: 1 addition & 1 deletion server.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ var sessionStore = new MongoStore({
});

mongoose.plugin(schema => { schema.options.usePushEach = true }); // MongoDB 3.6+ deprecates $pushAll, set flag for mongoose to avoid that operator
mongoose.connect(configDB.url, { useMongoClient: true }); // connect to our database
mongoose.connect(configDB.url); // connect to our database

require('./config/passport')(passport); // pass passport for configuration

Expand Down

0 comments on commit b8446c5

Please sign in to comment.