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

fix(whatsapp.gblib): Field mobile used instead of id in message.

Browse source
This commit is contained in:
Rodrigo Rodriguez 2021-05-09 19:19:44 -03:00
parent 819b5937bb
commit ac9d065a61
4 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/basic.gblib/services/DialogKeywords.ts
View file

@ -217,10 +217,10 @@ export class DialogKeywords {
*
*/
public async userMobile(step) {
if (isNaN(step.context.activity.from.id)) {
if (isNaN(step.context.activity['mobile'])) {
return 'No mobile available.';
} else {
return step.context.activity.from.id;
return step.context.activity['mobile'];
}
}

8
packages/core.gbapp/services/GBConversationalService.ts
View file

@ -220,14 +220,14 @@ export class GBConversationalService {
caption: string
): Promise<any> {
if (step !== null) {
if (!isNaN(step.context.activity.from.id as any)) {
mobile = step.context.activity.from.id;
if (!isNaN(step.context.activity['mobile'] as any)) {
mobile = step.context.activity['mobile'];
GBLog.info(`Sending file ${url} to ${mobile}...`);
const filename = url.substring(url.lastIndexOf('/') + 1);
await min.whatsAppDirectLine.sendFileToDevice(mobile, url, filename, caption);
} else {
GBLog.info(
`Sending ${url} as file attachment not available in this channel ${step.context.activity.from.id}...`
`Sending ${url} as file attachment not available in this channel ${step.context.activity['mobile']}...`
);
await min.conversationalService.sendText(min, step, url);
}
@ -239,7 +239,7 @@ export class GBConversationalService {
}
public async sendAudio(min: GBMinInstance, step: GBDialogStep, url: string): Promise<any> {
const mobile = step.context.activity.from.id;
const mobile = step.context.activity['mobile'];
GBLog.info(`Sending audio to ${mobile} in URL: ${url}.`);
await min.whatsAppDirectLine.sendAudioToDevice(mobile, url);
}

2
packages/kb.gbapp/dialogs/AskDialog.ts
View file

@ -253,7 +253,7 @@ export class AskDialog extends IGBDialog {
}
private static getChannel(step): string {
return !isNaN(step.context.activity.from.id) ? 'whatsapp' : step.context.activity.channelId;
return !isNaN(step.context.activity['mobile']) ? 'whatsapp' : step.context.activity.channelId;
}
private static getAnswerEventDialog(service: KBService, min: GBMinInstance) {

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

@ -315,6 +315,7 @@ export class WhatsappDirectLine extends GBService {
textFormat: 'plain',
text: text,
type: 'message',
mobile: from,
from: {
id: from,
name: fromName