projects
/
vchess.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix rematch process
[vchess.git]
/
server
/
models
/
Game.js
diff --git
a/server/models/Game.js
b/server/models/Game.js
index
fc48591
..
caa15c3
100644
(file)
--- a/
server/models/Game.js
+++ b/
server/models/Game.js
@@
-39,7
+39,7
@@
const GameModel =
g.cadence.match(/^[0-9dhms +]+$/) &&
g.fen.match(/^[a-zA-Z0-9, /-]*$/) &&
g.players.length == 2 &&
g.cadence.match(/^[0-9dhms +]+$/) &&
g.fen.match(/^[a-zA-Z0-9, /-]*$/) &&
g.players.length == 2 &&
- g.players.every(p => p.id.toString().match(/^[0-9]+$/))
+ g.players.every(p => p.
u
id.toString().match(/^[0-9]+$/))
);
},
);
},
@@
-60,7
+60,7
@@
const GameModel =
const color = (idx==0 ? "w" : "b");
query =
"INSERT INTO Players VALUES " +
const color = (idx==0 ? "w" : "b");
query =
"INSERT INTO Players VALUES " +
- "(" + this.lastID + "," + p.id + ",'" + color + "')";
+ "(" + this.lastID + "," + p.
u
id + ",'" + color + "')";
db.run(query);
});
cb(null, {gid: this.lastID});
db.run(query);
});
cb(null, {gid: this.lastID});
@@
-99,7
+99,8
@@
const GameModel =
"FROM Chats " +
"WHERE gid = " + id;
db.all(query, (err4, chats) => {
"FROM Chats " +
"WHERE gid = " + id;
db.all(query, (err4, chats) => {
- const game = Object.assign({},
+ const game = Object.assign(
+ {},
gameInfo,
{
players: players,
gameInfo,
{
players: players,
@@
-140,7
+141,8
@@
const GameModel =
"FROM Moves " +
"WHERE gid = " + id;
db.get(query, (err,ret) => {
"FROM Moves " +
"WHERE gid = " + id;
db.get(query, (err,ret) => {
- const game = Object.assign({},
+ const game = Object.assign(
+ {},
gameInfo,
{
players: players,
gameInfo,
{
players: players,
@@
-212,6
+214,8
@@
const GameModel =
)
) && (
!obj.drawOffer || !!(obj.drawOffer.match(/^[wbtn]$/))
)
) && (
!obj.drawOffer || !!(obj.drawOffer.match(/^[wbtn]$/))
+ ) && (
+ !obj.rematchOffer || !!(obj.rematchOffer.match(/^[wbn]$/))
) && (
!obj.fen || !!(obj.fen.match(/^[a-zA-Z0-9, /-]*$/))
) && (
) && (
!obj.fen || !!(obj.fen.match(/^[a-zA-Z0-9, /-]*$/))
) && (
@@
-234,12
+238,18
@@
const GameModel =
let modifs = "";
// NOTE: if drawOffer is set, we should check that it's player's turn
// A bit overcomplicated. Let's trust the client on that for now...
let modifs = "";
// NOTE: if drawOffer is set, we should check that it's player's turn
// A bit overcomplicated. Let's trust the client on that for now...
- if (obj.drawOffer)
+ if (
!!
obj.drawOffer)
{
{
- if (obj.drawOffer == "n") //
S
pecial "None" update
+ if (obj.drawOffer == "n") //
s
pecial "None" update
obj.drawOffer = "";
modifs += "drawOffer = '" + obj.drawOffer + "',";
}
obj.drawOffer = "";
modifs += "drawOffer = '" + obj.drawOffer + "',";
}
+ if (!!obj.rematchOffer)
+ {
+ if (obj.rematchOffer == "n") //special "None" update
+ obj.rematchOffer = "";
+ modifs += "rematchOffer = '" + obj.rematchOffer + "',";
+ }
if (!!obj.fen)
modifs += "fen = '" + obj.fen + "',";
if (!!obj.score)
if (!!obj.fen)
modifs += "fen = '" + obj.fen + "',";
if (!!obj.score)