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

Merge branch 'master' of https://github.com/GeneralBots/BotServer

Browse source
This commit is contained in:
Rodrigo Rodriguez 2022-04-26 17:02:13 -03:00
commit 6d68d212bf
5 changed files with 1576 additions and 1575 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -255,7 +255,8 @@ export class GBConversationalService {
}
public async sendEvent(min: GBMinInstance, step: GBDialogStep, name: string, value: Object): Promise<any> {
if (!this.userMobile(step)) {
if (!this.userMobile(step) &&
step.context.activity.channelId !== 'msteams') {
GBLog.info(`Sending event ${name}:${typeof value === 'object' ? JSON.stringify(value) :
value ? value : ''} to client...`);
const msg = MessageFactory.text('');

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

@ -1350,7 +1350,7 @@
} else {
const startDialog = user.hearOnDialog ?
user.hecallbackarOnDialog :
user.hearOnDialog :
min.core.getParam(min.instance, 'Start Dialog', null);
if (text !== startDialog) {
@ -1382,4 +1382,3 @@
}
}
}

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

@ -258,3 +258,4 @@ export class FeedbackDialog extends IGBDialog {
);
}
}

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

@ -188,9 +188,9 @@ export class AskDialog extends IGBDialog {
const locale = step.context.activity.locale;
// Stops any content on projector.
if (step.context.activity.channelId !== 'msteams') {
await min.conversationalService.sendEvent(min, step, 'stop', undefined);
}
// Handle extra text from FAQ.
if (step.options && step.options.query) {

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

@ -182,9 +182,9 @@ export class SecService extends GBService {
await CollectionUtil.asyncForEach(list, async item => {
if (
!(item !== undefined &&
item !== undefined &&
agentSystemId === undefined &&
item !== userSystemId && await this.isAgentSystemId(item))
item !== userSystemId && !await this.isAgentSystemId(item)
) {
// TODO: Optimize loop.
agentSystemId = item;