X-Git-Url: https://git.auder.net/?p=vchess.git;a=blobdiff_plain;f=server%2Fmodels%2FUser.js;h=cc104ab07ed5821f8bca8065b98d36463f5f17e5;hp=c193d6db6cdd906493bad34aad3e8ae925003a27;hb=aa6d9b33f70c9baccac98ab41c72d2bd787eac83;hpb=fccaa87852129f8f27c66a9d3b626f91868109c8 diff --git a/server/models/User.js b/server/models/User.js index c193d6db..cc104ab0 100644 --- a/server/models/User.js +++ b/server/models/User.js @@ -2,10 +2,11 @@ const db = require("../utils/database"); const genToken = require("../utils/tokenGenerator"); const params = require("../config/parameters"); const sendEmail = require('../utils/mailer'); +const { exec } = require("child_process"); /* * Structure: - * _id: integer + * id: integer * name: varchar * email: varchar * loginToken: token on server only @@ -17,6 +18,7 @@ const sendEmail = require('../utils/mailer'); */ const UserModel = { + checkNameEmail: function(o) { return ( (!o.name || !!(o.name.match(/^[\w-]+$/))) && @@ -139,7 +141,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 +172,16 @@ const UserModel = { } }); if (toRemove.length > 0) { + const remArg = toRemove.join(","); db.run( "DELETE FROM Users " + - "WHERE id IN (" + toRemove.join(",") + ")" + "WHERE id IN (" + remArg + ")" ); } }); }); - }, -} + } + +}; module.exports = UserModel;