Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/api/controllers/health.controller.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { WAMonitoringService } from '@api/services/monitor.service';

import { UnauthorizedException } from '../../exceptions';
import { PrismaRepository } from '../repository/repository.service';

export class HealthController {
Expand Down
65 changes: 37 additions & 28 deletions src/api/integrations/channel/whatsapp/whatsapp.baileys.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ export class BaileysStartupService extends ChannelStartupService {
qrcodeTerminal.generate(qr, { small: true }, (qrcode) =>
this.logger.log(
`\n{ instance: ${this.instance.name} pairingCode: ${this.instance.qrcode.pairingCode}, qrcodeCount: ${this.instance.qrcode.count} }\n` +
qrcode,
qrcode,
),
);

Expand Down Expand Up @@ -1024,18 +1024,18 @@ export class BaileysStartupService extends ChannelStartupService {

const messagesRepository: Set<string> = new Set(
chatwootImport.getRepositoryMessagesCache(instance) ??
(
await this.prismaRepository.message.findMany({
select: { key: true },
where: { instanceId: this.instanceId },
})
).map((message) => {
const key = message.key as {
id: string;
};

return key.id;
}),
(
await this.prismaRepository.message.findMany({
select: { key: true },
where: { instanceId: this.instanceId },
})
).map((message) => {
const key = message.key as {
id: string;
};

return key.id;
}),
);

if (chatwootImport.getRepositoryMessagesCache(instance) === null) {
Expand Down Expand Up @@ -1364,24 +1364,33 @@ export class BaileysStartupService extends ChannelStartupService {
}
}
}
if (1/* this.localWebhook.enabled */) {
if (1/* isMedia && this.localWebhook.webhookBase64 */) {
if (this.localWebhook.enabled) {
if (isMedia && this.localWebhook.webhookBase64) {
try {
let buffer : Buffer = null;
console.dir({received}, {depth: null});
if ((received.message.stickerMessage && received.message.stickerMessage.url === 'https://web.whatsapp.net')
|| (received.message.lottieStickerMessage && received.message.lottieStickerMessage.message.stickerMessage.url)) { /*Fixing broken URLs from sticker messages*/
const newUrl = `https://mmg.whatsapp.net${received.message.lottieStickerMessage ? received.message.lottieStickerMessage.message.stickerMessage.directPath : received.message.stickerMessage.directPath }`;
let buffer: Buffer = null;
console.dir({ received }, { depth: null });
if (
(received.message.stickerMessage &&
received.message.stickerMessage.url === 'https://web.whatsapp.net') ||
(received.message.lottieStickerMessage &&
received.message.lottieStickerMessage.message.stickerMessage.url)
) {
/*Fixing broken URLs from sticker messages*/
const newUrl = `https://mmg.whatsapp.net${received.message.lottieStickerMessage ? received.message.lottieStickerMessage.message.stickerMessage.directPath : received.message.stickerMessage.directPath}`;

const stream = await downloadContentFromMessage(
{
mediaKey: received.message?.stickerMessage?.mediaKey || received.message.lottieStickerMessage?.message?.stickerMessage?.mediaKey,
directPath: received.message?.stickerMessage?.directPath || received.message.lottieStickerMessage?.message?.stickerMessage?.directPath,
url: newUrl
},
mediaKey:
received.message?.stickerMessage?.mediaKey ||
received.message.lottieStickerMessage?.message?.stickerMessage?.mediaKey,
directPath:
received.message?.stickerMessage?.directPath ||
received.message.lottieStickerMessage?.message?.stickerMessage?.directPath,
url: newUrl,
},
'sticker',
{},
)
);
const chunks = [];
for await (const chunk of stream) {
chunks.push(chunk);
Expand All @@ -1406,7 +1415,7 @@ export class BaileysStartupService extends ChannelStartupService {
}
}

console.dir({webhookMessage: messageRaw}, {depth: null})
console.dir({ webhookMessage: messageRaw }, { depth: null });
this.logger.log(messageRaw);

this.sendDataWebhook(Events.MESSAGES_UPSERT, messageRaw);
Expand Down Expand Up @@ -1778,7 +1787,7 @@ export class BaileysStartupService extends ChannelStartupService {
}

if (events['messages.upsert']) {
const payload = events['messages.upsert']
const payload = events['messages.upsert'];
this.messageHandle['messages.upsert'](payload, settings);
}

Expand Down Expand Up @@ -2300,7 +2309,7 @@ export class BaileysStartupService extends ChannelStartupService {
messageSent?.message?.documentMessage ||
messageSent?.message?.documentWithCaptionMessage ||
messageSent?.message?.ptvMessage ||
messageSent?.message?.audioMessage ||
messageSent?.message?.audioMessage ||
messageSent?.message?.lottieStickerMessage;

if (this.configService.get<Chatwoot>('CHATWOOT').ENABLED && this.localChatwoot?.enabled && !isIntegration) {
Expand Down
19 changes: 9 additions & 10 deletions src/api/routes/health.router.ts
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
import { RequestHandler, Router } from "express";
import { RouterBroker } from "../abstract/abstract.router";
import { HttpStatus } from "./index.router";
import { healthController } from "@api/server.module";
import { healthController } from '@api/server.module';
import { Router } from 'express';

import { RouterBroker } from '../abstract/abstract.router';
import { HttpStatus } from './index.router';

export class HealthRouter extends RouterBroker {
constructor() {
super();
this.router
.get(this.routerPath('healthz', false), async (req, res) => {
await healthController.checkHealth();
return res.status(HttpStatus.OK).json({msg: 'healthy'});
})
this.router.get(this.routerPath('healthz', false), async (req, res) => {
await healthController.checkHealth();
return res.status(HttpStatus.OK).json({ msg: 'healthy' });
});
}

public readonly router: Router = Router();
}
}
2 changes: 1 addition & 1 deletion src/api/routes/index.router.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ import { BusinessRouter } from './business.router';
import { CallRouter } from './call.router';
import { ChatRouter } from './chat.router';
import { GroupRouter } from './group.router';
import { HealthRouter } from './health.router';
import { InstanceRouter } from './instance.router';
import { LabelRouter } from './label.router';
import { ProxyRouter } from './proxy.router';
import { MessageRouter } from './sendMessage.router';
import { SettingsRouter } from './settings.router';
import { TemplateRouter } from './template.router';
import { ViewsRouter } from './view.router';
import { HealthRouter} from './health.router';

enum HttpStatus {
OK = 200,
Expand Down
2 changes: 1 addition & 1 deletion src/api/server.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { BusinessController } from './controllers/business.controller';
import { CallController } from './controllers/call.controller';
import { ChatController } from './controllers/chat.controller';
import { GroupController } from './controllers/group.controller';
import { HealthController } from './controllers/health.controller';
import { InstanceController } from './controllers/instance.controller';
import { LabelController } from './controllers/label.controller';
import { ProxyController } from './controllers/proxy.controller';
Expand Down Expand Up @@ -40,7 +41,6 @@ import { WAMonitoringService } from './services/monitor.service';
import { ProxyService } from './services/proxy.service';
import { SettingsService } from './services/settings.service';
import { TemplateService } from './services/template.service';
import { HealthController } from './controllers/health.controller';

const logger = new Logger('WA MODULE');

Expand Down
2 changes: 1 addition & 1 deletion src/api/services/channel.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,7 @@ export class ChannelStartupService {
}

// Limpa LottieStickerMessage
if(cleanedMessage.message.lottieStickerMessage) {
if (cleanedMessage.message.lottieStickerMessage) {
cleanedMessage.message.lottieStickerMessage = {};
}

Expand Down