Create config.yml

Create CODE_OF_CONDUCT.md

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+patreon: leifermendez
+custom: "https://www.buymeacoffee.com/leifermendez"

.github/ISSUE_TEMPLATE/bug.yml

@@ -0,0 +1,58 @@
+name:  🐛 Reporte Bug
+description: Algo no va bien?. Hazlo saber
+labels: [bug, triage]
+title: '[🐛]'
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Gracias por tomarte el tiempo de reportar este problema
+        
+  - type: dropdown
+    id: version
+    attributes:
+      label: ¿Que versión estas usando?
+      description: '__INFO:__ Recuerda que puedes consultar dudas directamente en [discord](https://link.codigoencasa.com/DISCORD)'
+      options:
+        - v2
+        - v1
+    validations:
+      required: true
+
+  - type: dropdown
+    id: component
+    attributes:
+      label: ¿Sobre que afecta?
+      options:
+        - Flujo de palabras (Flow)
+        - DialogFlow
+        - Base de datos
+        - Otro
+    validations:
+      required: true
+
+  - type: textarea
+    id: description
+    attributes:
+      description: 'Trata de ser lo más claro posible, de esa manera podemos entender el contexto de tu problema y darte una mejor solución'
+      label: Describe tu problema
+      placeholder: Yo tengo un problema....
+
+    validations:
+      required: true
+
+  - type: input
+    id: reproduction
+    attributes:
+      label: Reproducir error
+      description: __(Recomendación)__ trata de grabar un video puedes usar algunas de las siguientes herramientas [https://www.vidyard.com/](https://www.vidyard.com/) [https://www.loom.com/](https://www.loom.com/) y en lo posbile apoyate en [https://stackblitz.com/](https://stackblitz.com/) para compartir el código de ser necesario
+      placeholder: URL video o stackblitz
+    validations:
+      required: false
+
+  - type: textarea
+    id: additional_information
+    attributes:
+      label: Información Adicional
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,4 @@
+contact_links:
+  - name: 🤔 Core Team
+    url: https://link.codigoencasa.com/DISCORD
+    about: Si quieres formar parte del CoreTeam, patrocinar el proyecto o propuesta profesionales

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,23 @@
+# Cual version del BOT es?
+
+- [ ] v2
+- [ ] v1
+
+
+# Que tipo de ISSUE es?
+
+- [ ] Mejoras
+- [ ] Bug
+- [ ] Docs / tests
+
+# Description
+
+Por favor agrega una descripción de tu problema para tener más contexto y poder ayudar más rápido. Si es de ayuda puedes usar plataformar como [https://www.loom.com/](https://www.loom.com/) para grabar un video.
+
+
+> Forma parte de este proyecto.
+
+-   [Discord](https://link.codigoencasa.com/DISCORD)
+-   [Twitter](https://twitter.com/leifermendez)
+-   [Youtube](https://www.youtube.com/watch?v=5lEMCeWEJ8o&list=PL_WGMLcL4jzWPhdhcUyhbFU6bC0oJd2BR)
+-   [Telegram](https://t.me/leifermendez)

CODE_OF_CONDUCT.md

@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+leifer.contacto@gmail.com.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.

LICENSE.md

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2022 Leifer Mendez
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,27 +1,4 @@
 ## Chatbot Whatsapp (OpenSource)
-#### Actualizado Abril 2022
-
-El siguiente proyecto se realizó con fines educativos para el canal de [Youtube (Leifer Mendez)](https://www.youtube.com/channel/UCgrIGp5QAnC0J8LfNJxDRDw?sub_confirmation=1) donde aprendemos a crear y implementar un chatbot increíble usando [node.js](https://codigoencasa.com/tag/nodejs/) además le agregamos inteligencia artificial gracias al servicio de __dialogflow__.
-
-[![Video](https://i.giphy.com/media/OBDi3CXC83WkNeLEZP/giphy.webp)](https://youtu.be/5lEMCeWEJ8o) 
-
-### ATENCION 🔴
-> 💥💥 Si te aparece el Error Multi-device es porque tienes la cuenta de whatsapp afiliada al modo "BETA de Multi dispositivo" por el momento no se tiene soporte para esas personas si tu quieres hacer uso de este __BOT__ debes de salir del modo BETA y intentarlo de la manera tradicional
-
-> El core de whatsapp esta en constante actualizaciones por lo cual siempre revisa la ultima fecha de la actualizacion 
-> [VER](https://github.com/leifermendez/bot-whatsapp/commits/main)
-
-### Busco colaboradores ⭐
-Hola amigos me gusta mucho este proyecto pero por cuestiones de tiempo se me dificulta mantener las actualizaciones si alguno quieres participar en el proyecto escribeme a leifer.contacto@gmail.com
-
-#### Acceso rápido 
-> Si tienes una cuenta en __heroku__ puedes desplegar este proyecto con (1 click)
-
-[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/leifermendez/bot-whatsapp) 
-
-> Comprarme un cafe!
-
-[![Comprar](https://www.buymeacoffee.com/assets/img/custom_images/orange_img.png)](https://www.buymeacoffee.com/leifermendez)
 
 #### Actualización
 
@@ -81,7 +58,6 @@ await sendMediaVoiceNote(client, from, 'PTT-20220223-WA0000.opus')
 
 ## Instruciones
 __Descargar o Clonar repositorio__
-![](https://i.imgur.com/dSpUbFz.png)
 
 __Usas ¿Ubuntu / Linux?__
 > Asegurate de instalar los siguientes paquetes
@@ -93,9 +69,9 @@ sudo apt install -y gconf-service libasound2 libatk1.0-0 libc6 libcairo2 libcups
 __Instalar dependencias (npm install)__
 > Ubicate en le directorio que descargaste y via consola o terminal ejecuta el siguiente comando
 
-`npm install` 
-
-![](https://i.imgur.com/BJuMjGR.png)
+```
+npm i
+``` 
 
 __Configurar .env__
 > Con el editor de texto crea un archivo `.env` el cual debes de guiarte del archivo `.env.example`
@@ -114,21 +90,14 @@ SQL_PASS=
 SQL_DATABASE=
 ```
 
-![](https://i.imgur.com/9poNnW0.png)
-
 __Ejecutar el script__
 > Ubicate en le directorio que descargaste y via consola o terminal ejecuta el siguiente comando
 `npm run start`
 
-![](https://i.imgur.com/eMkBkuJ.png)
-
 __Whatsapp en tu celular__
 > Ahora abre la aplicación de Whatsapp en tu dispositivo y escanea el código QR
 <img src="https://i.imgur.com/RSbPtat.png" width="500"  />
-Visitar la pagina 
-`http://localhost:3000/qr` 
-
-![](https://i.imgur.com/Q3JEDlP.png)
+Tambien puedes visitar la pagina http://127.0.0.1:3000/qr
 
 __Listo 😎__
 > Cuando sale este mensaje tu BOT está __listo__ para trabajar!
@@ -145,11 +114,3 @@ __Listo 😎__
 
 > Ahora deberías  obtener un arespuesta por parte del BOT como la siguiente, ademas de esto tambien se crea un archivo excel
 con el historial de conversación  con el número de tu cliente
-
-![](https://i.imgur.com/lrMLgR8.png)
-![](https://i.imgur.com/UYcoUSV.png)
-
-## Preguntar al BOT
-> Puedes interactuar con el bot ejemplo escribele __hola__ y el bot debe responderte!
-
-![](https://i.imgur.com/cNAS51I.png)

adapter/diaglogflow.js

@@ -1,6 +1,6 @@
 const dialogflow = require('@google-cloud/dialogflow');
 const fs = require('fs')
-const crypto = require('crypto');
+
 /**
  * Debes de tener tu archivo con el nombre "chatbot-account.json" en la raíz del proyecto
  */
@@ -30,9 +30,9 @@ const checkFileCredentials = () => {
 
 
 // Detect intent method
-const detectIntent = async (queryText) => {
+const detectIntent = async (queryText, waPhoneNumber) => {
     let media = null;
-    const sessionId = KEEP_DIALOG_FLOW ? 1 : crypto.randomUUID();
+    const sessionId = KEEP_DIALOG_FLOW ? 1 : waPhoneNumber;
     const sessionPath = sessionClient.projectAgentSessionPath(PROJECID, sessionId);
     const languageCode = process.env.LANGUAGE
     const request = {
@@ -56,7 +56,7 @@ const detectIntent = async (queryText) => {
         const { fields } = parsePayload.payload
         media = fields.media.stringValue || null
     }
-    const customPayload = parsePayload['payload']
+    const customPayload = parsePayload ? parsePayload['payload'] : null
 
     const parseData = {
         replyMessage: queryResult.fulfillmentText,
@@ -66,12 +66,12 @@ const detectIntent = async (queryText) => {
     return parseData
 }
 
-const getDataIa = (message = '', cb = () => { }) => {
-    detectIntent(message).then((res) => {
+const getDataIa = (message = '', sessionId = '', cb = () => { }) => {
+    detectIntent(message, sessionId).then((res) => {
         cb(res)
     })
 }
 
 checkFileCredentials();
 
-module.exports = { getDataIa }
+module.exports = { getDataIa }

adapter/index.js

@@ -52,13 +52,13 @@ const reply = (step) => new Promise((resolve, reject) => {
     }
 })
 
-const getIA = (message) => new Promise((resolve, reject) => {
+const getIA = (message, sessionId) => new Promise((resolve, reject) => {
     /**
      * Si usas dialogflow
      */
      if (process.env.DATABASE === 'dialogflow') {
         let resData = { replyMessage: '', media: null, trigger: null }
-        getDataIa(message,(dt) => {
+        getDataIa(message, sessionId, (dt) => {
             resData = { ...resData, ...dt }
             resolve(resData)
         })

app.js

@@ -6,7 +6,7 @@ const fs = require('fs');
 const express = require('express');
 const cors = require('cors')
 const qrcode = require('qrcode-terminal');
-const { Client,LocalAuth  } = require('whatsapp-web.js');
+const { Client, LocalAuth } = require('whatsapp-web.js');
 const mysqlConnection = require('./config/mysql')
 const { middlewareClient } = require('./middleware/client')
 const { generateImage, cleanNumber, checkEnvFile, createClient, isValidNumber } = require('./controllers/handle')
@@ -30,7 +30,7 @@ app.use('/', require('./routes/web'))
 const listenMessage = () => client.on('message', async msg => {
     const { from, body, hasMedia } = msg;
 
-    if(!isValidNumber(from)){
+    if (!isValidNumber(from)) {
         return
     }
 
@@ -39,7 +39,7 @@ const listenMessage = () => client.on('message', async msg => {
         return
     }
     message = body.toLowerCase();
-    console.log('BODY',message)
+    console.log('BODY', message)
     const number = cleanNumber(from)
     await readChat(number, message)
 
@@ -56,8 +56,8 @@ const listenMessage = () => client.on('message', async msg => {
      */
 
     if (process.env.DATABASE === 'dialogflow') {
-        if(!message.length) return;
-        const response = await bothResponse(message);
+        if (!message.length) return;
+        const response = await bothResponse(message, number);
         await sendMessage(client, from, response.replyMessage);
         if (response.media) {
             sendMedia(client, from, response.media);
@@ -91,7 +91,7 @@ const listenMessage = () => client.on('message', async msg => {
 
         await sendMessage(client, from, response.replyMessage, response.trigger);
 
-        if(response.hasOwnProperty('actions')){
+        if (response.hasOwnProperty('actions')) {
             const { actions } = response;
             await sendMessageButton(client, from, null, actions);
             return
@@ -116,7 +116,7 @@ const listenMessage = () => client.on('message', async msg => {
         /**
          * Si quieres enviar botones
          */
-        if(response.hasOwnProperty('actions')){
+        if (response.hasOwnProperty('actions')) {
             const { actions } = response;
             await sendMessageButton(client, from, null, actions);
         }
@@ -127,33 +127,33 @@ const listenMessage = () => client.on('message', async msg => {
 
 
 client = new Client({
-        authStrategy: new LocalAuth(),
-        puppeteer: { headless: true }
-    });
-    
+    authStrategy: new LocalAuth(),
+    puppeteer: { headless: true }
+});
+
 client.on('qr', qr => generateImage(qr, () => {
-        qrcode.generate(qr, { small: true });
-        
-        console.log(`Ver QR http://localhost:${port}/qr`)
-        socketEvents.sendQR(qr)
+    qrcode.generate(qr, { small: true });
+
+    console.log(`Ver QR http://localhost:${port}/qr`)
+    socketEvents.sendQR(qr)
 }))
 
 client.on('ready', (a) => {
-        connectionReady()
-        listenMessage()
-        // socketEvents.sendStatus(client)
+    connectionReady()
+    listenMessage()
+    // socketEvents.sendStatus(client)
 });
 
 client.on('auth_failure', (e) => {
-        // console.log(e)
-        // connectionLost()
+    // console.log(e)
+    // connectionLost()
 });
 
 client.on('authenticated', () => {
-        console.log('AUTHENTICATED'); 
+    console.log('AUTHENTICATED');
 });
 
-    client.initialize();
+client.initialize();
 
 
 
@@ -168,5 +168,4 @@ if (process.env.DATABASE === 'mysql') {
 server.listen(port, () => {
     console.log(`El server esta listo por el puerto ${port}`);
 })
-checkEnvFile();
-
+checkEnvFile();

controllers/flows.js

@@ -15,8 +15,8 @@ const responseMessages = async (step) => {
     return data
 }
 
-const bothResponse = async (message) => {
-    const data = await getIA(message)
+const bothResponse = async (message, sessionId) => {
+    const data = await getIA(message, sessionId)
     if(data && data.media){
         const file = await saveExternalFile(data.media)
         return {...data,...{media:file}}

package-lock.json

@@ -22,13 +22,12 @@
         "qrcode-terminal": "^0.12.0",
         "socket.io": "^4.5.1",
         "stormdb": "^0.6.0",
-        "whatsapp-web.js": "^1.18.0",
+        "whatsapp-web.js": "^1.18.4",
         "xlsx": "^0.18.5"
       },
       "devDependencies": {
         "pm2": "^5.2.0",
-        "prettier": "2.7.1",
-        "rollup": "^3.2.3"
+        "prettier": "2.7.1"
       },
       "engines": {
         "node": "16.x"
@@ -4242,22 +4241,6 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/rollup": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.2.3.tgz",
-      "integrity": "sha512-qfadtkY5kl0F5e4dXVdj2D+GtOdifasXHFMiL1SMf9ADQDv5Eti6xReef9FKj+iQPR2pvtqWna57s/PjARY4fg==",
-      "dev": true,
-      "bin": {
-        "rollup": "dist/bin/rollup"
-      },
-      "engines": {
-        "node": ">=14.18.0",
-        "npm": ">=8.0.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
-      }
-    },
     "node_modules/run-series": {
       "version": "1.1.9",
       "resolved": "https://registry.npmjs.org/run-series/-/run-series-1.1.9.tgz",
@@ -5039,9 +5022,9 @@
       "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
     },
     "node_modules/whatsapp-web.js": {
-      "version": "1.18.0",
-      "resolved": "https://registry.npmjs.org/whatsapp-web.js/-/whatsapp-web.js-1.18.0.tgz",
-      "integrity": "sha512-3cCW28/w7llZmTgiO9osumaopOuBBduvyuW02yfy3q9Rz4Wq9Oe1dRedE/kkq764zB8AZcuTs0tE8OKTq2Zobw==",
+      "version": "1.18.4",
+      "resolved": "https://registry.npmjs.org/whatsapp-web.js/-/whatsapp-web.js-1.18.4.tgz",
+      "integrity": "sha512-Dqu6Q37tDDAcVJ44aMdRE76sI/9rBCUG+NTz1Kxh2w4obX2WtpoRetilxqgx1r4+pFUl58Lf21wGOEwPZ1pT/A==",
       "dependencies": {
         "@pedroslopez/moduleraid": "^5.0.2",
         "fluent-ffmpeg": "^2.1.2",
@@ -8598,15 +8581,6 @@
         "glob": "^7.1.3"
       }
     },
-    "rollup": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.2.3.tgz",
-      "integrity": "sha512-qfadtkY5kl0F5e4dXVdj2D+GtOdifasXHFMiL1SMf9ADQDv5Eti6xReef9FKj+iQPR2pvtqWna57s/PjARY4fg==",
-      "dev": true,
-      "requires": {
-        "fsevents": "~2.3.2"
-      }
-    },
     "run-series": {
       "version": "1.1.9",
       "resolved": "https://registry.npmjs.org/run-series/-/run-series-1.1.9.tgz",
@@ -9193,9 +9167,9 @@
       "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
     },
     "whatsapp-web.js": {
-      "version": "1.18.0",
-      "resolved": "https://registry.npmjs.org/whatsapp-web.js/-/whatsapp-web.js-1.18.0.tgz",
-      "integrity": "sha512-3cCW28/w7llZmTgiO9osumaopOuBBduvyuW02yfy3q9Rz4Wq9Oe1dRedE/kkq764zB8AZcuTs0tE8OKTq2Zobw==",
+      "version": "1.18.4",
+      "resolved": "https://registry.npmjs.org/whatsapp-web.js/-/whatsapp-web.js-1.18.4.tgz",
+      "integrity": "sha512-Dqu6Q37tDDAcVJ44aMdRE76sI/9rBCUG+NTz1Kxh2w4obX2WtpoRetilxqgx1r4+pFUl58Lf21wGOEwPZ1pT/A==",
       "requires": {
         "@pedroslopez/moduleraid": "^5.0.2",
         "archiver": "^5.3.1",

package.json

@@ -43,7 +43,7 @@
     "qrcode-terminal": "^0.12.0",
     "socket.io": "^4.5.1",
     "stormdb": "^0.6.0",
-    "whatsapp-web.js": "^1.18.0",
+    "whatsapp-web.js": "^1.18.4",
     "xlsx": "^0.18.5"
   },
   "devDependencies": {