projects
/
vchess.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Try to switch off cleanGamesDb
[vchess.git]
/
server
/
models
/
Challenge.js
diff --git
a/server/models/Challenge.js
b/server/models/Challenge.js
index
c988aba
..
4aae427
100644
(file)
--- a/
server/models/Challenge.js
+++ b/
server/models/Challenge.js
@@
-1,4
+1,5
@@
var db = require("../utils/database");
var db = require("../utils/database");
+const UserModel = require("./User");
/*
* Structure:
/*
* Structure:
@@
-8,7
+9,7
@@
var db = require("../utils/database");
* target: recipient id (optional)
* vid: variant id (int)
* fen: varchar (optional)
* target: recipient id (optional)
* vid: variant id (int)
* fen: varchar (optional)
- *
timeControl
: string (3m+2s, 7d+1d ...)
+ *
cadence
: string (3m+2s, 7d+1d ...)
*/
const ChallengeModel =
*/
const ChallengeModel =
@@
-17,10
+18,12
@@
const ChallengeModel =
{
if (!c.vid.toString().match(/^[0-9]+$/))
return "Wrong variant ID";
{
if (!c.vid.toString().match(/^[0-9]+$/))
return "Wrong variant ID";
- if (!c.
timeControl
.match(/^[0-9dhms +]+$/))
+ if (!c.
cadence
.match(/^[0-9dhms +]+$/))
return "Wrong characters in time control";
if (!c.fen.match(/^[a-zA-Z0-9, /-]*$/))
return "Bad FEN string";
return "Wrong characters in time control";
if (!c.fen.match(/^[a-zA-Z0-9, /-]*$/))
return "Bad FEN string";
+ if (!!c.to)
+ return UserModel.checkNameEmail({name: c.to});
return "";
},
return "";
},
@@
-30,11
+33,11
@@
const ChallengeModel =
db.serialize(function() {
const query =
"INSERT INTO Challenges " +
db.serialize(function() {
const query =
"INSERT INTO Challenges " +
- "(added, uid, " + (!!c.to ? "target, " : "") +
- "
vid, fen, timeControl)
VALUES " +
+ "(added, uid, " + (!!c.to ? "target, " : "") +
"vid, fen, cadence) " +
+ "VALUES " +
"(" + Date.now() + "," + c.uid + "," + (!!c.to ? c.to + "," : "") +
"(" + Date.now() + "," + c.uid + "," + (!!c.to ? c.to + "," : "") +
- c.vid + ",'" + c.fen + "','" + c.
timeControl
+ "')";
- db.run(query,
err =>
{
+ c.vid + ",'" + c.fen + "','" + c.
cadence
+ "')";
+ db.run(query,
function(err)
{
return cb(err, {cid: this.lastID});
});
});
return cb(err, {cid: this.lastID});
});
});
@@
-53,34
+56,44
@@
const ChallengeModel =
});
},
});
},
- // all challenges except where target is defined and not me
+ // All challenges except where target is defined and not me,
+ // and I'm not the sender.
getByUser: function(uid, cb)
{
db.serialize(function() {
const query =
"SELECT * " +
"FROM Challenges " +
getByUser: function(uid, cb)
{
db.serialize(function() {
const query =
"SELECT * " +
"FROM Challenges " +
- "WHERE target IS NULL OR target = " + uid;
+ "WHERE target IS NULL" +
+ " OR uid = " + uid +
+ " OR target = " + uid;
db.all(query, (err,challenges) => {
return cb(err, challenges);
});
});
},
db.all(query, (err,challenges) => {
return cb(err, challenges);
});
});
},
- remove: function(id
, uid, cb
)
+ remove: function(id)
{
db.serialize(function() {
{
db.serialize(function() {
- let query =
+ const query =
+ "DELETE FROM Challenges " +
+ "WHERE id = " + id;
+ db.run(query);
+ });
+ },
+
+ safeRemove: function(id, uid, cb)
+ {
+ db.serialize(function() {
+ const query =
"SELECT 1 " +
"FROM Challenges " +
"WHERE id = " + id + " AND uid = " + uid;
db.get(query, (err,chall) => {
if (!chall)
return cb({errmsg: "Not your challenge"});
"SELECT 1 " +
"FROM Challenges " +
"WHERE id = " + id + " AND uid = " + uid;
db.get(query, (err,chall) => {
if (!chall)
return cb({errmsg: "Not your challenge"});
- query =
- "DELETE FROM Challenges " +
- "WHERE id = " + id;
- db.run(query);
+ ChallengeModel.remove(id);
cb(null);
});
});
cb(null);
});
});