From b0e00161764fff177a6527e7718d629694c91e8a Mon Sep 17 00:00:00 2001 From: root Date: Wed, 28 Oct 2020 06:35:02 -0700 Subject: [PATCH 1/4] =?UTF-8?q?Corrigidos=20problemas=20com=20vari=C3=A1ve?= =?UTF-8?q?is=20de=20ambiente?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yml | 4 ++-- src/app.js | 3 ++- src/helpers/general.js | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 174053b..79d6920 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,7 +7,7 @@ services: dockerfile: Dockerfile restart: always env_file: - - .docker.env + - .env volumes: - /usr/share/nginx/html/media/:/usr/src/app/Media - /usr/share/nginx/html/msgs/:/usr/src/app/Received_msgs @@ -22,7 +22,7 @@ services: env_file: - .env volumes: - - /root/bot-e-everdade/data/:/data/db + - /root/bot-e-verdade/data/:/data/db mongo-express: diff --git a/src/app.js b/src/app.js index 871ba81..54fdb7b 100644 --- a/src/app.js +++ b/src/app.js @@ -1,5 +1,6 @@ // import { create, Whatsapp } from '@open-wa/wa-automate'; -require('dotenv').config() +const path = require('path') +require('dotenv').config({path: path.join(__dirname, "../.env")}) require('./helpers/general') const wa = require('@open-wa/wa-automate'); // var CronJob = require('cron').CronJob; diff --git a/src/helpers/general.js b/src/helpers/general.js index 20814f3..4970363 100644 --- a/src/helpers/general.js +++ b/src/helpers/general.js @@ -1,4 +1,4 @@ -exports.__version__ = '0.3.0'; +exports.__version__ = '0.3.1'; String.prototype.format = function() { let a = this; From 8096d22f92df7fd89d9357478145ae41d7679334 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 28 Oct 2020 06:39:06 -0700 Subject: [PATCH 2/4] Added default tags for unsuported file formats --- src/controllers/gcProcessing.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/controllers/gcProcessing.js b/src/controllers/gcProcessing.js index b6171cb..3450dfe 100644 --- a/src/controllers/gcProcessing.js +++ b/src/controllers/gcProcessing.js @@ -168,10 +168,9 @@ exports.getMediaInfo = async (md5, mimetype, dirpath = './Media') =>{ } else{ logger.error(`Could not extrat text and tags from "${md5}.${mime.extension(mimetype)}"`) - return [null, null]; - // return ['No text extracted: format not supported', {name:'unsuported_format', salience: 10, tagType:'OTHER'}]; + return ['No text extracted: format not supported', {name:'unsuported_format', salience: 10, tagType:'OTHER'}]; } logger.info(`Text and tags extracted from "${md5}.${mime.extension(mimetype)}"`) return [text, tags]; -} \ No newline at end of file +} From b6c1f89e9a86849eaddef4356f750872464a386b Mon Sep 17 00:00:00 2001 From: root Date: Wed, 28 Oct 2020 06:40:45 -0700 Subject: [PATCH 3/4] Fixed issue when receiving not forwarded messages --- src/controllers/messages.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/controllers/messages.js b/src/controllers/messages.js index 7bedfa5..505a3f2 100644 --- a/src/controllers/messages.js +++ b/src/controllers/messages.js @@ -320,6 +320,10 @@ exports.matchMessages = async(messageDocs, createIfNull) => { exports.processCommands = async(message,client) => { if (message.mimetype) return; + if (!message.content.includes('#')){ + await sendersController.notifyOnlyForwarded(message.sender.id, client); + return; + } let command = message.content.match(/#{0,1}\w+/)[0].toLowerCase() if (msgsTexts.commands.UNSUBSCRIBE_CMD.includes(command)){ @@ -364,8 +368,5 @@ exports.processCommands = async(message,client) => { const devController = require('./development'); devController.saveDb() } - else{ - await sendersController.notifyOnlyForwarded(message.sender.id, client); - } -} \ No newline at end of file +} From 78ec9e59fbd071369e5f265e7072c1d35849fff4 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 28 Oct 2020 06:43:23 -0700 Subject: [PATCH 4/4] Fixed .env.samply syntax --- .env.sample | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.env.sample b/.env.sample index a709d89..310a626 100644 --- a/.env.sample +++ b/.env.sample @@ -29,12 +29,12 @@ TEST_WA_GROUP3_ID=XXXXXXXXXXXX-1595541082@g.us TEST_BUFFER_DELAY1=1000 TEST_BUFFER_DELAY2=1000 -MONGO_INITDB_ROOT_USERNAME: user -MONGO_INITDB_ROOT_PASSWORD: superscret -MONGO_INITDB_DB_ADDRES: mongo:27017 -DB_NAME: EVerdade +MONGO_INITDB_ROOT_USERNAM=user +MONGO_INITDB_ROOT_PASSWORD=superscret +MONGO_INITDB_DB_ADDRES=mongo:27017 +DB_NAME=EVerdade -ME_CONFIG_MONGODB_ADMINUSERNAME: user -ME_CONFIG_MONGODB_ADMINPASSWORD: superscret -ME_CONFIG_BASICAUTH_USERNAME: user -ME_CONFIG_BASICAUTH_PASSWORD: superscretsecret \ No newline at end of file +ME_CONFIG_MONGODB_ADMINUSERNAME=user +ME_CONFIG_MONGODB_ADMINPASSWORD=superscret +ME_CONFIG_BASICAUTH_USERNAME=user +ME_CONFIG_BASICAUTH_PASSWORD=superscretsecret