Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/GeneralBots/BotServer
Browse files Browse the repository at this point in the history
  • Loading branch information
@rodrigorodriguez
rodrigorodriguez committed Feb 1, 2023
2 parents 2521117 + ceded7f commit 33a5efa
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 50 deletions.
38 changes: 11 additions & 27 deletions packages/basic.gblib/services/DialogKeywords.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -608,9 +608,6 @@ 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 @@ -619,17 +616,6 @@ 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 @@ -825,14 +811,12 @@ export class DialogKeywords {
await sleep(DEFAULT_HEAR_POLL_INTERVAL);
}

const answer = min.cbMap[userId].promise;
const text = 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', answer)) {
if (isIntentYes('pt-BR', text)) {
result = true;
} else {
result = false;
Expand Down Expand Up @@ -868,7 +852,7 @@ export class DialogKeywords {
return text.match(/\d+/gi);
};

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

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

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

if (value === null || value.length != 1) {
await this.talk({ pid, text: 'Por favor, digite uma data no formato 12/12/2020.' });
Expand All @@ -896,7 +880,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(answer);
const value = extractEntity(text);

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

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

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

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

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

await CollectionUtil.asyncForEach(list, async item => {
if (
GBConversationalService.kmpSearch(answer.toLowerCase(), item.name.toLowerCase()) != -1 ||
GBConversationalService.kmpSearch(answer.toLowerCase(), item.code.toLowerCase()) != -1
GBConversationalService.kmpSearch(text.toLowerCase(), item.name.toLowerCase()) != -1 ||
GBConversationalService.kmpSearch(text.toLowerCase(), item.code.toLowerCase()) != -1
) {
result = item.code;
}
Expand Down
41 changes: 18 additions & 23 deletions packages/core.gbapp/services/GBMinService.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -828,6 +828,7 @@ export class GBMinService {

// Get loaded user state

const member = context.activity.from;
const step = await min.dialogs.createContext(context);
step.context.activity.locale = 'pt-BR';
let firstTime = false;
Expand Down Expand Up @@ -1063,9 +1064,9 @@ export class GBMinService {

private static async downloadAttachmentAndWrite(attachment) {
const url = attachment.contentUrl;
// TODO: https://github.com/GeneralBots/BotServer/issues/195 - '${botId}','uploads');
// https://github.com/GeneralBots/BotServer/issues/195 - '${botId}','uploads');
const localFolder = Path.join('work');
const localFileName = Path.join(localFolder, `${this['min'].botId}.gbai`, 'uploads', attachment.name);
const localFileName = Path.join(localFolder, this['botId'],'uploads', attachment.name);

let res;
if (url.startsWith('data:')) {
Expand Down Expand Up @@ -1127,29 +1128,21 @@ export class GBMinService {

context.activity.text = context.activity.text.trim();

const member = context.activity.from;

let user = await sec.ensureUser(min.instance.instanceId, member.id, member.name, '', 'web', member.name, null);
const userId = user.userId;
const params = user.params ? JSON.parse(user.params) : {};

const user = await min.userProfile.get(context, {});
let message: GuaribasConversationMessage;
if (process.env.PRIVACY_STORE_MESSAGES === 'true') {
// Adds message to the analytics layer.

const analytics = new AnalyticsService();

if (user) {
let conversation;
if (!user.conversationId) {
conversation = await analytics.createConversation(user);
user.conversationId = conversation.Id;
if (!user.conversation) {
user.conversation = await analytics.createConversation(user.systemUser);
}

message = await analytics.createMessage(
min.instance.instanceId,
user.conversationId,
userId,
user.conversation,
user.systemUser.userId,
context.activity.text
);
}
Expand Down Expand Up @@ -1306,11 +1299,13 @@ export class GBMinService {
'Language Detector',
GBConfigService.getBoolean('LANGUAGE_DETECTOR')
) === 'true';
locale = user.locale;
const systemUser = user.systemUser;
locale = systemUser.locale;
if (text != '' && detectLanguage && !locale) {
locale = await min.conversationalService.getLanguage(min, text);
if (user.locale != locale) {
user = await sec.updateUserLocale(user.userId, locale);
if (systemUser.locale != locale) {
user.systemUser = await sec.updateUserLocale(systemUser.userId, locale);
await min.userProfile.set(step.context, user);
}
}

Expand Down Expand Up @@ -1346,10 +1341,10 @@ export class GBMinService {

GBLog.info(`Text>: ${text}.`);

if (user.agentMode === 'self') {
const manualUser = await sec.getUserFromAgentSystemId(user.userSystemId);
if (user.systemUser.agentMode === 'self') {
const manualUser = await sec.getUserFromAgentSystemId(user.systemUser.userSystemId);

GBLog.info(`HUMAN AGENT (${user.userId}) TO USER ${manualUser.userSystemId}: ${text}`);
GBLog.info(`HUMAN AGENT (${user.systemUser.userSystemId}) TO USER ${manualUser.userSystemId}: ${text}`);

const cmd = 'SEND FILE ';
if (text.startsWith(cmd)) {
Expand All @@ -1372,8 +1367,8 @@ export class GBMinService {
);
}
} else {
if (min.cbMap[userId] && min.cbMap[userId].promise == '!GBHEAR') {
min.cbMap[userId].promise = text;
if (min.cbMap[user.systemUser.userId] && min.cbMap[user.systemUser.userId].promise == '!GBHEAR') {
min.cbMap[user.systemUser.userId].promise = text;
}

// If there is a dialog in course, continue to the next step.
Expand Down

0 comments on commit 33a5efa

Please sign in to comment.