diff --git a/filelog.txt b/filelog.txt index a756e79..18f0c03 100644 --- a/filelog.txt +++ b/filelog.txt @@ -28,3 +28,9 @@ Sab 11/10 ORE 17:30: USER [surya1977]: ciao Sab 11/10 ORE 18:01: USER [surya1977]: ciao Sab 11/10 ORE 18:15: USER [surya1977]: ciao + +Sab 11/10 ORE 19:05: USER [surya1977]: ciao + +Sab 11/10 ORE 19:36: USER [surya1977]: ciao + +Sab 11/10 ORE 19:38: USER [surya1977]: ciao diff --git a/src/server/router/users_router.js b/src/server/router/users_router.js index 990f915..a0486de 100755 --- a/src/server/router/users_router.js +++ b/src/server/router/users_router.js @@ -357,6 +357,7 @@ router.post('/', async (req, res) => { '', '', '', + '', regexpire ); diff --git a/src/server/telegram/telegrambot.js b/src/server/telegram/telegrambot.js index a9ac7b6..d8fc1ac 100755 --- a/src/server/telegram/telegrambot.js +++ b/src/server/telegram/telegrambot.js @@ -830,6 +830,7 @@ const MyTelegramBot = { userDest = '', name = '', groupid = '', + circuitId = '', regexpire = '', groupname = '' ) { @@ -946,16 +947,11 @@ const MyTelegramBot = { text: textentrato + 'โœ… Abilita fiducia a ' + groupname, callback_data: InlineConferma.RISPOSTA_SI + - myfunc + - tools.SEP + - myuser.username + - tools.SEP + - '' + - tools.SEP + - '' + - tools.SEP + - groupid + - tools.SEP + + myfunc + tools.SEP + + myuser.username + tools.SEP + + '' + tools.SEP + + '' + tools.SEP + + circuitId + tools.SEP + groupname, }, /*{ @@ -977,15 +973,11 @@ const MyTelegramBot = { text: 'โœ… Abilita fiducia a ' + myuser.username, callback_data: InlineConferma.RISPOSTA_SI + - myfunc + - tools.SEP + - myuser.username + - tools.SEP + - '' + - tools.SEP + - '' + - tools.SEP + - groupid, + myfunc + tools.SEP + + myuser.username + tools.SEP + + '' + tools.SEP + + '' + tools.SEP + + circuitId + tools.SEP, }, /*{ text: '๐Ÿšซ Rifiuta ' + myuser.username, @@ -1008,16 +1000,11 @@ const MyTelegramBot = { text: 'โœ… Fai entrare a ' + groupname, callback_data: InlineConferma.RISPOSTA_SI + - myfunc + - tools.SEP + - myuser.username + - tools.SEP + - '' + - tools.SEP + - '' + - tools.SEP + - groupid + - tools.SEP + + myfunc + tools.SEP + + myuser.username + tools.SEP + + '' + tools.SEP + + '' + tools.SEP + + circuitId + tools.SEP + groupname, }, /*{ @@ -1039,15 +1026,11 @@ const MyTelegramBot = { text: 'โœ… Fai entrare a ' + myuser.username, callback_data: InlineConferma.RISPOSTA_SI + - myfunc + - tools.SEP + - myuser.username + - tools.SEP + - '' + - tools.SEP + - '' + - tools.SEP + - groupid, + myfunc + tools.SEP + + myuser.username + tools.SEP + + '' + tools.SEP + + '' + tools.SEP + + circuitId, }, /*{ text: '๐Ÿšซ Rifiuta ' + myuser.username, @@ -4426,7 +4409,7 @@ if (true) { action: dataarr[0], username: dataarr[1] ? dataarr[1] : '', userDest: dataarr[2] ? dataarr[2] : '', - groupId: dataarr[3] ? parseInt(dataarr[3]) : '', + groupId: dataarr[3] ? dataarr[3] : '', circuitId: dataarr[4] ? dataarr[4] : '', groupname: dataarr[5] ? dataarr[5] : '', }; @@ -4463,25 +4446,7 @@ if (true) { if (!!rec) { if (!!user) { - if (data.action === InlineCmd.VOGLIO_IMBARCARMI) { - // Controlla se รจ qualificato! - const mydata = tools.AddDate(user.date_reg, 7); - - // bot.editMessageText(tools.gettranslate('ADDED_TOLISTAINGRESSO', user.lang), opts); - } else if (data.action === InlineCmd.NON_VOGLIO_IMBARCARMI) { - await User.NonVoglioImbarcarmi(user.idapp, user.username); - - const msgadd = - '[' + - user.username + - '] ' + - user.name + - ' ' + - user.surname + - ' ha risposto che NON VUOLE IMBARCARSI !'; - - await local_sendMsgTelegramToTheManagers(user.idapp, msgadd, msg, false); // Anche a STAFF - } else if (data.action === InlineZoomConferma.CONFERMA_ZOOM_PRESENZA) { + if (data.action === InlineZoomConferma.CONFERMA_ZOOM_PRESENZA) { await User.setZoomPresenza(user.idapp, user._id, true); } else if (data.action === InlineZoomConferma.NON_CONFERMA_ZOOM_PRESENZA) { await User.setZoomPresenza(user.idapp, user._id, false); diff --git a/src/server/tools/general.js b/src/server/tools/general.js index 725ad7d..324a53c 100755 --- a/src/server/tools/general.js +++ b/src/server/tools/general.js @@ -1136,7 +1136,9 @@ module.exports = { myuserdata, usernameDest, groupname, - myrecgroup._id + myrecgroup._id, + '', + '', ); onlysave = false; } else if (cmd === shared_consts.GROUPSCMD.BLOCK_USER) { @@ -1245,6 +1247,7 @@ module.exports = { cmdrichiesta, myuserdata, usernameDest, + '', circuitname, myreccircuit._id, '', @@ -1601,7 +1604,7 @@ module.exports = { const groupOrig = ''; //++Todo: extrarec.groupOrig let arradmins = this.getAdminsByCircuit(circuit); - console.log('arradmins', arradmins); + // console.log('arradmins', arradmins); const mapByUsername = arradmins.reduce((map, item) => { map[item.username] = item;