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

aggiornamento...

Browse Source
This commit is contained in:
Surya Paolo
2023-12-17 19:19:04 +01:00
parent c71f4af370
commit 50d610b1b1
5 changed files with 195 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -707,10 +707,20 @@ const MyTelegramBot = {
getAppTelegram: function () {
if (process.env.appTelegram) {
return JSON.parse(process.env.appTelegram);
arrTeleg = JSON.parse(process.env.appTelegram);
} else {
return appTelegram;
arrTeleg = appTelegram;
}
if (process.env.NODE_ENV === 'development')
arrTeleg = appTelegram_DEVELOP;
else if (process.env.NODE_ENV === 'test')
arrTeleg = MyTelegramBot.getAppTelegramTest();
const arrTelegFromSite = tools.getArrTelegramFromSite();
if (arrTelegFromSite.length > 0) {
arrTeleg = arrTelegFromSite;
}
return arrTeleg;
},
@@ -3437,14 +3447,14 @@ class Telegram {
if (!msg.from.username) {
// Non ha l'Username:
// Chiedi l'username sul Bot:
if (tools.getConfSiteOptionEnabledByIdApp(this.idapp, shared_consts.ConfSite.AskUsernameSulBot)) {
rec.status = Status.WAITFOR_USERNAME_TELEGRAM;
}
} else {
// Ha l'Username
// Chiedi l'invitante ?
if (tools.getConfSiteOptionEnabledByIdApp(this.idapp, shared_consts.ConfSite.AskInvitantesulBot)) {
rec.status = Status.WAITFOR_USERNAME_INVITANTE;
@@ -4072,15 +4082,6 @@ function getclTelegByidapp(idapp) {
//if (!tools.testing() || true) {
if (true) {
let arrTeleg = MyTelegramBot.getAppTelegram();
if (process.env.NODE_ENV === 'development')
arrTeleg = appTelegram_DEVELOP;
else if (process.env.NODE_ENV === 'test')
arrTeleg = MyTelegramBot.getAppTelegramTest();
const arrTelegFromSite = tools.getArrTelegramFromSite();
if (arrTelegFromSite.length > 0) {
arrTeleg = arrTelegFromSite;
}
var internetAvailable = require('internet-available');