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

fix(basic.gblib): update ChatServices.ts #420

Closed
eltociear wants to merge 2540 commits from patch-1 into main
pull from: patch-1
merge into: GeneralBots:main
Conversation 1 Commits 2540 Files changed 292 +3 -2
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 508fe9fc31 - Show all commits

2
packages/core.gbapp/services/GBCoreService.ts
View file

@ -590,7 +590,7 @@ STORAGE_SYNC=true
return new Number(value ? defaultValue : defaultValue ? defaultValue : 0); return new Number(value ? defaultValue : defaultValue ? defaultValue : 0);
} }
if (instance['dataValues']) { if (instance['dataValues'] && !value) {
value = instance['dataValues'][name]; value = instance['dataValues'][name];
if (value === null) { if (value === null) {
const minBoot = GBServer.globals.minBoot as any; const minBoot = GBServer.globals.minBoot as any;

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

@ -190,6 +190,7 @@ export class GBMinService {
id, id,
`Agora falando com ${activeMin.instance.title}...` `Agora falando com ${activeMin.instance.title}...`
); );
let startDialog = activeMin.core.getParam(activeMin.instance, 'Start Dialog', null); let startDialog = activeMin.core.getParam(activeMin.instance, 'Start Dialog', null);
GBLog.info(`Auto start dialog is now being called: ${startDialog}...`); GBLog.info(`Auto start dialog is now being called: ${startDialog}...`);
if (startDialog) { if (startDialog) {
@ -199,7 +200,7 @@ export class GBMinService {
else { else {
res.end(); res.end();
} }
} else { } else {
activeMin = GBServer.globals.minInstances.filter(p => p.instance.instanceId === user.instanceId)[0]; activeMin = GBServer.globals.minInstances.filter(p => p.instance.instanceId === user.instanceId)[0];
if (activeMin === undefined) { if (activeMin === undefined) {
activeMin = GBServer.globals.minBoot; activeMin = GBServer.globals.minBoot;