From c9a2302dfbdc96e5e1f3472ea1a7fcb9cca6717b Mon Sep 17 00:00:00 2001 From: Paolo Arena Date: Sat, 8 Oct 2022 14:25:00 +0200 Subject: [PATCH] fix if another language (undefined) not work telegram msg. --- src/server/models/circuit.js | 6 ++++++ src/server/telegram/telegrambot.js | 2 +- src/server/tools/shared_nodejs.js | 5 +++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/server/models/circuit.js b/src/server/models/circuit.js index 5050e20..ff11a4b 100755 --- a/src/server/models/circuit.js +++ b/src/server/models/circuit.js @@ -178,6 +178,10 @@ const CircuitSchema = new Schema({ transactionsEnabled: { type: Boolean, }, + status: { + type: Number, + default: 0, + }, }); CircuitSchema.pre('save', async function(next) { @@ -235,6 +239,7 @@ CircuitSchema.statics.getWhatToShow = function(idapp, username) { fido_scoperto_default: 1, deperimento: 1, transactionsEnabled: 1, + status: 1, qta_max_default: 1, valuta_per_euro: 1, symbol: 1, @@ -307,6 +312,7 @@ CircuitSchema.statics.getWhatToShow_Unknown = function(idapp, username) { req_users: 1, refused_users: 1, transactionsEnabled: 1, + status: 1, 'mycities': 1, }; }; diff --git a/src/server/telegram/telegrambot.js b/src/server/telegram/telegrambot.js index 4b184df..60485e1 100755 --- a/src/server/telegram/telegrambot.js +++ b/src/server/telegram/telegrambot.js @@ -1364,7 +1364,7 @@ function getstr(lang, key, param1) { } } - if (mystr === '') + if (!mystr || mystr === '') mystr = txt[key]; if (!!param1) { diff --git a/src/server/tools/shared_nodejs.js b/src/server/tools/shared_nodejs.js index b4bca86..48a0480 100755 --- a/src/server/tools/shared_nodejs.js +++ b/src/server/tools/shared_nodejs.js @@ -494,4 +494,9 @@ module.exports = { } ], + CIRCUIT_STATUS: { + FASE1_CREAZIONE_GRUPPO: 0, + FASE2_MONETA_ABILITATA: 1, + }, + };