{
checkChallenge: function(c)
{
- if (!c.vid.match(/^[0-9]+$/))
+ if (!c.vid.toString().match(/^[0-9]+$/))
return "Wrong variant ID";
-
if (!c.timeControl.match(/^[0-9dhms +]+$/))
return "Wrong characters in time control";
-
- if (!c.fen.match(/^[a-zA-Z0-9, /-]+$/))
+ if (!c.fen.match(/^[a-zA-Z0-9, /-]*$/))
return "Bad FEN string";
+ return "";
},
// fen cannot be undefined
create: function(c, cb)
{
db.serialize(function() {
- let query =
+ const query =
"INSERT INTO Challenges " +
"(added, uid, " + (!!c.to ? "target, " : "") +
"vid, fen, timeControl) VALUES " +
getOne: function(id, cb)
{
db.serialize(function() {
- let query =
+ const query =
"SELECT * " +
"FROM Challenges " +
"WHERE id = " + id;
"SELECT * " +
"FROM Challenges " +
"WHERE target IS NULL OR target = " + uid;
- db.run(query, (err,challenges) => {
+ db.all(query, (err,challenges) => {
return cb(err, challenges);
});
});
},
- remove: function(id, uid)
+ remove: function(id, uid, cb)
{
db.serialize(function() {
let query =
"SELECT 1 " +
"FROM Challenges " +
"WHERE id = " + id + " AND uid = " + uid;
- db.run(query, (err,rows) => {
- if (rows.length == 0)
- return res.json({errmsg: "Not your challenge"});
+ db.get(query, (err,chall) => {
+ if (!chall)
+ return cb({errmsg: "Not your challenge"});
query =
"DELETE FROM Challenges " +
"WHERE id = " + id;
db.run(query);
+ cb(null);
});
});
},