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

Adjustments in Hackathon.

Browse source
This commit is contained in:
Rafael Arenario Pereira da Silva 2018-08-19 12:34:37 -03:00
parent 2577f47504
commit 0dbe506681
7 changed files with 42 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
deploy/core.gbapp/services/GBMinService.ts
View file

@ -87,7 +87,7 @@ export class GBMinService {
} }
/** Constructs a new minimal instance for each bot. */ /** Constructs a new minimal instance for each bot. */
oneBotfix = false;
buildMin(cb: GBServiceCallback<GBMinInstance>, server: any, appPackages: Array<IGBPackage>, botPackages: Array<string>) { buildMin(cb: GBServiceCallback<GBMinInstance>, server: any, appPackages: Array<IGBPackage>, botPackages: Array<string>) {
var _this_ = this; var _this_ = this;
@ -185,8 +185,6 @@ export class GBMinService {
// Call the loadBot event for all packages. // Call the loadBot event for all packages.
appPackages.forEach(e => {
e.sysPackages = new Array<IGBPackage>();
[GBAdminPackage, GBAnalyticsPackage, GBCorePackage, GBSecurityPackage, [GBAdminPackage, GBAnalyticsPackage, GBCorePackage, GBSecurityPackage,
GBKBPackage, GBCustomerSatisfactionPackage, GBWhatsappPackage].forEach(sysPackage => { GBKBPackage, GBCustomerSatisfactionPackage, GBWhatsappPackage].forEach(sysPackage => {
logger.trace(`Loading sys package: ${sysPackage.name}...`); logger.trace(`Loading sys package: ${sysPackage.name}...`);
@ -200,16 +198,16 @@ export class GBMinService {
}); });
} }
}); });
});
botPackages.forEach(e => { if (!this.oneBotfix) {
[GBAdminPackage, GBAnalyticsPackage, GBCorePackage, GBSecurityPackage, [GBAdminPackage, GBAnalyticsPackage, GBCorePackage, GBSecurityPackage,
GBKBPackage, GBCustomerSatisfactionPackage, GBWhatsappPackage].forEach(sysPackage => { GBKBPackage, GBCustomerSatisfactionPackage, GBWhatsappPackage].forEach(sysPackage => {
logger.trace(`Loading sys package: ${sysPackage.name}...`); logger.trace(`Loading sys package: ${sysPackage.name}...`);
let p = Object.create(sysPackage.prototype) as IGBPackage; let p = Object.create(sysPackage.prototype) as IGBPackage;
p.loadBot(min); p.loadBot(min);
}); });
}); this.oneBotfix = true;
}
}); });
let connector = new gBuilder.ChatConnector({ let connector = new gBuilder.ChatConnector({

22
deploy/default.gbui/package-lock.json generated
View file

@ -1430,21 +1430,21 @@
"integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=" "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24="
}, },
"botframework-directlinejs": { "botframework-directlinejs": {
"version": "0.9.15", "version": "0.9.16",
"resolved": "https://registry.npmjs.org/botframework-directlinejs/-/botframework-directlinejs-0.9.15.tgz", "resolved": "https://registry.npmjs.org/botframework-directlinejs/-/botframework-directlinejs-0.9.16.tgz",
"integrity": "sha512-uDD5LMCckFKCl8Qr6TMnHjEcl1bKp/MTvlvzRsthvEoNTlzSLo7j8wHLlNYcisr3vPaMx+XAcBniUQjwBLImjQ==", "integrity": "sha512-HcIgeGUBH8zYy2ydlNTgS5GaOkK2BFcfkfSxgVWnF2nV0eIIE2nOepHfAYVtv70zQSX0dU9CedUNgQW343AA6Q==",
"requires": { "requires": {
"rxjs": "5.4.3" "rxjs": "5.4.3"
} }
}, },
"botframework-webchat": { "botframework-webchat": {
"version": "0.13.1", "version": "0.14.3-master.2cc3c75",
"resolved": "https://registry.npmjs.org/botframework-webchat/-/botframework-webchat-0.13.1.tgz", "resolved": "https://registry.npmjs.org/botframework-webchat/-/botframework-webchat-0.14.3-master.2cc3c75.tgz",
"integrity": "sha512-hF80h8xxvic8vgH0FnLY+zAgs17mAf4YKG8+Z0EP8MGXE4KhwCnLwntklhc0WUUY7afoOu+14yc4NBksVOSWuA==", "integrity": "sha512-aJmxAd2oPef9Jih1Ws+ebWJi1lHnCkC3OKawaAVCL6+yu7YeTqrCcPws9G2d8uUiqUzLJ9bvfKdCA2kDlpAe/A==",
"requires": { "requires": {
"adaptivecards": "1.0.0", "adaptivecards": "1.0.0",
"bluebird": "3.5.1", "bluebird": "3.5.1",
"botframework-directlinejs": "0.9.15", "botframework-directlinejs": "0.9.16",
"core-js": "2.4.1", "core-js": "2.4.1",
"jspeech": "0.1.1", "jspeech": "0.1.1",
"markdown-it": "8.3.1", "markdown-it": "8.3.1",
@ -1455,7 +1455,7 @@
"redux": "3.7.2", "redux": "3.7.2",
"redux-observable": "0.13.0", "redux-observable": "0.13.0",
"rxjs": "5.4.3", "rxjs": "5.4.3",
"simple-update-in": "1.2.0", "simple-update-in": "1.3.0",
"tslib": "1.7.1" "tslib": "1.7.1"
}, },
"dependencies": { "dependencies": {
@ -9876,9 +9876,9 @@
"integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=" "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
}, },
"simple-update-in": { "simple-update-in": {
"version": "1.2.0", "version": "1.3.0",
"resolved": "https://registry.npmjs.org/simple-update-in/-/simple-update-in-1.2.0.tgz", "resolved": "https://registry.npmjs.org/simple-update-in/-/simple-update-in-1.3.0.tgz",
"integrity": "sha512-a6s2H/Px+TXHlJG6FvBpVQU4qnz2BFjMzPfuzdqnGabKUntbIeRknTasCwlWKrXhD1QBSPZ9XoiGF8EpRLjpiQ==" "integrity": "sha512-XQdzyPAjHeqcBDJfUBKgfnurtE9Z/PC7Jh73DAiNlS4vMkdVTrtNpg5GJEGSDOtJ5LPQdZ/BWTx5GNzsP89mlA=="
}, },
"slash": { "slash": {
"version": "1.0.0", "version": "1.0.0",

2
deploy/default.gbui/package.json
View file

@ -9,7 +9,7 @@
"@fortawesome/fontawesome-svg-core": "^1.2.0-14", "@fortawesome/fontawesome-svg-core": "^1.2.0-14",
"@fortawesome/react-fontawesome": "0.1.0-11", "@fortawesome/react-fontawesome": "0.1.0-11",
"ajv": "^6.5.0", "ajv": "^6.5.0",
"botframework-webchat": "^0.13.1", "botframework-webchat": "^0.14.3-0",
"deep-extend": "^0.6.0", "deep-extend": "^0.6.0",
"fetch": "^1.1.0", "fetch": "^1.1.0",
"react": "^16.4.0", "react": "^16.4.0",

1
deploy/kb.gbapp/dialogs/AskDialog.ts
View file

@ -90,7 +90,6 @@ export class AskDialog extends IGBDialog {
resultsA.answer resultsA.answer
); );
session.userData.lastQuestionId = resultsA.questionId; session.userData.lastQuestionId = resultsA.questionId;
session.replaceDialog("/ask", { isReturning: true }); session.replaceDialog("/ask", { isReturning: true });
} else { } else {
//if (min.isAsking) { //if (min.isAsking) {

20
deploy/kb.gbapp/dialogs/FaqDialog.ts
View file

@ -67,5 +67,25 @@ export class FaqDialog extends IGBDialog {
matches: /^(faq|perguntas frequentes)/i matches: /^(faq|perguntas frequentes)/i
}); });
bot.beginDialogAction("faq", "/faq"); bot.beginDialogAction("faq", "/faq");
bot.dialog('/BuyProduct', [
(session, args, next) => {
let text = [
'Poderia me informar seu login?',
'Qual seu login?'
];
Prompts.text(session, text);
},
(session, results) => {
let code = results.response;
}
]).triggerAction({
matches: /^(comprar|comprar produto)/i
});
bot.beginDialogAction("BuyProduct", "/BuyProduct");
} }
} }

7
deploy/kb.gbapp/dialogs/MenuDialog.ts
View file

@ -130,8 +130,8 @@ export class MenuDialog extends IGBDialog {
"menuAction", "menuAction",
JSON.stringify({ JSON.stringify({
title: subject.title, title: subject.title,
subjectId: subject.subjectId, subjectId: subject.subjectId
to: subject.to //to: subject.to
}), }),
"Selecionar" "Selecionar"
); );
@ -145,7 +145,8 @@ export class MenuDialog extends IGBDialog {
"/kb", "/kb",
min.instance.kb, min.instance.kb,
"subjects", "subjects",
subject.internalId + ".png" // TODO: or fallback to subject.png "subject.png"
//subject.internalId + ".png"
) )
) )
]) // Using public dir of ui. ]) // Using public dir of ui.

2
deploy/whatsapp.gblib/services/WhatsappDirectLine.ts
View file

@ -204,7 +204,7 @@ export class WhatsappDirectLine extends GBService {
// Ignore own messages. // Ignore own messages.
// TODO: this.botId instead of "general-bot-9672a8d3" // TODO: this.botId instead of "general-bot-9672a8d3"
activities = activities.filter((m) => { return (m.from.id === "GeneralBot-Netshoes" || m.from.id.includes("4vqtLx3cFJgBAELkRib2K8")) && m.type === "message" }); activities = activities.filter((m) => { return (m.from.id === "GeneralBot-Netshoes") && m.type === "message" });
if (activities.length) { if (activities.length) {