diff --git a/prova111 b/prova111 new file mode 100644 index 0000000..e69de29 diff --git a/src/server/config/config.js b/src/server/config/config.js index 48046b8..efa9e0c 100755 --- a/src/server/config/config.js +++ b/src/server/config/config.js @@ -2,6 +2,8 @@ const tools = require('../tools/general'); // still in app.js const node_env = process.env.NODE_ENV || 'production'; +console.log('node_env=', node_env); + var file = `.env.${node_env}`; @@ -18,7 +20,10 @@ require('dotenv').config({ path: file }); process.env.DATABASE = process.env.DATABASE || 'FreePlanet'; +console.log('process.env.DOMAIN:', process.env.DOMAIN); process.env.MONGODB_URI = process.env.DOMAIN + process.env.DATABASE; +console.log('process.env.MONGODB_URI:', process.env.MONGODB_URI); + /* diff --git a/src/server/locales/it.json b/src/server/locales/it.json index 6fbc594..05050b0 100644 --- a/src/server/locales/it.json +++ b/src/server/locales/it.json @@ -20,7 +20,7 @@ "โœ… You have accepted %s' Friendship request!": "โœ… Hai accettato la richiesta di Amicizia di %s !", "HANDSHAKE_SET": "%s ha comunicato che ti conosce personalmente e ha fiducia in te.", "HANDSHAKE_CONFIRMED": "๐Ÿค Hai contraccambiato la fiducia in %s!", - "HANDSHAKE_ACCEPTED": "๐Ÿค %s ha contraccambiato la fiducia in te !", + "HANDSHAKE_ACCEPTED": "๐Ÿค %s ha contraccambiato la stretta di mano (fiducia) !", "GROUPS_ACCEPTED": "โœ… Sei stato accettato a far parte del Gruppo %s (da parte di %s)", "GROUPS_REFUSED": "โŒ Ti รจ stato rifiutato l'accesso da %s a far parte del Gruppo %s. Se pensi sia un'errore, contatta l'amministratore del Gruppo.", "GROUPS_REMOVED": "โŒ l'utente %s รจ stato rimosso del Gruppo %s (da parte di %s)", diff --git a/src/server/models/site.js b/src/server/models/site.js index 70b2774..4aff25c 100755 --- a/src/server/models/site.js +++ b/src/server/models/site.js @@ -232,7 +232,7 @@ module.exports.findAllIdApp = async function (idapp) { rec.email_pwd = ''; rec.telegram_key = ''; rec.telegram_key_test = ''; - rec.confsite = {}; + // rec.confsite = {}; return rec; } diff --git a/src/server/models/user.js b/src/server/models/user.js index 208ce86..16bb76c 100755 --- a/src/server/models/user.js +++ b/src/server/models/user.js @@ -2158,8 +2158,14 @@ UserSchema.statics.setFriendsCmd = async function (req, idapp, usernameOrig, use if (!disablenotif) { const userDest = await User.getRecLangAndIdByUsername(idapp, usernameDest); const user = await User.getRecLangAndIdByUsername(idapp, usernameOrig); + const already_stretta = await User.isMyHandShake(idapp, usernameDest, usernameOrig); const msgDest = i18n.__({ phrase: 'HANDSHAKE_CONFIRMED', locale: userDest.lang }, usernameDest); - const msgOrig = i18n.__({ phrase: 'HANDSHAKE_ACCEPTED', locale: user.lang }, usernameOrig); + let phrase = 'HANDSHAKE_SET'; + if (already_stretta) { + phrase = 'HANDSHAKE_ACCEPTED'; + } + + const msgOrig = i18n.__({ phrase, locale: user.lang }, usernameOrig); await telegrambot.sendMsgTelegram(idapp, usernameOrig, msgDest); await telegrambot.sendMsgTelegram(idapp, usernameDest, msgOrig); @@ -3953,7 +3959,7 @@ UserSchema.statics.getUsersDreams = async function (idapp) { UserSchema.statics.getLastUsers = async function (idapp) { const User = this; - const lastn = await Settings.getValDbSettings(idapp, 'SHOW_LAST_N_USERS', 5); + const lastn = await Settings.getValDbSettings(idapp, 'SHOW_LAST_N_USERS', 10); return await User.find( { @@ -3981,7 +3987,7 @@ UserSchema.statics.getLastUsers = async function (idapp) { UserSchema.statics.getLastOnlineUsers = async function (idapp) { const User = this; - const lastn = await Settings.getValDbSettings(idapp, 'SHOW_LAST_ONLINE_USERS', 10); + const lastn = await Settings.getValDbSettings(idapp, 'SHOW_LAST_ONLINE_USERS', 20); return await User.find( { @@ -4523,7 +4529,7 @@ UserSchema.statics.calcnumRegUntilDay = async function (idapp) { UserSchema.statics.calcRegDaily = async function (idapp) { const User = this; - return await User.aggregate(User.getUsersRegDaily(idapp, 60)).then(ris => { + return await User.aggregate(User.getUsersRegDaily(idapp, 90)).then(ris => { // console.table(ris); return ris; }); diff --git a/src/server/router/index_router.js b/src/server/router/index_router.js index 8aed090..1bc2d12 100755 --- a/src/server/router/index_router.js +++ b/src/server/router/index_router.js @@ -614,7 +614,7 @@ router.post('/gettable', authenticate, (req, res) => { const params = req.body; let idapp = req.user ? req.user.idapp : params.idapp; const mytable = globalTables.getTableByTableName(params.table); - // console.log('mytable', mytable); + //console.log('mytable', mytable); if (!mytable) { console.log(`Table ${params.table} not found`); return res.status(400).send({}); @@ -628,6 +628,7 @@ router.post('/gettable', authenticate, (req, res) => { return mytable.executeQueryTable(idapp, params, req.user).then(ris => { + // console.log('ris=', ris); return res.send(ris); }).catch((e) => { diff --git a/src/server/telegram/telegrambot.js b/src/server/telegram/telegrambot.js index a0f391f..980a013 100755 --- a/src/server/telegram/telegrambot.js +++ b/src/server/telegram/telegrambot.js @@ -3,8 +3,8 @@ const tools = require('../tools/general'); const appTelegram = [tools.FREEPLANET, tools.RISO]; const appTelegram_TEST = [tools.FREEPLANET, tools.RISO]; -// const appTelegram_DEVELOP = [tools.RISO]; -const appTelegram_DEVELOP = [tools.FIOREDELLAVITA]; +const appTelegram_DEVELOP = [tools.RISO]; +// const appTelegram_DEVELOP = [tools.FIOREDELLAVITA]; const appTelegramFinti = ['2', tools.CNM]; const appTelegramDest = [tools.FREEPLANET, tools.FREEPLANET]; diff --git a/src/server/tools/general.js b/src/server/tools/general.js index 1685098..f33bc7d 100755 --- a/src/server/tools/general.js +++ b/src/server/tools/general.js @@ -2941,8 +2941,9 @@ module.exports = { ); if (this.testing()) { - // console.log('query', query); + console.log('query', query); } + // console.log('query', query); return query;