NeoAnd/evolution-api
1
0
Fork 0
mirror of https://github.com/EvolutionAPI/evolution-api.git synced 2025-07-15 11:42:53 -06:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #99 from moskoweb/bug-bad-request

Browse Source 
fix: Debug Bad Request
This commit is contained in:
Davidson Gomes 2023-09-11 09:38:28 -03:00 committed by GitHub
commit ecbf90ded8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/socket.server.ts
View File

@ -11,7 +11,7 @@ let io: SocketIO;
const cors = configService.get<Cors>('CORS').ORIGIN; const cors = configService.get<Cors>('CORS').ORIGIN;
export const initIO = (httpServer: Server) => { export const initIO = (httpServer: Server) => {
if (configService.get<Websocket>('WEBSOCKET').ENABLED) { if (configService.get<Websocket>('WEBSOCKET')?.ENABLED) {
io = new SocketIO(httpServer, { io = new SocketIO(httpServer, {
cors: { cors: {
origin: cors, origin: cors,

2
src/main.ts
View File

@ -125,7 +125,7 @@ function bootstrap() {
initIO(server); initIO(server);
if (configService.get<Rabbitmq>('RABBITMQ').ENABLED) initAMQP(); if (configService.get<Rabbitmq>('RABBITMQ')?.ENABLED) initAMQP();
onUnexpectedError(); onUnexpectedError();
} }

14
src/whatsapp/services/whatsapp.service.ts
View File

@ -711,7 +711,7 @@ export class WAStartupService {
} }
} }
if (this.configService.get<Websocket>('WEBSOCKET').ENABLED && this.localWebsocket.enabled) { if (this.configService.get<Websocket>('WEBSOCKET')?.ENABLED && this.localWebsocket.enabled) {
this.logger.verbose('Sending data to websocket on channel: ' + this.instance.name); this.logger.verbose('Sending data to websocket on channel: ' + this.instance.name);
if (Array.isArray(websocketLocal) && websocketLocal.includes(we)) { if (Array.isArray(websocketLocal) && websocketLocal.includes(we)) {
this.logger.verbose('Sending data to websocket on event: ' + event); this.logger.verbose('Sending data to websocket on event: ' + event);
@ -1954,9 +1954,10 @@ export class WAStartupService {
private async sendMessageWithTyping<T = proto.IMessage>(number: string, message: T, options?: Options) { private async sendMessageWithTyping<T = proto.IMessage>(number: string, message: T, options?: Options) {
this.logger.verbose('Sending message with typing'); this.logger.verbose('Sending message with typing');
const numberWA = await this.whatsappNumber({ numbers: [number] }); this.logger.verbose(`Check if number "${number}" is WhatsApp`);
const isWA = numberWA[0]; const isWA = (await this.whatsappNumber({ numbers: [number] }))?.shift();
this.logger.verbose(`Exists: "${isWA.exists}" | jid: ${isWA.jid}`);
if (!isWA.exists && !isJidGroup(isWA.jid) && !isWA.jid.includes('@broadcast')) { if (!isWA.exists && !isJidGroup(isWA.jid) && !isWA.jid.includes('@broadcast')) {
throw new BadRequestException(isWA); throw new BadRequestException(isWA);
} }
@ -2000,9 +2001,9 @@ export class WAStartupService {
let mentions: string[]; let mentions: string[];
if (isJidGroup(sender)) { if (isJidGroup(sender)) {
try { try {
const groupMetadata = await this.client.groupMetadata(sender); const group = await this.findGroup({ groupJid: sender }, 'inner');
if (!groupMetadata) { if (!group) {
throw new NotFoundException('Group not found'); throw new NotFoundException('Group not found');
} }
@ -2013,7 +2014,7 @@ export class WAStartupService {
this.logger.verbose('Mentions everyone'); this.logger.verbose('Mentions everyone');
this.logger.verbose('Getting group metadata'); this.logger.verbose('Getting group metadata');
mentions = groupMetadata.participants.map((participant) => participant.id); mentions = group.participants.map((participant) => participant.id);
this.logger.verbose('Getting group metadata for mentions'); this.logger.verbose('Getting group metadata for mentions');
} else if (options.mentions?.mentioned?.length) { } else if (options.mentions?.mentioned?.length) {
this.logger.verbose('Mentions manually defined'); this.logger.verbose('Mentions manually defined');
@ -2021,7 +2022,6 @@ export class WAStartupService {
const jid = this.createJid(mention); const jid = this.createJid(mention);
if (isJidGroup(jid)) { if (isJidGroup(jid)) {
return null; return null;
// throw new BadRequestException('Mentions must be a number');
} }
return jid; return jid;
}); });