Skip to content

Commit

Permalink
fix(basic.gblib): #227 - HEAR AS FILE and GET/SET PARAM.
Browse files Browse the repository at this point in the history
  • Loading branch information
rodrigorodriguez committed Feb 1, 2023
1 parent 33a5efa commit bc5c1b0
Show file tree
Hide file tree
Showing 2 changed files with 1,406 additions and 1,384 deletions.
38 changes: 27 additions & 11 deletions packages/basic.gblib/services/DialogKeywords.ts
Original file line number Diff line number Diff line change
Expand Up @@ -608,6 +608,9 @@ export class DialogKeywords {

private async setOption({pid, name, value})
{
if (this.isUserSystemParam(name)){
throw new Error(`Not possible to define ${name} as it is a reserved system param name.`);
}
const process = GBServer.globals.processes[pid];
let { min, user, params } = await DialogKeywords.getProcessInfo(pid);
const sec = new SecService();
Expand All @@ -616,6 +619,17 @@ export class DialogKeywords {
return { min, user, params };
}

private async getOption({pid, name})
{
if (this.isUserSystemParam(name)){
throw new Error(`Not possible to retrieve ${name} system param.`);
}
const process = GBServer.globals.processes[pid];
let { min, user, params } = await DialogKeywords.getProcessInfo(pid);
const sec = new SecService();
return await sec.getParam(user, name);
}

/**
* Defines the maximum lines to scan in spreedsheets.
*
Expand Down Expand Up @@ -811,12 +825,14 @@ export class DialogKeywords {
await sleep(DEFAULT_HEAR_POLL_INTERVAL);
}

const text = min.cbMap[userId].promise;
const answer = min.cbMap[userId].promise;

if (kind === 'file') {
GBLog.info(`BASIC (${min.botId}): Upload done for ${answer.filename}.`);
// TODO: answer.filename, answer.data.

} else if (kind === 'boolean') {
if (isIntentYes('pt-BR', text)) {
if (isIntentYes('pt-BR', answer)) {
result = true;
} else {
result = false;
Expand Down Expand Up @@ -852,7 +868,7 @@ export class DialogKeywords {
return text.match(/\d+/gi);
};

const value = extractEntity(text);
const value = extractEntity(answer);

if (value === null || value.length != 1) {
await this.talk({ pid, text: 'Por favor, digite um número válido.' });
Expand All @@ -867,7 +883,7 @@ export class DialogKeywords {
);
};

const value = extractEntity(text);
const value = extractEntity(answer);

if (value === null || value.length != 1) {
await this.talk({ pid, text: 'Por favor, digite uma data no formato 12/12/2020.' });
Expand All @@ -880,7 +896,7 @@ export class DialogKeywords {
return text.match(/^([0-1]?[0-9]|2[0-4]):([0-5][0-9])(:[0-5][0-9])?$/gi);
};

const value = extractEntity(text);
const value = extractEntity(answer);

if (value === null || value.length != 1) {
await this.talk({ pid, text: 'Por favor, digite um horário no formato hh:ss.' });
Expand All @@ -899,7 +915,7 @@ export class DialogKeywords {
return [];
};

const value = extractEntity(text);
const value = extractEntity(answer);

if (value === null || value.length != 1) {
await this.talk({ pid, text: 'Por favor, digite um valor monetário.' });
Expand All @@ -911,7 +927,7 @@ export class DialogKeywords {
let phoneNumber;
try {
// https://github.com/GeneralBots/BotServer/issues/307
phoneNumber = phone(text, { country: 'BRA' })[0];
phoneNumber = phone(answer, { country: 'BRA' })[0];
phoneNumber = phoneUtil.parse(phoneNumber);
} catch (error) {
await this.talk({ pid, text: Messages[locale].validation_enter_valid_mobile });
Expand All @@ -936,7 +952,7 @@ export class DialogKeywords {
}
};

const value = extractEntity(text);
const value = extractEntity(answer);

if (value === null || value.length != 1) {
await this.talk({ pid, text: 'Por favor, digite um CEP válido.' });
Expand All @@ -948,7 +964,7 @@ export class DialogKeywords {
const list = args;
result = null;
await CollectionUtil.asyncForEach(list, async item => {
if (GBConversationalService.kmpSearch(text, item) != -1) {
if (GBConversationalService.kmpSearch(answer, item) != -1) {
result = item;
}
});
Expand Down Expand Up @@ -978,8 +994,8 @@ export class DialogKeywords {

await CollectionUtil.asyncForEach(list, async item => {
if (
GBConversationalService.kmpSearch(text.toLowerCase(), item.name.toLowerCase()) != -1 ||
GBConversationalService.kmpSearch(text.toLowerCase(), item.code.toLowerCase()) != -1
GBConversationalService.kmpSearch(answer.toLowerCase(), item.name.toLowerCase()) != -1 ||
GBConversationalService.kmpSearch(answer.toLowerCase(), item.code.toLowerCase()) != -1
) {
result = item.code;
}
Expand Down

0 comments on commit bc5c1b0

Please sign in to comment.