diff --git a/.env.development b/.env.development index 7c02111..7d444cb 100644 --- a/.env.development +++ b/.env.development @@ -11,12 +11,14 @@ AUTH_MONGODB=1 MONGODB_USER=admin MONGODB_PWD=mypwadmin@1A ENABLE_PUSHNOTIFICATION=1 +URLBASE_APP1=https://localhost +PORT_APP1=8080 SIGNCODE=SU2134hncaskjdbo231oihJSDNHEI$1@AB HTTPS_LOCALHOST=true DEBUG=0 +DEBUG=0 TESTING_ON=1 LOCALE=1 -PROD=0 DELAY_SENDEMAIL=2000 VAPI_KEY_SUBJECT=mailto:paolo@freeplanet.app PUBLIC_VAPI_KEY=BDncvMiUZmjaCG2Kr1V9N0_33hOG-AuNSbHSvL24y2dzBiUjAxKm02emx5SeJvz2IGmtRf6YqCgopeQwCwUmZw8 @@ -26,6 +28,7 @@ PATH_SERVER_CRT=localhost.crt PATH_SSL_ROOT_PEM=root.pem PATH_SSL_CHAIN_PEM=chain.pem GCM_API_KEY="" +PROD=0 PROJECT_DESCR_MAIN='__PROJECTS' SECRK=Askb38v23jjDFaoskBOWj92axXCQ SECRTK=prova123prova567ASDADASDAS @@ -36,9 +39,5 @@ FTPSERVER_PORT=21 FTPSERVER_USER=ftpusrsrv_ FTPSERVER_PWD=ftpmypwd@1A_ AUTH_NEW_SITES=123123123 -DOMAINS=[{"hostname":"riso.app","port":"3000"}] SCRIPTS_DIR=admin_scripts -CLOUDFLARE_TOKENS=[{"label":"Paolo.arena77@gmail.com","value":"M9EM309v8WFquJKpYgZCw-TViM2wX6vB3wlK6GD0"},{"label":"gruppomacro.com","value":"bqmzGShoX7WqOBzkXocoECyBkPq3GfqcM5t6VFd8"}] -MIAB_HOST=box.lamiaposta.org -MIAB_ADMIN_EMAIL=admin@lamiaposta.org -MIAB_ADMIN_PASSWORD=passpao1pabox@1A \ No newline at end of file +CLOUDFLARE_TOKENS=[{"label":"Paolo.arena77@gmail.com","value":"M9EM309v8WFquJKpYgZCw-TViM2wX6vB3wlK6GD0"},{"label":"gruppomacro.com","value":"bqmzGShoX7WqOBzkXocoECyBkPq3GfqcM5t6VFd8"}] \ No newline at end of file diff --git a/src/server/tools/general.js b/src/server/tools/general.js index a4e5352..4e15943 100755 --- a/src/server/tools/general.js +++ b/src/server/tools/general.js @@ -4735,26 +4735,6 @@ module.exports = { } }, - convertHTMLTagsForTelegram(text) { - const htmlTagsMap = { - '': '', - '': '', - '': '', - '': '', - '': '', - }; - - // Sostituzione dei tag HTML con quelli Markdown supportati da Telegram - let convertedText = text; - for (const htmlTag in htmlTagsMap) { - const regex = new RegExp(htmlTag, 'g'); - convertedText = convertedText.replace(regex, htmlTagsMap[htmlTag]); - } - - return convertedText; - }, - removeFontTags(text) { // Rimozione dei tag e dalla stringa di testo const regex = /]*>|<\/font>/gi; @@ -5042,22 +5022,92 @@ module.exports = { } }, - convertHTMLTagsToText(input) { + convertAndTruncateHTMLForTelegram(text, maxLength = 200, link = '') { const tagMap = { - "": "", - "": "", - "": "" + "": "", "": "", "": "", + "
": "\n", "
": "", "
": "\n" }; - // Replace supported HTML tags with their corresponding text representations - let output = input.replace(/