surya/freeplanet_serverside
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- corretto problema sulle Organizzazioni, non si correttamente chiedevano

Browse Source 
- DataInizio e DataFine: creare un componente che controlli la data inizio e fine...
This commit is contained in:
Surya Paolo
2025-10-11 19:51:59 +02:00
parent 3f7eda05cf
commit 610961d22c
4 changed files with 35 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
filelog.txt
View File

@@ -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:01: USER [surya1977]: ciao
Sab 11/10 ORE 18:15: 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

1
src/server/router/users_router.js
View File

@@ -357,6 +357,7 @@ router.post('/', async (req, res) => {
'', '',
'', '',
'', '',
'',
regexpire regexpire
); );

81
src/server/telegram/telegrambot.js
View File

@@ -830,6 +830,7 @@ const MyTelegramBot = {
userDest = '', userDest = '',
name = '', name = '',
groupid = '', groupid = '',
circuitId = '',
regexpire = '', regexpire = '',
groupname = '' groupname = ''
) { ) {
@@ -946,16 +947,11 @@ const MyTelegramBot = {
text: textentrato + '✅ Abilita fiducia a ' + groupname, text: textentrato + '✅ Abilita fiducia a ' + groupname,
callback_data: callback_data:
InlineConferma.RISPOSTA_SI + InlineConferma.RISPOSTA_SI +
myfunc + myfunc + tools.SEP +
tools.SEP + myuser.username + tools.SEP +
myuser.username + '' + tools.SEP +
tools.SEP + '' + tools.SEP +
'' + circuitId + tools.SEP +
tools.SEP +
'' +
tools.SEP +
groupid +
tools.SEP +
groupname, groupname,
}, },
/*{ /*{
@@ -977,15 +973,11 @@ const MyTelegramBot = {
text: '✅ Abilita fiducia a ' + myuser.username, text: '✅ Abilita fiducia a ' + myuser.username,
callback_data: callback_data:
InlineConferma.RISPOSTA_SI + InlineConferma.RISPOSTA_SI +
myfunc + myfunc + tools.SEP +
tools.SEP + myuser.username + tools.SEP +
myuser.username + '' + tools.SEP +
tools.SEP + '' + tools.SEP +
'' + circuitId + tools.SEP,
tools.SEP +
'' +
tools.SEP +
groupid,
}, },
/*{ /*{
text: '🚫 Rifiuta ' + myuser.username, text: '🚫 Rifiuta ' + myuser.username,
@@ -1008,16 +1000,11 @@ const MyTelegramBot = {
text: '✅ Fai entrare a ' + groupname, text: '✅ Fai entrare a ' + groupname,
callback_data: callback_data:
InlineConferma.RISPOSTA_SI + InlineConferma.RISPOSTA_SI +
myfunc + myfunc + tools.SEP +
tools.SEP + myuser.username + tools.SEP +
myuser.username + '' + tools.SEP +
tools.SEP + '' + tools.SEP +
'' + circuitId + tools.SEP +
tools.SEP +
'' +
tools.SEP +
groupid +
tools.SEP +
groupname, groupname,
}, },
/*{ /*{
@@ -1039,15 +1026,11 @@ const MyTelegramBot = {
text: '✅ Fai entrare a ' + myuser.username, text: '✅ Fai entrare a ' + myuser.username,
callback_data: callback_data:
InlineConferma.RISPOSTA_SI + InlineConferma.RISPOSTA_SI +
myfunc + myfunc + tools.SEP +
tools.SEP + myuser.username + tools.SEP +
myuser.username + '' + tools.SEP +
tools.SEP + '' + tools.SEP +
'' + circuitId,
tools.SEP +
'' +
tools.SEP +
groupid,
}, },
/*{ /*{
text: '🚫 Rifiuta ' + myuser.username, text: '🚫 Rifiuta ' + myuser.username,
@@ -4426,7 +4409,7 @@ if (true) {
action: dataarr[0], action: dataarr[0],
username: dataarr[1] ? dataarr[1] : '', username: dataarr[1] ? dataarr[1] : '',
userDest: dataarr[2] ? dataarr[2] : '', userDest: dataarr[2] ? dataarr[2] : '',
groupId: dataarr[3] ? parseInt(dataarr[3]) : '', groupId: dataarr[3] ? dataarr[3] : '',
circuitId: dataarr[4] ? dataarr[4] : '', circuitId: dataarr[4] ? dataarr[4] : '',
groupname: dataarr[5] ? dataarr[5] : '', groupname: dataarr[5] ? dataarr[5] : '',
}; };
@@ -4463,25 +4446,7 @@ if (true) {
if (!!rec) { if (!!rec) {
if (!!user) { if (!!user) {
if (data.action === InlineCmd.VOGLIO_IMBARCARMI) { if (data.action === InlineZoomConferma.CONFERMA_ZOOM_PRESENZA) {
// 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) {
await User.setZoomPresenza(user.idapp, user._id, true); await User.setZoomPresenza(user.idapp, user._id, true);
} else if (data.action === InlineZoomConferma.NON_CONFERMA_ZOOM_PRESENZA) { } else if (data.action === InlineZoomConferma.NON_CONFERMA_ZOOM_PRESENZA) {
await User.setZoomPresenza(user.idapp, user._id, false); await User.setZoomPresenza(user.idapp, user._id, false);

7
src/server/tools/general.js
View File

@@ -1136,7 +1136,9 @@ module.exports = {
myuserdata, myuserdata,
usernameDest, usernameDest,
groupname, groupname,
myrecgroup._id myrecgroup._id,
'',
'',
); );
onlysave = false; onlysave = false;
} else if (cmd === shared_consts.GROUPSCMD.BLOCK_USER) { } else if (cmd === shared_consts.GROUPSCMD.BLOCK_USER) {
@@ -1245,6 +1247,7 @@ module.exports = {
cmdrichiesta, cmdrichiesta,
myuserdata, myuserdata,
usernameDest, usernameDest,
'',
circuitname, circuitname,
myreccircuit._id, myreccircuit._id,
'', '',
@@ -1601,7 +1604,7 @@ module.exports = {
const groupOrig = ''; //++Todo: extrarec.groupOrig const groupOrig = ''; //++Todo: extrarec.groupOrig
let arradmins = this.getAdminsByCircuit(circuit); let arradmins = this.getAdminsByCircuit(circuit);
console.log('arradmins', arradmins); // console.log('arradmins', arradmins);
const mapByUsername = arradmins.reduce((map, item) => { const mapByUsername = arradmins.reduce((map, item) => {
map[item.username] = item; map[item.username] = item;