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

new(all): Automation new keywords and WhatsApp transfer.

Browse source
This commit is contained in:
Rodrigo Rodriguez 2022-05-19 12:17:28 -03:00
parent cea3b54970
commit 156eebc251
4 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -578,7 +578,7 @@ export class DialogKeywords {
* @example TRANSFER * @example TRANSFER
* *
*/ */
public async transfer(step, to: string = null) { public async transferTo(step, to: string = null) {
return await step.beginDialog('/t', {to: to}); return await step.beginDialog('/t', {to: to});
} }

10
packages/basic.gblib/services/GBVMService.ts
View file

@ -374,11 +374,11 @@ export class GBVMService extends GBService {
}); });
code = code.replace(/(transfer to)(\s)(.*)/gi, ($0, $1, $2, $3) => { code = code.replace(/(transfer to)(\s)(.*)/gi, ($0, $1, $2, $3) => {
return `transfer (step, ${$3})\n`; return `transferTo (step, ${$3})\n`;
}); });
code = code.replace(/(transfer)(?=(?:[^"]|"[^"]*")*$)/gi, () => { code = code.replace(/(\btransfer\b)(?=(?:[^"]|"[^"]*")*$)/gi, () => {
return `transfer (step)\n`; return `transferTo (step)\n`;
}); });
code = code.replace(/(exit)/gi, () => { code = code.replace(/(exit)/gi, () => {
@ -599,8 +599,8 @@ export class GBVMService extends GBService {
code = code.replace(/("[^"]*"|'[^']*')|\bsetWholeWord\b/gi, ($0, $1) => { code = code.replace(/("[^"]*"|'[^']*')|\bsetWholeWord\b/gi, ($0, $1) => {
return $1 === undefined ? 'this.setWholeWord' : $1; return $1 === undefined ? 'this.setWholeWord' : $1;
}); });
code = code.replace(/("[^"]*"|'[^']*')|\btransfer\b/gi, ($0, $1) => { code = code.replace(/("[^"]*"|'[^']*')|\btransferTo\b/gi, ($0, $1) => {
return $1 === undefined ? 'this.transfer' : $1; return $1 === undefined ? 'this.transferTo' : $1;
}); });
code = code.replace(/("[^"]*"|'[^']*')|\bcreateDeal\b/gi, ($0, $1) => { code = code.replace(/("[^"]*"|'[^']*')|\bcreateDeal\b/gi, ($0, $1) => {
return $1 === undefined ? 'this.createDeal' : $1; return $1 === undefined ? 'this.createDeal' : $1;

15
packages/customer-satisfaction.gbapp/dialogs/FeedbackDialog.ts
View file

@ -84,18 +84,19 @@ export class FeedbackDialog extends IGBDialog {
const locale = step.context.activity.locale; const locale = step.context.activity.locale;
const sec = new SecService(); const sec = new SecService();
let from = GBMinService.userMobile(step); let from = GBMinService.userMobile(step);
const user = await min.userProfile.get(step.context, {}); const profile = await min.userProfile.get(step.context, {});
const args = step.activeDialog.state.options;
const args = step.activeDialog.state.options.args;
// Transfer to... // Transfer to...
if (args && args.to) { if (args && args.to) {
// An user from Teams willing to transfer to a WhatsApp user. // An user from Teams willing to transfer to a WhatsApp user.
await sec.assignHumanAgent(min, args.to, user.userSystemId); await sec.ensureUser(min.instance.instanceId, args.to,
'Name', '', 'whatsapp', 'Name', null);
await sec.assignHumanAgent(min, args.to, profile.systemUser.userSystemId);
await min.conversationalService.sendText(min, step, await min.conversationalService.sendText(min, step,
Messages[locale].notify_agent_transfer_done(min.instance.botId)); Messages[locale].notify_agent_transfer_done(min.instance.botId));
@ -105,8 +106,8 @@ export class FeedbackDialog extends IGBDialog {
await min.conversationalService.sendText(min, step, Messages[locale].please_wait_transfering); await min.conversationalService.sendText(min, step, Messages[locale].please_wait_transfering);
const agentSystemId = await sec.assignHumanAgent(min, from); const agentSystemId = await sec.assignHumanAgent(min, from);
user.systemUser = await sec.getUserFromAgentSystemId(agentSystemId); profile.systemUser = await sec.getUserFromAgentSystemId(agentSystemId);
await min.userProfile.set(step.context, user); await min.userProfile.set(step.context, profile);
if (agentSystemId.charAt(2) === ":" || agentSystemId.indexOf("@") > -1) { // Agent is from Teams or Google Chat. if (agentSystemId.charAt(2) === ":" || agentSystemId.indexOf("@") > -1) { // Agent is from Teams or Google Chat.

2
packages/security.gbapp/services/SecService.ts
View file

@ -111,7 +111,7 @@ export class SecService extends GBService {
instanceId: number, instanceId: number,
agentSystemId: string agentSystemId: string
): Promise<GuaribasUser> { ): Promise<GuaribasUser> {
const user = await GuaribasUser.findOne({ const user = await GuaribasUser.findOne({
where: { where: {
userSystemId: userSystemId, userSystemId: userSystemId,
instanceId: instanceId instanceId: instanceId