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

Modifiche prima di Luglio...

Browse Source
This commit is contained in:
Surya Paolo
2023-08-27 23:55:31 +02:00
parent ba81a33c88
commit ad6b4c2bfa
21 changed files with 1747 additions and 2251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1082,7 +1082,7 @@ module.exports = {
let typeid = 0;
let onlysave = false;
let numuserincircuit = await User.countUsersInCircuit(idapp, circuitname);
const mycircuit = await Circuit.findOne({name: circuitname}).lean();
const mycircuit = await Circuit.findOne({ name: circuitname }).lean();
if (mycircuit) {
extrarec.fido_scoperto_default = mycircuit.fido_scoperto_default;
extrarec.fido_scoperto_default_grp = mycircuit.fido_scoperto_default_grp;
@@ -1433,26 +1433,37 @@ module.exports = {
},
*/
sendNotifToAdmin(title, msg, tag = '') {
const { User } = require('../models/user');
sendNotifToAdmin(idapp, alsotelegram, title, msg, tag = '') {
try {
const { User } = require('../models/user');
// console.log('nomeapp 1: ' , this.getNomeAppByIdApp(1));
// console.log('nomeapp 2: ' , this.getNomeAppByIdApp(2));
const queryadmins = { username: 'paoloar77', idapp };
User.find({ username: 'paoloar77', idapp: '1' }).then(async (arrusers) => {
if (arrusers !== null) {
for (const user of arrusers) {
await this.sendNotificationToUser(user._id, title, msg, '/', '', tag, []).
then(ris => {
if (ris) {
if (idapp === 0)
idapp = '13';
} else {
// already sent the error on calling sendNotificationToUser
}
});
User.find(queryadmins).then(async (arrusers) => {
if (arrusers !== null) {
for (const user of arrusers) {
if (alsotelegram) {
this.sendMsgTelegramToAdmin(idapp, title + ' ' + msg);
}
await this.sendNotificationToUser(user._id, title, msg, '/', '', tag, []).
then(ris => {
if (ris) {
} else {
// already sent the error on calling sendNotificationToUser
}
});
}
}
}
});
});
} catch (e) {
console.error(e);
}
},
@@ -4063,10 +4074,15 @@ module.exports = {
let myhost = this.getHostByIdApp(params.idapp);
if (params.textaddTelegram) {
if (params.openUrl)
content = content + '\n' + '<a href="' + myhost + params.openUrl + '">' + params.textaddTelegram + '</a>';
content = content + '\n' + params.textaddTelegram;
}
if (params.linkaddTelegram) {
if (params.openUrl)
content = content + '\n' + '<a href="' + myhost + params.openUrl + '">' + params.linkaddTelegram + '</a>';
}
/*if (params.openUrl)
content = content + '\n' + '<a href="' + myhost + params.openUrl + '">' + i18n.__('OPEN PAGE') + '</a>';