From be63b71fd9a37ce68ecd3da8d3096f73a0817c3d Mon Sep 17 00:00:00 2001 From: Rodrigo Rodriguez Date: Sat, 1 Oct 2022 08:44:14 -0300 Subject: [PATCH] new(all): Twitter API. --- package-lock.json | 23 +++++-------------- package.json | 1 + packages/basic.gblib/services/GBVMService.ts | 2 +- .../basic.gblib/services/SystemKeywords.ts | 7 ++++-- .../services/GBConversationalService.ts | 2 ++ 5 files changed, 15 insertions(+), 20 deletions(-) diff --git a/package-lock.json b/package-lock.json index 759a86a9..b3a31279 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "botserver", - "version": "2.0.175", + "version": "2.0.176", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -14641,6 +14641,11 @@ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" }, + "isolated-vm": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/isolated-vm/-/isolated-vm-4.4.1.tgz", + "integrity": "sha512-5aDwxQGm78vHS+qJeUli2ILroG7OS/k3D/Mc0kcT9vyujiL4bV7PYYix1mAvuBm3v44nz2qcfAOqgAbhuACc/w==" + }, "isstream": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", @@ -25546,22 +25551,6 @@ "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" }, - "twitter": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/twitter/-/twitter-1.7.1.tgz", - "integrity": "sha512-Do7l/WzFnUZC14ABtZfDiOHKl6M9Ft5tE4YF0ev9XLm4yh7m8R98D82rzeDAMjbjMZk2R/tb6sgXXb3sPKoaVw==", - "requires": { - "deep-extend": "^0.5.0", - "request": "^2.72.0" - }, - "dependencies": { - "deep-extend": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.5.1.tgz", - "integrity": "sha512-N8vBdOa+DF7zkRrDCsaOXoCs/E2fJfx9B9MrKnnSiHNh4ws7eSys6YQE4KvT1cecKmOASYQBhbKjeuDD9lT81w==" - } - } - }, "twitter-api-v2": { "version": "1.12.7", "resolved": "https://registry.npmjs.org/twitter-api-v2/-/twitter-api-v2-1.12.7.tgz", diff --git a/package.json b/package.json index 2dcc339c..f5118833 100644 --- a/package.json +++ b/package.json @@ -95,6 +95,7 @@ "google-libphonenumber": "3.2.21", "googleapis": "75.0.0", "ibm-watson": "6.1.1", + "isolated-vm": "^4.4.1", "js-beautify": "1.13.13", "lodash": "^4.17.21", "luxon": "2.0.2", diff --git a/packages/basic.gblib/services/GBVMService.ts b/packages/basic.gblib/services/GBVMService.ts index db37a01b..942e156c 100644 --- a/packages/basic.gblib/services/GBVMService.ts +++ b/packages/basic.gblib/services/GBVMService.ts @@ -347,7 +347,7 @@ export class GBVMService extends GBService { else { - return `${$1} = sys().get (${$2}, headers)`; + return `${$1} = sys().get (${$2}, headers, httpUsername, httpPs)`; } }); diff --git a/packages/basic.gblib/services/SystemKeywords.ts b/packages/basic.gblib/services/SystemKeywords.ts index 1574a84d..30ee22e4 100644 --- a/packages/basic.gblib/services/SystemKeywords.ts +++ b/packages/basic.gblib/services/SystemKeywords.ts @@ -1644,7 +1644,10 @@ export class SystemKeywords { let found; if (key1Index) { const key1Value = row[key1]; - found = table[key1Index[key1Value][0]]; + const foundRow = key1Index[key1Value]; + if (foundRow) { + found = table[foundRow[0]]; + } } if (found) { @@ -1670,7 +1673,7 @@ export class SystemKeywords { args.push(row[keys[j]]); } - await this.save(file, args); + await this.save(file, ...args); adds++; } } diff --git a/packages/core.gbapp/services/GBConversationalService.ts b/packages/core.gbapp/services/GBConversationalService.ts index e0e01ab6..8ca53358 100644 --- a/packages/core.gbapp/services/GBConversationalService.ts +++ b/packages/core.gbapp/services/GBConversationalService.ts @@ -949,6 +949,8 @@ export class GBConversationalService { if (translate) { let replacements = []; + // To fix MSFT bug. + if (keepTextList) { keepTextList = keepTextList.filter(p => p.trim() !== ''); let i = 0;