From d3332abe80a9a0a83f5dad62b285ad2cb11a2e7b Mon Sep 17 00:00:00 2001 From: Ricardo Paes Date: Mon, 14 Mar 2022 16:48:03 -0300 Subject: [PATCH 01/10] :bug: Fixing error when sending messages --- backend/src/services/TicketServices/ShowTicketService.ts | 6 ++++++ frontend/src/components/TicketListItem/index.js | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/backend/src/services/TicketServices/ShowTicketService.ts b/backend/src/services/TicketServices/ShowTicketService.ts index 5efab0c..0644066 100644 --- a/backend/src/services/TicketServices/ShowTicketService.ts +++ b/backend/src/services/TicketServices/ShowTicketService.ts @@ -3,6 +3,7 @@ import AppError from "../../errors/AppError"; import Contact from "../../models/Contact"; import User from "../../models/User"; import Queue from "../../models/Queue"; +import Whatsapp from "../../models/Whatsapp"; const ShowTicketService = async (id: string | number): Promise => { const ticket = await Ticket.findByPk(id, { @@ -22,6 +23,11 @@ const ShowTicketService = async (id: string | number): Promise => { model: Queue, as: "queue", attributes: ["id", "name", "color"] + }, + { + model: Whatsapp, + as: "whatsapp", + attributes: ["name"] } ] }); diff --git a/frontend/src/components/TicketListItem/index.js b/frontend/src/components/TicketListItem/index.js index d0fc01b..16fab94 100644 --- a/frontend/src/components/TicketListItem/index.js +++ b/frontend/src/components/TicketListItem/index.js @@ -211,7 +211,7 @@ const TicketListItem = ({ ticket }) => { )} )} - {ticket.whatsappId && ( + {ticket?.whatsapp && (
{ticket.whatsapp.name}
)} From f874f249ece8b9ae38933fd7b4ff0d2700141abd Mon Sep 17 00:00:00 2001 From: Ricardo Paes Date: Tue, 15 Mar 2022 07:54:20 -0300 Subject: [PATCH 02/10] :bug: Fixing error when sending messages --- .../services/MessageServices/CreateMessageService.ts | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/backend/src/services/MessageServices/CreateMessageService.ts b/backend/src/services/MessageServices/CreateMessageService.ts index 67fd33b..2bfd9c7 100644 --- a/backend/src/services/MessageServices/CreateMessageService.ts +++ b/backend/src/services/MessageServices/CreateMessageService.ts @@ -1,6 +1,7 @@ import { getIO } from "../../libs/socket"; import Message from "../../models/Message"; import Ticket from "../../models/Ticket"; +import Whatsapp from "../../models/Whatsapp"; interface MessageData { id: string; @@ -27,7 +28,14 @@ const CreateMessageService = async ({ { model: Ticket, as: "ticket", - include: ["contact", "queue"] + include: [ + "contact", "queue", + { + model: Whatsapp, + as: "whatsapp", + attributes: ["name"] + } + ] }, { model: Message, From 9950ce3bb0ab3de95b545b1cbf0385e2f5647b39 Mon Sep 17 00:00:00 2001 From: macleysousa Date: Wed, 16 Mar 2022 11:24:09 -0300 Subject: [PATCH 03/10] Names props error --- .../src/components/TicketListItem/index.js | 6 ++-- frontend/src/pages/Signup/index.js | 28 +++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/frontend/src/components/TicketListItem/index.js b/frontend/src/components/TicketListItem/index.js index d0fc01b..f503d04 100644 --- a/frontend/src/components/TicketListItem/index.js +++ b/frontend/src/components/TicketListItem/index.js @@ -105,9 +105,9 @@ const useStyles = makeStyles(theme => ({ marginRight: 5, right: 5, bottom: 5, - background:"#2576D2", + background: "#2576D2", color: "#ffffff", - border:"1px solid #CCC", + border: "1px solid #CCC", padding: 1, paddingLeft: 5, paddingRight: 5, @@ -212,7 +212,7 @@ const TicketListItem = ({ ticket }) => { )} {ticket.whatsappId && ( -
{ticket.whatsapp.name}
+
{ticket.whatsapp?.name}
)} } diff --git a/frontend/src/pages/Signup/index.js b/frontend/src/pages/Signup/index.js index 0d36827..e71ef73 100644 --- a/frontend/src/pages/Signup/index.js +++ b/frontend/src/pages/Signup/index.js @@ -18,10 +18,10 @@ import { InputAdornment, IconButton, Link - } from '@material-ui/core'; - +} from '@material-ui/core'; + import { LockOutlined, Visibility, VisibilityOff } from '@material-ui/icons'; - + import { makeStyles } from "@material-ui/core/styles"; import { i18n } from "../../translate/i18n"; @@ -155,16 +155,16 @@ const SignUp = () => { label={i18n.t("signup.form.password")} type={showPassword ? 'text' : 'password'} InputProps={{ - endAdornment: ( - - setShowPassword((e) => !e)} - > - {showPassword ? : } - - - ) + endAdornment: ( + + setShowPassword((e) => !e)} + > + {showPassword ? : } + + + ) }} /> @@ -178,7 +178,7 @@ const SignUp = () => { > {i18n.t("signup.buttons.submit")} - + Date: Wed, 16 Mar 2022 13:57:15 -0300 Subject: [PATCH 04/10] :bug: Fixing marker that was on top of the number --- frontend/src/components/TicketListItem/index.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/src/components/TicketListItem/index.js b/frontend/src/components/TicketListItem/index.js index 16fab94..58bab3e 100644 --- a/frontend/src/components/TicketListItem/index.js +++ b/frontend/src/components/TicketListItem/index.js @@ -102,9 +102,9 @@ const useStyles = makeStyles(theme => ({ userTag: { position: "absolute", - marginRight: 5, - right: 5, - bottom: 5, + marginRight: 35, + right: 10, + bottom: 9, background:"#2576D2", color: "#ffffff", border:"1px solid #CCC", @@ -112,7 +112,7 @@ const useStyles = makeStyles(theme => ({ paddingLeft: 5, paddingRight: 5, borderRadius: 10, - fontSize: "1em" + fontSize: "0.9em" }, })); From 14cb9cd072f261fc5f1584d27da814de458d41d4 Mon Sep 17 00:00:00 2001 From: Alex Sandro <34557801+Kouthk@users.noreply.github.com> Date: Wed, 18 May 2022 14:42:54 -0400 Subject: [PATCH 05/10] =?UTF-8?q?=F0=9F=94=A8configura=C3=A7=C3=A3o=20para?= =?UTF-8?q?=20utilizar=20whatsapp=20multi-device?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Quem fez essa modificação foi o @w3nder . Estou apenas colando do repositorio pessoal dele e solicitando o Merge aqui. Ele deu autorização para que eu pudesse fazer isso, todos os creditos são dele. arquivo original: https://github.com/w3nder/whaticket/commit/bfa935ada3e288d23632a6fd7efe30e5d1dd7569 --- backend/src/libs/wbot.ts | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/backend/src/libs/wbot.ts b/backend/src/libs/wbot.ts index f58830b..0ef7ecb 100644 --- a/backend/src/libs/wbot.ts +++ b/backend/src/libs/wbot.ts @@ -1,5 +1,5 @@ import qrCode from "qrcode-terminal"; -import { Client } from "whatsapp-web.js"; +import { Client, LocalAuth } from "whatsapp-web.js"; import { getIO } from "./socket"; import Whatsapp from "../models/Whatsapp"; import AppError from "../errors/AppError"; @@ -42,17 +42,14 @@ export const initWbot = async (whatsapp: Whatsapp): Promise => { if (whatsapp && whatsapp.session) { sessionCfg = JSON.parse(whatsapp.session); } - - const args:String = process.env.CHROME_ARGS || ""; - - const wbot: Session = new Client({ + + const wbot: Session = new Client({ session: sessionCfg, - puppeteer: { - executablePath: process.env.CHROME_BIN || undefined, - // @ts-ignore - browserWSEndpoint: process.env.CHROME_WS || undefined, - args: args.split(' ') - } + authStrategy: new LocalAuth({clientId: 'bd_'+whatsapp.id}), + puppeteer: { + args: ['--no-sandbox', '--disable-setuid-sandbox'], + executablePath: process.env.CHROME_BIN || undefined + }, }); wbot.initialize(); @@ -76,9 +73,9 @@ export const initWbot = async (whatsapp: Whatsapp): Promise => { wbot.on("authenticated", async session => { logger.info(`Session: ${sessionName} AUTHENTICATED`); - await whatsapp.update({ - session: JSON.stringify(session) - }); +// await whatsapp.update({ +// session: JSON.stringify(session) +// }); }); wbot.on("auth_failure", async msg => { From fbb13373e7ba1a75027ccb65aa104c1596a705ac Mon Sep 17 00:00:00 2001 From: Alex Sandro <34557801+Kouthk@users.noreply.github.com> Date: Thu, 19 May 2022 11:03:17 -0400 Subject: [PATCH 06/10] =?UTF-8?q?=F0=9F=94=AA=20adiciona=20".wwebjs=5Fauth?= =?UTF-8?q?"=20ao=20=20'.gitignore'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR auxiliar para o commit #432 --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index b5c1a76..77a65a3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .docker/data/ ssl/ -.env \ No newline at end of file +.env +.wwebjs_auth From 4a8e5525ab536c0131561e2109bbfd2ecfdfa160 Mon Sep 17 00:00:00 2001 From: Robson Tenorio Date: Fri, 27 May 2022 16:40:23 -0300 Subject: [PATCH 07/10] UPDATE: whatsapp-web.js de 1.15.8 para 1.16.6. --- backend/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/package.json b/backend/package.json index 762f819..83a6269 100644 --- a/backend/package.json +++ b/backend/package.json @@ -39,7 +39,7 @@ "sequelize-typescript": "^1.1.0", "socket.io": "^3.0.5", "uuid": "^8.3.2", - "whatsapp-web.js": "^1.15.8", + "whatsapp-web.js": "^1.16.6", "yup": "^0.32.8" }, "devDependencies": { From 9b62cdfb3d565b18aff3f886d6f5f34072d4bc3d Mon Sep 17 00:00:00 2001 From: Robson Tenorio Date: Fri, 10 Jun 2022 09:33:56 -0300 Subject: [PATCH 08/10] UPDATE: whatsapp-web.js de 1.16.6 para 1.16.7. --- backend/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/package.json b/backend/package.json index 83a6269..d1b2a75 100644 --- a/backend/package.json +++ b/backend/package.json @@ -39,7 +39,7 @@ "sequelize-typescript": "^1.1.0", "socket.io": "^3.0.5", "uuid": "^8.3.2", - "whatsapp-web.js": "^1.16.6", + "whatsapp-web.js": "^1.16.7", "yup": "^0.32.8" }, "devDependencies": { From 24842e89229a1a3f612ebb39bb8e127e43b1f86e Mon Sep 17 00:00:00 2001 From: Tonny Barros <68646516+tonnybarros@users.noreply.github.com> Date: Tue, 21 Jun 2022 06:36:51 -0300 Subject: [PATCH 09/10] UPDATE: whatsapp-web.js de 1.16.7 para 1.17.0 --- backend/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/package.json b/backend/package.json index d1b2a75..7c9a19d 100644 --- a/backend/package.json +++ b/backend/package.json @@ -39,7 +39,7 @@ "sequelize-typescript": "^1.1.0", "socket.io": "^3.0.5", "uuid": "^8.3.2", - "whatsapp-web.js": "^1.16.7", + "whatsapp-web.js": "^1.17.0", "yup": "^0.32.8" }, "devDependencies": { From 93ab10073a996ede0b196210639f2500a0767677 Mon Sep 17 00:00:00 2001 From: Robson Tenorio Date: Wed, 20 Jul 2022 12:27:55 -0300 Subject: [PATCH 10/10] UPDATE: whatsapp-web.js de 1.17.0 para 1.17.1 --- backend/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/package.json b/backend/package.json index 7c9a19d..0942d45 100644 --- a/backend/package.json +++ b/backend/package.json @@ -39,7 +39,7 @@ "sequelize-typescript": "^1.1.0", "socket.io": "^3.0.5", "uuid": "^8.3.2", - "whatsapp-web.js": "^1.17.0", + "whatsapp-web.js": "^1.17.1", "yup": "^0.32.8" }, "devDependencies": {