From 0d916ac81dc8974163822494ad5bb3a91c173ee2 Mon Sep 17 00:00:00 2001 From: paoloar77 Date: Thu, 10 Mar 2022 00:28:23 +0100 Subject: [PATCH] =?UTF-8?q?Se=20la=20window=20viene=20attivata,=20e=20se?= =?UTF-8?q?=20sono=20in=20fase=20di=20registrazione,=20allora=20controllo?= =?UTF-8?q?=20se=20ci=20sono=20aggiornamenti=20ogni=2010=20secondi,=20load?= =?UTF-8?q?Site=20Corretto=20che=20il=20link=20di=20registrazione=20se=20e?= =?UTF-8?q?ra=20in=20minuscolo=20l'username=20e=20venivi=20registrato=20in?= =?UTF-8?q?=20maiuscolo,=20non=20lo=20prendeva.=20L'immagine=20di=20telegr?= =?UTF-8?q?am=20occorre=20salvare=20anche=20la=20versione=20SMALL=20Corret?= =?UTF-8?q?to=20filtro,=20se=20cambiavo=20Regione,=20non=20mi=20resettava?= =?UTF-8?q?=20la=20Provincia=20e=20la=20Citt=C3=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/models/msg_template.js | 12 ++++++++++-- src/server/models/user.js | 25 +++++++++++++++++++++++-- src/server/populate/provinces.js | 2 +- src/server/router/index_router.js | 9 ++++----- src/server/router/users_router.js | 4 ++++ src/server/telegram/telegrambot.js | 14 ++++++++------ 6 files changed, 50 insertions(+), 16 deletions(-) diff --git a/src/server/models/msg_template.js b/src/server/models/msg_template.js index 128a19d..9b493a3 100755 --- a/src/server/models/msg_template.js +++ b/src/server/models/msg_template.js @@ -70,14 +70,22 @@ MsgTemplateSchema.statics.executeQueryTable = function (idapp, params) { return tools.executeQueryTable(this, idapp, params); }; -MsgTemplateSchema.statics.getMsgByLang = async function (idapp, typemsg, lang) { +MsgTemplateSchema.statics.getMsgByLang = async function (idapp, myuser, typemsg, lang) { const MsgTemplate = this; try { const mymsg = await MsgTemplate.findOne({ idapp, typemsg }); if (!!mymsg) { if ((!!mymsg["msg_" + lang]) && (!!mymsg["title_" + lang])) { - return { body: mymsg["msg_" + lang], title: mymsg["title_" + lang] } + let body = mymsg["msg_" + lang] + let title = mymsg["title_" + lang] + if (!body) { + body = mymsg["msg_it"] + title = mymsg["title_it"] + } + body = tools.convertSpecialTags(myuser, body); + title = tools.convertSpecialTags(myuser, title); + return { body, title } } } } catch (e) { diff --git a/src/server/models/user.js b/src/server/models/user.js index 5027a32..17274d3 100755 --- a/src/server/models/user.js +++ b/src/server/models/user.js @@ -2173,13 +2173,34 @@ UserSchema.statics.getNameSurnameByUsername = async function( UserSchema.statics.getIdByUsername = async function(idapp, username) { const User = this; + let regexp = new RegExp(`${username}`, 'i') + return User.findOne({ - idapp, username, + idapp, + username : + { $regex: regexp }, $or: [{deleted: {$exists: false}}, {deleted: {$exists: true, $eq: false}}], }, {username: 1, _id: 1}).then((rec) => { return (!!rec) ? rec._id.toString() : ''; }).catch((e) => { - console.error('getNameSurnameByUsername', e); + console.error('getIdByUsername', e); + }); +}; + +UserSchema.statics.getRealUsernameByUsername = async function(idapp, username) { + const User = this; + + let regexp = new RegExp(`${username}`, 'i') + + return User.findOne({ + idapp, + username : + { $regex: regexp }, + $or: [{deleted: {$exists: false}}, {deleted: {$exists: true, $eq: false}}], + }, {username: 1, _id: 1}).then((rec) => { + return (!!rec) ? rec.username : ''; + }).catch((e) => { + console.error('getRealUsernameByUsername', e); }); }; diff --git a/src/server/populate/provinces.js b/src/server/populate/provinces.js index a722786..682bab4 100644 --- a/src/server/populate/provinces.js +++ b/src/server/populate/provinces.js @@ -110,7 +110,7 @@ module.exports = { {_id: 108, reg: 'CAL', prov: 'VV', descr: 'Vibo Valentia', link_grp: 'https://t.me/c/1614195634/386?thread=384'}, {_id: 109, reg: 'VEN', prov: 'VI', descr: 'Vicenza', link_grp: 'https://t.me/c/1614195634/615?thread=605'}, {_id: 110, reg: 'LAZ', prov: 'VT', descr: 'Viterbo', link_grp: 'https://t.me/c/1614195634/76?thread=74'}, - {_id: 111, reg: 'RSM', prov: 'RSM', descr: 'Repubblica di San Marino', link_grp: ''}, + {_id: 111, reg: 'RSM', prov: 'RSM', descr: 'Repubblica di San Marino', link_grp: 'https://t.me/+HSdNurm0IXY1MGI0'}, {_id: 112, reg: 'EST', prov: 'EST', descr: 'Estero', link_grp: ''}, {_id: 113, reg: 'ONL', prov: 'ONL', descr: 'On Line', link_grp: ''}, {_id: 114, reg: 'LAZ', prov: 'RM', descr: 'Roma Nord-Est', link_grp: 'https://t.me/c/1614195634/64?thread=57'}, diff --git a/src/server/router/index_router.js b/src/server/router/index_router.js index c0ab74c..f956e0f 100755 --- a/src/server/router/index_router.js +++ b/src/server/router/index_router.js @@ -1122,12 +1122,11 @@ function load(req, res, version) { workers, internalpages, levels, - skills, + skills, //25 //subSkills, - myuserextra, - sectors, - statusSkills, - provinces, + myuserextra, // 26 + sectors, // 27 + statusSkills, //28 // cities, provinces, catgrps, diff --git a/src/server/router/users_router.js b/src/server/router/users_router.js index fa70412..bb7a29b 100755 --- a/src/server/router/users_router.js +++ b/src/server/router/users_router.js @@ -228,6 +228,10 @@ router.post('/', async (req, res) => { let recextra = null; const id_aportador = await User.getIdByUsername(user.idapp, user.aportador_solidario); + if (id_aportador) { + user.aportador_solidario = await User.getRealUsernameByUsername(user.idapp, user.aportador_solidario); + } + if (!id_aportador && tools.getAskToVerifyReg(body.idapp)) { // Si sta tentando di registrare una persona sotto che non corrisponde! diff --git a/src/server/telegram/telegrambot.js b/src/server/telegram/telegrambot.js index c94f1a9..859dfb5 100755 --- a/src/server/telegram/telegrambot.js +++ b/src/server/telegram/telegrambot.js @@ -804,8 +804,8 @@ const MyTelegramBot = { cl.setPhotoProfile(myuser, telegid, false); - const rismsg = await MsgTemplate.getMsgByLang(idapp, shared_consts.TypeMsgTemplate.MSG_BENVENUTO, myuser.lang); - const rismsg2 = await MsgTemplate.getMsgByLang(idapp, shared_consts.TypeMsgTemplate.MS_SHARE_LINK, myuser.lang); + const rismsg = await MsgTemplate.getMsgByLang(idapp, myuser, shared_consts.TypeMsgTemplate.MSG_BENVENUTO, myuser.lang); + const rismsg2 = await MsgTemplate.getMsgByLang(idapp, myuser, shared_consts.TypeMsgTemplate.MS_SHARE_LINK, myuser.lang); await cl.sendMsgLog(telegid, rismsg.body); await cl.sendMsg(telegid, rismsg2.body); @@ -927,7 +927,7 @@ const MyTelegramBot = { } msg += mydata.msgpar1; } else if (mydata.tipomsg >= 1000) { - const ris = await MsgTemplate.getMsgByLang(user.idapp, mydata.tipomsg, + const ris = await MsgTemplate.getMsgByLang(user.idapp, user, mydata.tipomsg, lang); msg = ris.body; title = ris.title; @@ -1086,7 +1086,7 @@ const MyTelegramBot = { } if (tipomsgtempl > 0) { - const rismsg = await MsgTemplate.getMsgByLang(idapp, tipomsgtempl, user.lang); + const rismsg = await MsgTemplate.getMsgByLang(idapp, user, tipomsgtempl, user.lang); params.content = rismsg.body; params.title = rismsg.title; } @@ -1398,8 +1398,10 @@ class Telegram { await this.sendMsgByTemplate('MSG_SET_USERNAME_OK', rec.user); - if (!rec.user.verified_by_aportador) { - MyTelegramBot.askConfirmationUser(this.idapp, shared_consts.CallFunz.REGISTRATION, rec.user); + if (rec.user) { + if (!rec.user.verified_by_aportador) { + MyTelegramBot.askConfirmationUser(this.idapp, shared_consts.CallFunz.REGISTRATION, rec.user); + } } } else {