X-Git-Url: https://git.auder.net/?p=vchess.git;a=blobdiff_plain;f=server%2Fmodels%2FGame.js;h=8cc526fe3cc69ab14d940a0df48219e2e867c1e7;hp=5304693096bb11bfffa4cbbc64b20074fd5abe2a;hb=eb2d61de8d569470fa329a484efe9bab420b2b82;hpb=d807470f965d4d60a7fe6e1320ac7dfd3f0ea03f diff --git a/server/models/Game.js b/server/models/Game.js index 53046930..8cc526fe 100644 --- a/server/models/Game.js +++ b/server/models/Game.js @@ -15,7 +15,7 @@ const UserModel = require("./User"); * created: datetime * drawOffer: char ('w','b' or '' for none) * rematchOffer: char (similar to drawOffer) - * randomness: integer + * options: varchar * deletedByWhite: boolean * deletedByBlack: boolean * chatReadWhite: datetime @@ -40,7 +40,6 @@ const GameModel = { return ( g.vid.toString().match(/^[0-9]+$/) && g.cadence.match(/^[0-9dhms +]+$/) && - g.randomness.toString().match(/^[0-2]$/) && g.fen.match(/^[a-zA-Z0-9, /-]*$/) && g.players.length == 2 && g.players.every(p => p.id.toString().match(/^[0-9]+$/)) @@ -57,22 +56,22 @@ const GameModel = { }); }, - create: function(vid, fen, randomness, cadence, players, cb) { + create: function(vid, fen, options, cadence, players, cb) { db.serialize(function() { let query = "INSERT INTO Games " + "(" + - "vid, fenStart, fen, randomness, " + + "vid, fenStart, fen, options, " + "white, black, " + "cadence, created" + ") " + "VALUES " + "(" + - vid + ",'" + fen + "','" + fen + "'," + randomness + "," + + vid + ",'" + fen + "','" + fen + "',?," + players[0].id + "," + players[1].id + "," + "'" + cadence + "'," + Date.now() + ")"; - db.run(query, function(err) { + db.run(query, options, function(err) { cb(err, { id: this.lastID }); }); }); @@ -85,7 +84,7 @@ const GameModel = { let query = "SELECT " + "id, vid, fen, fenStart, cadence, created, " + - "white, black, randomness, score, scoreMsg, " + + "white, black, options, score, scoreMsg, " + "chatReadWhite, chatReadBlack, drawOffer, rematchOffer " + "FROM Games " + "WHERE id = " + id;