X-Git-Url: https://git.auder.net/images/pieces/current/gitweb.js?a=blobdiff_plain;f=server%2Fmodels%2FUser.js;h=d62cd767888aeb70bc1271ace4e0842c89a4ac02;hb=e28519f25f88ee133fc8aaa766c9bd95eec6c1ba;hp=c193d6db6cdd906493bad34aad3e8ae925003a27;hpb=fccaa87852129f8f27c66a9d3b626f91868109c8;p=vchess.git diff --git a/server/models/User.js b/server/models/User.js index c193d6db..d62cd767 100644 --- a/server/models/User.js +++ b/server/models/User.js @@ -5,7 +5,7 @@ const sendEmail = require('../utils/mailer'); /* * Structure: - * _id: integer + * id: integer * name: varchar * email: varchar * loginToken: token on server only @@ -17,6 +17,7 @@ const sendEmail = require('../utils/mailer'); */ const UserModel = { + checkNameEmail: function(o) { return ( (!o.name || !!(o.name.match(/^[\w-]+$/))) && @@ -139,7 +140,7 @@ const UserModel = { }, tryNotify: function(id, message) { - UserModel.getOne("id", id, "name, email", (err, user) => { + UserModel.getOne("id", id, "name, email, notify", (err, user) => { if (!err && user.notify) UserModel.notify(user, message); }); }, @@ -170,14 +171,18 @@ const UserModel = { } }); if (toRemove.length > 0) { + const remArg = toRemove.join(","); db.run( "DELETE FROM Users " + - "WHERE id IN (" + toRemove.join(",") + ")" + "WHERE id IN (" + remArg + ")" ); + // Update tournament DB: + exec(params.tourneyPath + "/dbsync/delete_users.py " + remArg); } }); }); - }, -} + } + +}; module.exports = UserModel;