GeneralBots/botserver
2
1
Fork 0
Code Issues Pull requests 1 Projects Releases 323 Packages Wiki Activity Actions

fix(whatsapp.gblib): #309 unify channel detection.

Browse source
This commit is contained in:
rodrigorodriguez 2023-03-07 10:01:36 -03:00
parent 565ad4ab6d
commit cfe3ab30f4
2 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
packages/core.gbapp/services/GBMinService.ts
View file

@ -831,6 +831,11 @@ export class GBMinService {
adapter = min['fbAdapter']; adapter = min['fbAdapter'];
} }
// Unifies channel detection.
req.body.channelId =
(req.body.from.channelIdEx === 'whatsapp' ? 'omnichannel' : req.body.channelId);
// Default activity processing and handler. // Default activity processing and handler.
await adapter['processActivity'](req, res, async context => { await adapter['processActivity'](req, res, async context => {

16
packages/whatsapp.gblib/services/WhatsappDirectLine.ts
View file

@ -113,18 +113,6 @@ export class WhatsappDirectLine extends GBService {
} }
} }
public async sendButton(number) {
let url = 'https://img-prod-cms-rt-microsoft-com.akamaized.net/cms/api/am/imageFileData/RE1Mu3b?ver=5c31';
const media = await MessageMedia.fromUrl(url, {unsafeMime: true});
media.mimetype = 'image/png';
media.filename = 'hello.png';
let btnClickableMenu = new Buttons(media as any, [
{ id: 'customId', body: 'button1' }, { body: 'button2' },
{ body: 'button3' }, { body: 'button4' },
{ body: 'button4' }, { body: 'button6' },
]);
await this.sendToDevice(number, btnClickableMenu as any, null);
}
public async setup(setUrl: boolean) { public async setup(setUrl: boolean) {
const client = await new SwaggerClient({ const client = await new SwaggerClient({
spec: JSON.parse(Fs.readFileSync('directline-3.0.json', 'utf8')), spec: JSON.parse(Fs.readFileSync('directline-3.0.json', 'utf8')),
@ -180,12 +168,11 @@ export class WhatsappDirectLine extends GBService {
}).bind(this) }).bind(this)
); );
client.on('authenticated', async () => { client.on('authenticated', async () => {
GBLog.verbose(`GBWhatsApp: QR Code authenticated for ${this.botId}.`); GBLog.verbose(`GBWhatsApp: QR Code authenticated for ${this.botId}.`);
}); });
client.on('ready', async () => { client.on('ready', async () => {
GBLog.verbose(`GBWhatsApp: Emptying chat list for ${this.botId}...`); GBLog.verbose(`GBWhatsApp: Emptying chat list for ${this.botId}...`);
// Keeps the chat list cleaned. // Keeps the chat list cleaned.
const chats = await client.getChats(); const chats = await client.getChats();
await CollectionUtil.asyncForEach(chats, async chat => { await CollectionUtil.asyncForEach(chats, async chat => {
@ -630,6 +617,7 @@ export class WhatsappDirectLine extends GBService {
attachments: attachments, attachments: attachments,
from: { from: {
id: from, id: from,
channelIdEx: 'whatsapp',
name: fromName name: fromName
}, },
replyToId: from replyToId: from