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 +39 -30
1 changed files with 39 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 296b999ec3 - Show all commits

69
packages/basic.gblib/services/SystemKeywords.ts
View file

@ -464,29 +464,33 @@ export class SystemKeywords {
case 'date':
const resultDate = SystemKeywords.getDateFromLocaleString(result, contentLocale);
switch (filter.operator) {
case '=':
if (resultDate.getTime() == filter.value.getTime())
filterAcceptCount++;
break;
case '<':
if (resultDate.getTime() < filter.value.getTime())
filterAcceptCount++;
break;
case '>':
if (resultDate.getTime() > filter.value.getTime())
filterAcceptCount++;
break;
case '<=':
if (resultDate.getTime() <= filter.value.getTime())
filterAcceptCount++;
break;
case '>=':
if (resultDate.getTime() >= filter.value.getTime())
filterAcceptCount++;
break;
if (resultDate) {
switch (filter.operator) {
case '=':
if (resultDate.getTime() == filter.value.getTime())
filterAcceptCount++;
break;
case '<':
if (resultDate.getTime() < filter.value.getTime())
filterAcceptCount++;
break;
case '>':
if (resultDate.getTime() > filter.value.getTime())
filterAcceptCount++;
break;
case '<=':
if (resultDate.getTime() <= filter.value.getTime())
filterAcceptCount++;
break;
case '>=':
if (resultDate.getTime() >= filter.value.getTime())
filterAcceptCount++;
break;
}
break;
} else {
GBLog.info(`BASIC: FIND with NULL date in filter.`);
}
break;
}
});
@ -517,15 +521,20 @@ export class SystemKeywords {
private static getDateFromLocaleString(date: any, contentLocale: any) {
const parts = /^([0-3]?[0-9]).([0-3]?[0-9]).((?:[0-9]{2})?[0-9]{2})$/gi.exec(date);
switch (contentLocale) {
case 'pt':
date = new Date(Number.parseInt(parts[2]), Number.parseInt(parts[1]), Number.parseInt(parts[3]), 0, 0, 0, 0);
break;
case 'en':
date = new Date(Number.parseInt(parts[1]), Number.parseInt(parts[2]), Number.parseInt(parts[3]), 0, 0, 0, 0);
break;
if (parts[3]) {
switch (contentLocale) {
case 'pt':
date = new Date(Number.parseInt(parts[2]), Number.parseInt(parts[1]), Number.parseInt(parts[3]), 0, 0, 0, 0);
break;
case 'en':
date = new Date(Number.parseInt(parts[1]), Number.parseInt(parts[2]), Number.parseInt(parts[3]), 0, 0, 0, 0);
break;
}
return date;
}
else {
return null;
}
return date;
}
/**