From 780f975e7cc7e2b73821e63acaaa24fdf1264de4 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sat, 9 Oct 2021 10:08:33 +0200 Subject: [PATCH 01/11] Social-Bots Project --- .../Low-Frequency-Trading/TradingOrders.js | 2 +- .../Low-Frequency-Trading/TradingStages.js | 2 +- .../Bot-Modules/Trading-Bot/TradingSession.js | 2 +- .../Learning-Bot/LearningSession.js | 2 +- Projects/ProjectsSchema.json | 121 +++++++++++------- .../TS/Bot-Modules}/Announcements.js | 2 +- .../TS/Bot-Modules}/DiscordBot.js | 2 +- .../TS/Bot-Modules}/SlackBot.js | 2 +- .../TS/Bot-Modules}/SocialBots.js | 8 +- .../TS/Bot-Modules}/TelegramBot.js | 2 +- .../UI/Function-Libraries/ActionSwitch.js | 38 ++++++ .../Function-Libraries/SocialBotsFunctions.js | 2 +- 12 files changed, 123 insertions(+), 62 deletions(-) rename Projects/{Foundations/TS/Bot-Modules/Trading-Bot/Announcements => Social-Bots/TS/Bot-Modules}/Announcements.js (98%) rename Projects/{Foundations/TS/Bot-Modules/Trading-Bot/Announcements => Social-Bots/TS/Bot-Modules}/DiscordBot.js (97%) rename Projects/{Foundations/TS/Bot-Modules/Trading-Bot/Announcements => Social-Bots/TS/Bot-Modules}/SlackBot.js (97%) rename Projects/{Foundations/TS/Bot-Modules/Trading-Bot/Announcements => Social-Bots/TS/Bot-Modules}/SocialBots.js (95%) rename Projects/{Foundations/TS/Bot-Modules/Trading-Bot/Announcements => Social-Bots/TS/Bot-Modules}/TelegramBot.js (98%) create mode 100644 Projects/Social-Bots/UI/Function-Libraries/ActionSwitch.js rename Projects/{Foundations => Social-Bots}/UI/Function-Libraries/SocialBotsFunctions.js (99%) diff --git a/Projects/Algorithmic-Trading/TS/Bot-Modules/Trading-Bot/Low-Frequency-Trading/TradingOrders.js b/Projects/Algorithmic-Trading/TS/Bot-Modules/Trading-Bot/Low-Frequency-Trading/TradingOrders.js index a821d7440..4558064e4 100644 --- a/Projects/Algorithmic-Trading/TS/Bot-Modules/Trading-Bot/Low-Frequency-Trading/TradingOrders.js +++ b/Projects/Algorithmic-Trading/TS/Bot-Modules/Trading-Bot/Low-Frequency-Trading/TradingOrders.js @@ -17,7 +17,7 @@ exports.newAlgorithmicTradingBotModulesTradingOrders = function (processIndex) { let sessionParameters let exchangeAPIModuleObject = TS.projects.algorithmicTrading.botModules.exchangeAPI.newAlgorithmicTradingBotModulesExchangeAPI(processIndex) - let announcementsModuleObject = TS.projects.foundations.botModules.announcements.newFoundationsBotModulesAnnouncements(processIndex) + let announcementsModuleObject = TS.projects.foundations.botModules.announcements.newSocialBotsBotModulesAnnouncements(processIndex) return thisObject diff --git a/Projects/Algorithmic-Trading/TS/Bot-Modules/Trading-Bot/Low-Frequency-Trading/TradingStages.js b/Projects/Algorithmic-Trading/TS/Bot-Modules/Trading-Bot/Low-Frequency-Trading/TradingStages.js index a1e1a0de1..31458fe13 100644 --- a/Projects/Algorithmic-Trading/TS/Bot-Modules/Trading-Bot/Low-Frequency-Trading/TradingStages.js +++ b/Projects/Algorithmic-Trading/TS/Bot-Modules/Trading-Bot/Low-Frequency-Trading/TradingStages.js @@ -24,7 +24,7 @@ exports.newAlgorithmicTradingBotModulesTradingStages = function (processIndex) { let tradingStrategyModuleObject = TS.projects.algorithmicTrading.botModules.tradingStrategy.newAlgorithmicTradingBotModulesTradingStrategy(processIndex) let tradingPositionModuleObject = TS.projects.algorithmicTrading.botModules.tradingPosition.newAlgorithmicTradingBotModulesTradingPosition(processIndex) let tradingExecutionModuleObject = TS.projects.algorithmicTrading.botModules.tradingExecution.newAlgorithmicTradingBotModulesTradingExecution(processIndex) - let announcementsModuleObject = TS.projects.foundations.botModules.announcements.newFoundationsBotModulesAnnouncements(processIndex) + let announcementsModuleObject = TS.projects.foundations.botModules.announcements.newSocialBotsBotModulesAnnouncements(processIndex) let snapshotsModuleObject = TS.projects.algorithmicTrading.botModules.snapshots.newAlgorithmicTradingBotModulesSnapshots(processIndex) let tradingEpisodeModuleObject = TS.projects.algorithmicTrading.botModules.tradingEpisode.newAlgorithmicTradingBotModulesTradingEpisode(processIndex) diff --git a/Projects/Algorithmic-Trading/TS/Bot-Modules/Trading-Bot/TradingSession.js b/Projects/Algorithmic-Trading/TS/Bot-Modules/Trading-Bot/TradingSession.js index d9d3586ee..081e044bb 100644 --- a/Projects/Algorithmic-Trading/TS/Bot-Modules/Trading-Bot/TradingSession.js +++ b/Projects/Algorithmic-Trading/TS/Bot-Modules/Trading-Bot/TradingSession.js @@ -7,7 +7,7 @@ } TS.projects.foundations.globals.processVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).SOCIAL_BOTS_MODULE = - TS.projects.foundations.botModules.socialBots.newFoundationsBotModulesSocialBots(processIndex) + TS.projects.foundations.botModules.socialBots.newSocialBotsBotModulesSocialBots(processIndex) return thisObject; diff --git a/Projects/Machine-Learning/TS/Bot-Modules/Learning-Bot/LearningSession.js b/Projects/Machine-Learning/TS/Bot-Modules/Learning-Bot/LearningSession.js index 50459a29f..3831288b2 100644 --- a/Projects/Machine-Learning/TS/Bot-Modules/Learning-Bot/LearningSession.js +++ b/Projects/Machine-Learning/TS/Bot-Modules/Learning-Bot/LearningSession.js @@ -7,7 +7,7 @@ } TS.projects.foundations.globals.processVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).SOCIAL_BOTS_MODULE = - TS.projects.foundations.botModules.socialBots.newFoundationsBotModulesSocialBots(processIndex) + TS.projects.foundations.botModules.socialBots.newSocialBotsBotModulesSocialBots(processIndex) return thisObject; diff --git a/Projects/ProjectsSchema.json b/Projects/ProjectsSchema.json index a8544b17a..8a72cd471 100644 --- a/Projects/ProjectsSchema.json +++ b/Projects/ProjectsSchema.json @@ -331,11 +331,6 @@ "name": "Workspace Functions", "propertyName": "workspaceFunctions", "functionName": "newFoundationsFunctionLibraryWorkspaceFunctions" - }, - { - "name": "Social Bots Functions", - "propertyName": "socialBotsFunctions", - "functionName": "newFoundationsFunctionLibrarySocialBotsFunctions" } ], "utilities": [ @@ -739,50 +734,7 @@ "fileName": "ProcessOutput.js" } ], - "botModules": [ - { - "name": "Announcements", - "propertyName": "announcements", - "functionName": "newFoundationsBotModulesAnnouncements", - "fileName": "Announcements.js", - "folderName": "Trading-Bot/Announcements" - }, - { - "name": "Social Bots", - "propertyName": "socialBots", - "functionName": "newFoundationsBotModulesSocialBots", - "fileName": "SocialBots.js", - "folderName": "Trading-Bot/Announcements" - }, - { - "name": "Telegram Bot", - "propertyName": "telegramBot", - "functionName": "newFoundationsBotModulesTelegramBot", - "fileName": "TelegramBot.js", - "folderName": "Trading-Bot/Announcements" - }, - { - "name": "Discord Bot", - "propertyName": "discordBot", - "functionName": "newFoundationsBotModulesDiscordBot", - "fileName": "DiscordBot.js", - "folderName": "Trading-Bot/Announcements" - }, - { - "name": "Slack Bot", - "propertyName": "slackBot", - "functionName": "newFoundationsBotModulesSlackBot", - "fileName": "SlackBot.js", - "folderName": "Trading-Bot/Announcements" - }, - { - "name": "Twitter Bot", - "propertyName": "twitterBot", - "functionName": "newFoundationsBotModulesTwitterBot", - "fileName": "TwitterBot.js", - "folderName": "Trading-Bot/Announcements" - } - ] + "botModules": [] }, "PL": { "utilities": [ @@ -1599,5 +1551,76 @@ } ] } + }, + { + "name": "Social-Bots", + "propertyName": "socialBots", + "UI": { + "functionLibraries": [ + { + "name": "Social Bots Functions", + "propertyName": "socialBotsFunctions", + "functionName": "newSocialBotsFunctionLibrarySocialBotsFunctions" + } + ], + "utilities": [] + }, + "TS": { + "botModules": [ + { + "name": "Announcements", + "propertyName": "announcements", + "functionName": "newSocialBotsBotModulesAnnouncements", + "fileName": "Announcements.js", + "folderName": "" + }, + { + "name": "Social Bots", + "propertyName": "socialBots", + "functionName": "newSocialBotsBotModulesSocialBots", + "fileName": "SocialBots.js", + "folderName": "" + }, + { + "name": "Telegram Bot", + "propertyName": "telegramBot", + "functionName": "newSocialBotsBotModulesTelegramBot", + "fileName": "TelegramBot.js", + "folderName": "" + }, + { + "name": "Discord Bot", + "propertyName": "discordBot", + "functionName": "newSocialBotsBotModulesDiscordBot", + "fileName": "DiscordBot.js", + "folderName": "" + }, + { + "name": "Slack Bot", + "propertyName": "slackBot", + "functionName": "newSocialBotsBotModulesSlackBot", + "fileName": "SlackBot.js", + "folderName": "" + }, + { + "name": "Twitter Bot", + "propertyName": "twitterBot", + "functionName": "newSocialBotsBotModulesTwitterBot", + "fileName": "TwitterBot.js", + "folderName": "" + } + ] + } + }, + { + "name": "Visual-Scripting", + "propertyName": "visualScripting", + "UI": { + "functionLibraries": [], + "utilities": [] + }, + "TS": { + "botModules": [] + } } ] \ No newline at end of file diff --git a/Projects/Foundations/TS/Bot-Modules/Trading-Bot/Announcements/Announcements.js b/Projects/Social-Bots/TS/Bot-Modules/Announcements.js similarity index 98% rename from Projects/Foundations/TS/Bot-Modules/Trading-Bot/Announcements/Announcements.js rename to Projects/Social-Bots/TS/Bot-Modules/Announcements.js index d0e5821a3..509531592 100644 --- a/Projects/Foundations/TS/Bot-Modules/Trading-Bot/Announcements/Announcements.js +++ b/Projects/Social-Bots/TS/Bot-Modules/Announcements.js @@ -1,4 +1,4 @@ -exports.newFoundationsBotModulesAnnouncements = function (processIndex) { +exports.newSocialBotsBotModulesAnnouncements = function (processIndex) { const MODULE_NAME = 'Announcements' diff --git a/Projects/Foundations/TS/Bot-Modules/Trading-Bot/Announcements/DiscordBot.js b/Projects/Social-Bots/TS/Bot-Modules/DiscordBot.js similarity index 97% rename from Projects/Foundations/TS/Bot-Modules/Trading-Bot/Announcements/DiscordBot.js rename to Projects/Social-Bots/TS/Bot-Modules/DiscordBot.js index c64b09847..6f1a4c8dd 100644 --- a/Projects/Foundations/TS/Bot-Modules/Trading-Bot/Announcements/DiscordBot.js +++ b/Projects/Social-Bots/TS/Bot-Modules/DiscordBot.js @@ -1,4 +1,4 @@ -exports.newFoundationsBotModulesDiscordBot = function (processIndex) { +exports.newSocialBotsBotModulesDiscordBot = function (processIndex) { const MODULE_NAME = 'Discord Bot' diff --git a/Projects/Foundations/TS/Bot-Modules/Trading-Bot/Announcements/SlackBot.js b/Projects/Social-Bots/TS/Bot-Modules/SlackBot.js similarity index 97% rename from Projects/Foundations/TS/Bot-Modules/Trading-Bot/Announcements/SlackBot.js rename to Projects/Social-Bots/TS/Bot-Modules/SlackBot.js index 09136775a..f266debd1 100644 --- a/Projects/Foundations/TS/Bot-Modules/Trading-Bot/Announcements/SlackBot.js +++ b/Projects/Social-Bots/TS/Bot-Modules/SlackBot.js @@ -1,4 +1,4 @@ -exports.newFoundationsBotModulesSlackBot = function (processIndex) { +exports.newSocialBotsBotModulesSlackBot = function (processIndex) { const MODULE_NAME = 'Slack Bot' diff --git a/Projects/Foundations/TS/Bot-Modules/Trading-Bot/Announcements/SocialBots.js b/Projects/Social-Bots/TS/Bot-Modules/SocialBots.js similarity index 95% rename from Projects/Foundations/TS/Bot-Modules/Trading-Bot/Announcements/SocialBots.js rename to Projects/Social-Bots/TS/Bot-Modules/SocialBots.js index bae559bce..3dbbb07a6 100644 --- a/Projects/Foundations/TS/Bot-Modules/Trading-Bot/Announcements/SocialBots.js +++ b/Projects/Social-Bots/TS/Bot-Modules/SocialBots.js @@ -1,4 +1,4 @@ -exports.newFoundationsBotModulesSocialBots = function (processIndex) { +exports.newSocialBotsBotModulesSocialBots = function (processIndex) { const MODULE_NAME = 'Social Bots' @@ -19,13 +19,13 @@ exports.newFoundationsBotModulesSocialBots = function (processIndex) { let config = socialBot.config let commands = socialBot.socialBotCommand if (socialBot.type === "Telegram Bot") { - socialBot.botInstance = TS.projects.foundations.botModules.telegramBot.newFoundationsBotModulesTelegramBot(processIndex) + socialBot.botInstance = TS.projects.foundations.botModules.telegramBot.newSocialBotsBotModulesTelegramBot(processIndex) socialBot.botInstance.initialize(config, commands) } else if (socialBot.type === "Discord Bot") { - socialBot.botInstance = TS.projects.foundations.botModules.discordBot.newFoundationsBotModulesDiscordBot(processIndex) + socialBot.botInstance = TS.projects.foundations.botModules.discordBot.newSocialBotsBotModulesDiscordBot(processIndex) socialBot.botInstance.initialize(config) } else if (socialBot.type === "Slack Bot") { - socialBot.botInstance = TS.projects.foundations.botModules.slackBot.newFoundationsBotModulesSlackBot(processIndex) + socialBot.botInstance = TS.projects.foundations.botModules.slackBot.newSocialBotsBotModulesSlackBot(processIndex) socialBot.botInstance.initialize(config) } } diff --git a/Projects/Foundations/TS/Bot-Modules/Trading-Bot/Announcements/TelegramBot.js b/Projects/Social-Bots/TS/Bot-Modules/TelegramBot.js similarity index 98% rename from Projects/Foundations/TS/Bot-Modules/Trading-Bot/Announcements/TelegramBot.js rename to Projects/Social-Bots/TS/Bot-Modules/TelegramBot.js index 5fe10448c..72437baaa 100644 --- a/Projects/Foundations/TS/Bot-Modules/Trading-Bot/Announcements/TelegramBot.js +++ b/Projects/Social-Bots/TS/Bot-Modules/TelegramBot.js @@ -1,4 +1,4 @@ -exports.newFoundationsBotModulesTelegramBot = function (processIndex) { +exports.newSocialBotsBotModulesTelegramBot = function (processIndex) { const MODULE_NAME = 'Telegram Bot' diff --git a/Projects/Social-Bots/UI/Function-Libraries/ActionSwitch.js b/Projects/Social-Bots/UI/Function-Libraries/ActionSwitch.js new file mode 100644 index 000000000..c8ee8cb63 --- /dev/null +++ b/Projects/Social-Bots/UI/Function-Libraries/ActionSwitch.js @@ -0,0 +1,38 @@ +function newSocialBotsActionSwitch() { + + let thisObject = { + executeAction: executeAction, + initialize: initialize, + finalize: finalize + } + + return thisObject + + function finalize() { + + } + + function initialize() { + /* Nothing to initialize since a Function Library does not hold any state. */ + } + + async function executeAction(action) { + switch (action.name) { + case 'Add All Output Datasets': + { + UI.projects.dataMining.functionLibraries.mineFunctions.addAllOutputDatasets(action.node) + } + break + case 'Add All Data Dependencies': + { + UI.projects.dataMining.functionLibraries.mineFunctions.addAllDataDependencies(action.node) + } + break + case 'Add All Data Mine Dependencies': + { + UI.projects.dataMining.functionLibraries.mineFunctions.addAllDataMineDataDependencies(action.node, action.rootNodes) + } + break + } + } +} diff --git a/Projects/Foundations/UI/Function-Libraries/SocialBotsFunctions.js b/Projects/Social-Bots/UI/Function-Libraries/SocialBotsFunctions.js similarity index 99% rename from Projects/Foundations/UI/Function-Libraries/SocialBotsFunctions.js rename to Projects/Social-Bots/UI/Function-Libraries/SocialBotsFunctions.js index 37a675e10..31923fe33 100644 --- a/Projects/Foundations/UI/Function-Libraries/SocialBotsFunctions.js +++ b/Projects/Social-Bots/UI/Function-Libraries/SocialBotsFunctions.js @@ -1,4 +1,4 @@ -function newFoundationsFunctionLibrarySocialBotsFunctions() { +function newSocialBotsFunctionLibrarySocialBotsFunctions() { let thisObject = { sendTelegramTestMessage: sendTelegramTestMessage, sendDiscordTestMessage: sendDiscordTestMessage, From 780fce04ffc1bb4cecaa442bb904acb528287e87 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sat, 9 Oct 2021 10:15:55 +0200 Subject: [PATCH 02/11] Schemas and Icons moved --- .../Icons/Announcement/announcement-condition.png | Bin .../Icons/Announcement/announcement-formula.png | Bin .../Icons/Announcement/announcement.png | Bin .../Icons/Announcement/discord-bot.png | Bin .../Icons/Announcement}/slack-bot.png | Bin .../Icons/Announcement/telegram-bot.png | Bin .../Schemas}/announcement-condition.json | 0 .../Schemas}/announcement-formula.json | 0 .../Schemas}/announcement.json | 0 .../Schemas}/discord-bot.json | 0 .../Schemas}/slack-bot.json | 0 .../Schemas}/social-bot-command.json | 0 .../Schemas}/social-bots.json | 0 .../Schemas}/telegram-bot.json | 0 14 files changed, 0 insertions(+), 0 deletions(-) rename Projects/{Foundations => Social-Bots}/Icons/Announcement/announcement-condition.png (100%) rename Projects/{Foundations => Social-Bots}/Icons/Announcement/announcement-formula.png (100%) rename Projects/{Foundations => Social-Bots}/Icons/Announcement/announcement.png (100%) rename Projects/{Foundations => Social-Bots}/Icons/Announcement/discord-bot.png (100%) rename Projects/{Foundations/Icons => Social-Bots/Icons/Announcement}/slack-bot.png (100%) rename Projects/{Foundations => Social-Bots}/Icons/Announcement/telegram-bot.png (100%) rename Projects/{Foundations/Schemas/App-Schema => Social-Bots/Schemas}/announcement-condition.json (100%) rename Projects/{Foundations/Schemas/App-Schema => Social-Bots/Schemas}/announcement-formula.json (100%) rename Projects/{Foundations/Schemas/App-Schema => Social-Bots/Schemas}/announcement.json (100%) rename Projects/{Foundations/Schemas/App-Schema => Social-Bots/Schemas}/discord-bot.json (100%) rename Projects/{Foundations/Schemas/App-Schema => Social-Bots/Schemas}/slack-bot.json (100%) rename Projects/{Foundations/Schemas/App-Schema => Social-Bots/Schemas}/social-bot-command.json (100%) rename Projects/{Foundations/Schemas/App-Schema => Social-Bots/Schemas}/social-bots.json (100%) rename Projects/{Foundations/Schemas/App-Schema => Social-Bots/Schemas}/telegram-bot.json (100%) diff --git a/Projects/Foundations/Icons/Announcement/announcement-condition.png b/Projects/Social-Bots/Icons/Announcement/announcement-condition.png similarity index 100% rename from Projects/Foundations/Icons/Announcement/announcement-condition.png rename to Projects/Social-Bots/Icons/Announcement/announcement-condition.png diff --git a/Projects/Foundations/Icons/Announcement/announcement-formula.png b/Projects/Social-Bots/Icons/Announcement/announcement-formula.png similarity index 100% rename from Projects/Foundations/Icons/Announcement/announcement-formula.png rename to Projects/Social-Bots/Icons/Announcement/announcement-formula.png diff --git a/Projects/Foundations/Icons/Announcement/announcement.png b/Projects/Social-Bots/Icons/Announcement/announcement.png similarity index 100% rename from Projects/Foundations/Icons/Announcement/announcement.png rename to Projects/Social-Bots/Icons/Announcement/announcement.png diff --git a/Projects/Foundations/Icons/Announcement/discord-bot.png b/Projects/Social-Bots/Icons/Announcement/discord-bot.png similarity index 100% rename from Projects/Foundations/Icons/Announcement/discord-bot.png rename to Projects/Social-Bots/Icons/Announcement/discord-bot.png diff --git a/Projects/Foundations/Icons/slack-bot.png b/Projects/Social-Bots/Icons/Announcement/slack-bot.png similarity index 100% rename from Projects/Foundations/Icons/slack-bot.png rename to Projects/Social-Bots/Icons/Announcement/slack-bot.png diff --git a/Projects/Foundations/Icons/Announcement/telegram-bot.png b/Projects/Social-Bots/Icons/Announcement/telegram-bot.png similarity index 100% rename from Projects/Foundations/Icons/Announcement/telegram-bot.png rename to Projects/Social-Bots/Icons/Announcement/telegram-bot.png diff --git a/Projects/Foundations/Schemas/App-Schema/announcement-condition.json b/Projects/Social-Bots/Schemas/announcement-condition.json similarity index 100% rename from Projects/Foundations/Schemas/App-Schema/announcement-condition.json rename to Projects/Social-Bots/Schemas/announcement-condition.json diff --git a/Projects/Foundations/Schemas/App-Schema/announcement-formula.json b/Projects/Social-Bots/Schemas/announcement-formula.json similarity index 100% rename from Projects/Foundations/Schemas/App-Schema/announcement-formula.json rename to Projects/Social-Bots/Schemas/announcement-formula.json diff --git a/Projects/Foundations/Schemas/App-Schema/announcement.json b/Projects/Social-Bots/Schemas/announcement.json similarity index 100% rename from Projects/Foundations/Schemas/App-Schema/announcement.json rename to Projects/Social-Bots/Schemas/announcement.json diff --git a/Projects/Foundations/Schemas/App-Schema/discord-bot.json b/Projects/Social-Bots/Schemas/discord-bot.json similarity index 100% rename from Projects/Foundations/Schemas/App-Schema/discord-bot.json rename to Projects/Social-Bots/Schemas/discord-bot.json diff --git a/Projects/Foundations/Schemas/App-Schema/slack-bot.json b/Projects/Social-Bots/Schemas/slack-bot.json similarity index 100% rename from Projects/Foundations/Schemas/App-Schema/slack-bot.json rename to Projects/Social-Bots/Schemas/slack-bot.json diff --git a/Projects/Foundations/Schemas/App-Schema/social-bot-command.json b/Projects/Social-Bots/Schemas/social-bot-command.json similarity index 100% rename from Projects/Foundations/Schemas/App-Schema/social-bot-command.json rename to Projects/Social-Bots/Schemas/social-bot-command.json diff --git a/Projects/Foundations/Schemas/App-Schema/social-bots.json b/Projects/Social-Bots/Schemas/social-bots.json similarity index 100% rename from Projects/Foundations/Schemas/App-Schema/social-bots.json rename to Projects/Social-Bots/Schemas/social-bots.json diff --git a/Projects/Foundations/Schemas/App-Schema/telegram-bot.json b/Projects/Social-Bots/Schemas/telegram-bot.json similarity index 100% rename from Projects/Foundations/Schemas/App-Schema/telegram-bot.json rename to Projects/Social-Bots/Schemas/telegram-bot.json From 8f79f397236f958e15d33cf4b59fbf23288bc078 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sat, 9 Oct 2021 10:23:42 +0200 Subject: [PATCH 03/11] Schemas with project fixed --- .../announcement-condition.json | 6 ++++-- .../announcement-formula.json | 6 ++++-- .../{ => App-Schema}/announcement.json | 18 ++++++++++------ .../Schemas/{ => App-Schema}/discord-bot.json | 6 ++++-- .../Schemas/{ => App-Schema}/slack-bot.json | 6 ++++-- .../{ => App-Schema}/social-bot-command.json | 12 +++++++---- .../Schemas/{ => App-Schema}/social-bots.json | 21 ++++++++++++------- .../{ => App-Schema}/telegram-bot.json | 12 +++++++---- 8 files changed, 58 insertions(+), 29 deletions(-) rename Projects/Social-Bots/Schemas/{ => App-Schema}/announcement-condition.json (82%) rename Projects/Social-Bots/Schemas/{ => App-Schema}/announcement-formula.json (80%) rename Projects/Social-Bots/Schemas/{ => App-Schema}/announcement.json (78%) rename Projects/Social-Bots/Schemas/{ => App-Schema}/discord-bot.json (86%) rename Projects/Social-Bots/Schemas/{ => App-Schema}/slack-bot.json (86%) rename Projects/Social-Bots/Schemas/{ => App-Schema}/social-bot-command.json (78%) rename Projects/Social-Bots/Schemas/{ => App-Schema}/social-bots.json (71%) rename Projects/Social-Bots/Schemas/{ => App-Schema}/telegram-bot.json (81%) diff --git a/Projects/Social-Bots/Schemas/announcement-condition.json b/Projects/Social-Bots/Schemas/App-Schema/announcement-condition.json similarity index 82% rename from Projects/Social-Bots/Schemas/announcement-condition.json rename to Projects/Social-Bots/Schemas/App-Schema/announcement-condition.json index 5d4a232f7..84dc7150d 100644 --- a/Projects/Social-Bots/Schemas/announcement-condition.json +++ b/Projects/Social-Bots/Schemas/App-Schema/announcement-condition.json @@ -9,7 +9,8 @@ "actionFunction": "uiObject.codeEditor.activate", "label": "Configure", "iconPathOn": "configuration", - "iconPathOff": "configuration" + "iconPathOff": "configuration", + "actionProject": "Foundations" }, { "action": "Delete UI Object", @@ -18,7 +19,8 @@ "label": "Delete", "iconPathOn": "delete-entity", "iconPathOff": "delete-entity", - "actionFunction": "payload.executeAction" + "actionFunction": "payload.executeAction", + "actionProject": "Foundations" } ], "initialValues": { diff --git a/Projects/Social-Bots/Schemas/announcement-formula.json b/Projects/Social-Bots/Schemas/App-Schema/announcement-formula.json similarity index 80% rename from Projects/Social-Bots/Schemas/announcement-formula.json rename to Projects/Social-Bots/Schemas/App-Schema/announcement-formula.json index a6e1ad4dd..513014334 100644 --- a/Projects/Social-Bots/Schemas/announcement-formula.json +++ b/Projects/Social-Bots/Schemas/App-Schema/announcement-formula.json @@ -7,7 +7,8 @@ "iconPathOn": "javascript-code", "iconPathOff": "javascript-code", "dontShowAtFullscreen": true, - "actionFunction": "uiObject.formulaEditor.activate" + "actionFunction": "uiObject.formulaEditor.activate", + "actionProject": "Foundations" }, { "action": "Delete UI Object", @@ -16,7 +17,8 @@ "label": "Delete", "iconPathOn": "delete-entity", "iconPathOff": "delete-entity", - "actionFunction": "payload.executeAction" + "actionFunction": "payload.executeAction", + "actionProject": "Foundations" } ], "addLeftIcons": true, diff --git a/Projects/Social-Bots/Schemas/announcement.json b/Projects/Social-Bots/Schemas/App-Schema/announcement.json similarity index 78% rename from Projects/Social-Bots/Schemas/announcement.json rename to Projects/Social-Bots/Schemas/App-Schema/announcement.json index aaba138aa..6f6639ae4 100644 --- a/Projects/Social-Bots/Schemas/announcement.json +++ b/Projects/Social-Bots/Schemas/App-Schema/announcement.json @@ -9,7 +9,8 @@ "actionFunction": "uiObject.configEditor.activate", "label": "Configure", "iconPathOn": "configuration", - "iconPathOff": "configuration" + "iconPathOff": "configuration", + "actionProject": "Foundations" }, { "action": "Add UI Object", @@ -17,7 +18,8 @@ "propertyToCheckFor": "announcementFormula", "label": "Add Announcement Formula", "relatedUiObject": "Announcement Formula", - "actionFunction": "payload.executeAction" + "actionFunction": "payload.executeAction", + "actionProject": "Foundations" }, { "action": "Add UI Object", @@ -25,7 +27,8 @@ "propertyToCheckFor": "announcementCondition", "label": "Add Announcement Condition", "relatedUiObject": "Announcement Condition", - "actionFunction": "payload.executeAction" + "actionFunction": "payload.executeAction", + "actionProject": "Foundations" }, { "action": "Delete UI Object", @@ -34,7 +37,8 @@ "label": "Delete", "iconPathOn": "delete-entity", "iconPathOff": "delete-entity", - "actionFunction": "payload.executeAction" + "actionFunction": "payload.executeAction", + "actionProject": "Foundations" } ], "initialValues": { @@ -50,13 +54,15 @@ "name": "announcementFormula", "type": "node", "childType": "Announcement Formula", - "autoAdd": true + "autoAdd": true, + "project": "Social-Bots" }, { "name": "announcementCondition", "type": "node", "childType": "Announcement Condition", - "autoAdd": true + "autoAdd": true, + "project": "Social-Bots" } ], "propertyNameAtParent": "announcements" diff --git a/Projects/Social-Bots/Schemas/discord-bot.json b/Projects/Social-Bots/Schemas/App-Schema/discord-bot.json similarity index 86% rename from Projects/Social-Bots/Schemas/discord-bot.json rename to Projects/Social-Bots/Schemas/App-Schema/discord-bot.json index 7209448d2..6a54c294b 100644 --- a/Projects/Social-Bots/Schemas/discord-bot.json +++ b/Projects/Social-Bots/Schemas/App-Schema/discord-bot.json @@ -9,7 +9,8 @@ "actionFunction": "uiObject.configEditor.activate", "label": "Configure", "iconPathOn": "configuration", - "iconPathOff": "configuration" + "iconPathOff": "configuration", + "actionProject": "Foundations" }, { "action": "Send Discord Test Message", @@ -25,7 +26,8 @@ "label": "Delete", "iconPathOn": "delete-entity", "iconPathOff": "delete-entity", - "actionFunction": "payload.executeAction" + "actionFunction": "payload.executeAction", + "actionProject": "Foundations" } ], "initialValues": { diff --git a/Projects/Social-Bots/Schemas/slack-bot.json b/Projects/Social-Bots/Schemas/App-Schema/slack-bot.json similarity index 86% rename from Projects/Social-Bots/Schemas/slack-bot.json rename to Projects/Social-Bots/Schemas/App-Schema/slack-bot.json index d672e4b2d..68aceafd9 100644 --- a/Projects/Social-Bots/Schemas/slack-bot.json +++ b/Projects/Social-Bots/Schemas/App-Schema/slack-bot.json @@ -9,7 +9,8 @@ "actionFunction": "uiObject.configEditor.activate", "label": "Configure", "iconPathOn": "configuration", - "iconPathOff": "configuration" + "iconPathOff": "configuration", + "actionProject": "Foundations" }, { "action": "Send Slack Test Message", @@ -25,7 +26,8 @@ "label": "Delete", "iconPathOn": "delete-entity", "iconPathOff": "delete-entity", - "actionFunction": "payload.executeAction" + "actionFunction": "payload.executeAction", + "actionProject": "Foundations" } ], "initialValues": { diff --git a/Projects/Social-Bots/Schemas/social-bot-command.json b/Projects/Social-Bots/Schemas/App-Schema/social-bot-command.json similarity index 78% rename from Projects/Social-Bots/Schemas/social-bot-command.json rename to Projects/Social-Bots/Schemas/App-Schema/social-bot-command.json index dd25f533a..cace9448d 100644 --- a/Projects/Social-Bots/Schemas/social-bot-command.json +++ b/Projects/Social-Bots/Schemas/App-Schema/social-bot-command.json @@ -9,7 +9,8 @@ "actionFunction": "uiObject.configEditor.activate", "label": "Configure", "iconPathOn": "configuration", - "iconPathOff": "configuration" + "iconPathOff": "configuration", + "actionProject": "Foundations" }, { "action": "Add UI Object", @@ -17,7 +18,8 @@ "propertyToCheckFor": "formula", "label": "Add Formula", "relatedUiObject": "Formula", - "actionFunction": "payload.executeAction" + "actionFunction": "payload.executeAction", + "actionProject": "Foundations" }, { "action": "Delete UI Object", @@ -26,7 +28,8 @@ "label": "Delete", "iconPathOn": "delete-entity", "iconPathOff": "delete-entity", - "actionFunction": "payload.executeAction" + "actionFunction": "payload.executeAction", + "actionProject": "Foundations" } ], "initialValues": { @@ -42,7 +45,8 @@ "name": "formula", "type": "node", "childType": "Formula", - "autoAdd": true + "autoAdd": true, + "project": "Foundations" } ], "propertyNameAtParent": "socialBotCommand" diff --git a/Projects/Social-Bots/Schemas/social-bots.json b/Projects/Social-Bots/Schemas/App-Schema/social-bots.json similarity index 71% rename from Projects/Social-Bots/Schemas/social-bots.json rename to Projects/Social-Bots/Schemas/App-Schema/social-bots.json index 1e08f0fc4..fb33a5a49 100644 --- a/Projects/Social-Bots/Schemas/social-bots.json +++ b/Projects/Social-Bots/Schemas/App-Schema/social-bots.json @@ -5,19 +5,22 @@ "action": "Add UI Object", "label": "Add Telegram Bot", "relatedUiObject": "Telegram Bot", - "actionFunction": "payload.executeAction" + "actionFunction": "payload.executeAction", + "actionProject": "Foundations" }, { "action": "Add UI Object", "label": "Add Discord Bot", "relatedUiObject": "Discord Bot", - "actionFunction": "payload.executeAction" + "actionFunction": "payload.executeAction", + "actionProject": "Foundations" }, { "action": "Add UI Object", "label": "Add Slack Bot", "relatedUiObject": "Slack Bot", - "actionFunction": "payload.executeAction" + "actionFunction": "payload.executeAction", + "actionProject": "Foundations" }, { "action": "Delete UI Object", @@ -26,7 +29,8 @@ "label": "Delete", "iconPathOn": "delete-entity", "iconPathOff": "delete-entity", - "actionFunction": "payload.executeAction" + "actionFunction": "payload.executeAction", + "actionProject": "Foundations" } ], "addLeftIcons": true, @@ -39,19 +43,22 @@ "name": "telegramBots", "type": "array", "childType": "Telegram Bot", - "autoAdd": true + "autoAdd": true, + "project": "Social-Bots" }, { "name": "discordBots", "type": "array", "childType": "Discord Bot", - "autoAdd": true + "autoAdd": true, + "project": "Social-Bots" }, { "name": "slackBots", "type": "array", "childType": "Slack Bot", - "autoAdd": true + "autoAdd": true, + "project": "Social-Bots" } ], "propertyNameAtParent": "socialBots" diff --git a/Projects/Social-Bots/Schemas/telegram-bot.json b/Projects/Social-Bots/Schemas/App-Schema/telegram-bot.json similarity index 81% rename from Projects/Social-Bots/Schemas/telegram-bot.json rename to Projects/Social-Bots/Schemas/App-Schema/telegram-bot.json index 589ad90a7..fdd969968 100644 --- a/Projects/Social-Bots/Schemas/telegram-bot.json +++ b/Projects/Social-Bots/Schemas/App-Schema/telegram-bot.json @@ -9,13 +9,15 @@ "actionFunction": "uiObject.configEditor.activate", "label": "Configure", "iconPathOn": "configuration", - "iconPathOff": "configuration" + "iconPathOff": "configuration", + "actionProject": "Foundations" }, { "action": "Add UI Object", "label": "Add Social Bot Command", "relatedUiObject": "Social Bot Command", - "actionFunction": "payload.executeAction" + "actionFunction": "payload.executeAction", + "actionProject": "Foundations" }, { "action": "Send Telegram Test Message", @@ -31,7 +33,8 @@ "label": "Delete", "iconPathOn": "delete-entity", "iconPathOff": "delete-entity", - "actionFunction": "payload.executeAction" + "actionFunction": "payload.executeAction", + "actionProject": "Foundations" } ], "initialValues": { @@ -47,7 +50,8 @@ "name": "socialBotCommand", "type": "array", "childType": "Social Bot Command", - "autoAdd": false + "autoAdd": false, + "project": "Social-Bots" } ], "propertyNameAtParent": "telegramBots" From 23c1b17e2de26f86bc66f8e2217e7a1cc4192a86 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sun, 10 Oct 2021 11:02:52 +0200 Subject: [PATCH 04/11] Create TwitterBot.js --- .../Social-Bots/TS/Bot-Modules/TwitterBot.js | 97 +++++++++++++++++++ 1 file changed, 97 insertions(+) create mode 100644 Projects/Social-Bots/TS/Bot-Modules/TwitterBot.js diff --git a/Projects/Social-Bots/TS/Bot-Modules/TwitterBot.js b/Projects/Social-Bots/TS/Bot-Modules/TwitterBot.js new file mode 100644 index 000000000..15e248865 --- /dev/null +++ b/Projects/Social-Bots/TS/Bot-Modules/TwitterBot.js @@ -0,0 +1,97 @@ +exports.newSocialBotsBotModulesTwitterBot = function (processIndex) { + + const MODULE_NAME = 'Twitter Bot' + + let thisObject = { + taskParameters: undefined, + format: undefined, + twitterclient: undefined, + sendMessage: sendMessage, + initialize: initialize, + finalize: finalize + } + + return thisObject + + function initialize(config) { + /* Twitter Bot Initialization */ + var Twitter = SA.nodeModules.twitter + + let consumer_key = config.consumer_key + let consumer_secret = config.consumer_secret + let access_token_key = config.access_token_key + let access_token_secret = config.access_token_secret + + if (process.env.TWITTER_CONSUMER_KEY) { + consumer_key = process.env.TWITTER_CONSUMER_KEY + } + if (process.env.TWITTER_CONSUMER_SECRET) { + consumer_secret = process.env.TWITTER_CONSUMER_SECRET + } + if (process.env.TWITTER_ACCESS_TOKEN_KEY) { + access_token_key = process.env.TWITTER_ACCESS_TOKEN_KEY + } + if (process.env.TWITTER_ACCESS_TOKEN_SECRET) { + access_token_secret = process.env.TWITTER_ACCESS_TOKEN_SECRET + } + + var twitterclient = new Twitter({ + consumer_key: consumer_key, + consumer_secret: consumer_secret, + access_token_key: access_token_key, + access_token_secret: access_token_secret + }); + thisObject.twitterclient = twitterclient + + try { + thisObject.taskParameters = { + exchange: TS.projects.foundations.globals.taskConstants.TASK_NODE.parentNode.parentNode.parentNode.referenceParent.parentNode.parentNode.name, + market: TS.projects.foundations.globals.taskConstants.TASK_NODE.parentNode.parentNode.parentNode.referenceParent.baseAsset.referenceParent.config.codeName + + '/' + + TS.projects.foundations.globals.taskConstants.TASK_NODE.parentNode.parentNode.parentNode.referenceParent.quotedAsset.referenceParent.config.codeName + } + if (config.format === undefined) { + thisObject.format = "%{MESSAGE}" + } else { + thisObject.format = config.format + } + } catch (err) { + logError("initialize -> err = " + err.stack); + } + + } + + function finalize() {} + + function sendMessage(message) { + try { + message = formatMessage(message) + message = JSON.stringify({status: message}) + } catch (err) { + logError("announce -> Twitter JSON message error -> err = " + err) + } + + thisObject.twitterclient.post('statuses/update', message, function(error, tweet, response) { + if(error) throw error; + console.log(tweet); // Tweet body. + console.log(response); // Raw response object. + }); + + } + + function formatMessage(message) { + formattedMessage = thisObject.format + formattedMessage = formattedMessage.replace('%{EXCHANGE}', thisObject.taskParameters.exchange) + formattedMessage = formattedMessage.replace('%{MARKET}', thisObject.taskParameters.market) + formattedMessage = formattedMessage.replace('%{MESSAGE}', message) + return formattedMessage + } + + function logWarn(message) { + TS.projects.foundations.globals.loggerVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).BOT_MAIN_LOOP_LOGGER_MODULE_OBJECT.write(MODULE_NAME, '[WARN] ' + message) + } + + function logError(message) { + TS.projects.foundations.globals.loggerVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).BOT_MAIN_LOOP_LOGGER_MODULE_OBJECT.write(MODULE_NAME, '[ERROR] ' + message) + } +} \ No newline at end of file From eca6a9bf4715f37cc84d8fb6a0a1ad5be9a6422d Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sun, 10 Oct 2021 11:13:29 +0200 Subject: [PATCH 05/11] Schemas updated with project --- .../App-Schema/back-learning-session.json | 3 +- .../App-Schema/backtesting-session.json | 3 +- .../App-Schema/forward-testing-session.json | 3 +- .../App-Schema/live-learning-session.json | 3 +- .../App-Schema/live-trading-session.json | 3 +- .../App-Schema/paper-trading-session.json | 3 +- .../Schemas/App-Schema/social-bots.json | 16 ++++- .../Schemas/App-Schema/twitter-bot.json | 58 +++++++++++++++++++ 8 files changed, 85 insertions(+), 7 deletions(-) create mode 100644 Projects/Social-Bots/Schemas/App-Schema/twitter-bot.json diff --git a/Projects/Foundations/Schemas/App-Schema/back-learning-session.json b/Projects/Foundations/Schemas/App-Schema/back-learning-session.json index a2aa63be7..86ff90c22 100644 --- a/Projects/Foundations/Schemas/App-Schema/back-learning-session.json +++ b/Projects/Foundations/Schemas/App-Schema/back-learning-session.json @@ -96,7 +96,8 @@ { "name": "socialBots", "type": "node", - "childType": "Social Bots" + "childType": "Social Bots", + "project": "Social-Bots" } ], "propertyNameAtParent": "session" diff --git a/Projects/Foundations/Schemas/App-Schema/backtesting-session.json b/Projects/Foundations/Schemas/App-Schema/backtesting-session.json index f71d6bd28..16ea9027f 100644 --- a/Projects/Foundations/Schemas/App-Schema/backtesting-session.json +++ b/Projects/Foundations/Schemas/App-Schema/backtesting-session.json @@ -105,7 +105,8 @@ { "name": "socialBots", "type": "node", - "childType": "Social Bots" + "childType": "Social Bots", + "project": "Social-Bots" } ], "propertyNameAtParent": "session" diff --git a/Projects/Foundations/Schemas/App-Schema/forward-testing-session.json b/Projects/Foundations/Schemas/App-Schema/forward-testing-session.json index 8a3c088d8..b48af1ee9 100644 --- a/Projects/Foundations/Schemas/App-Schema/forward-testing-session.json +++ b/Projects/Foundations/Schemas/App-Schema/forward-testing-session.json @@ -108,7 +108,8 @@ { "name": "socialBots", "type": "node", - "childType": "Social Bots" + "childType": "Social Bots", + "project": "Social-Bots" } ], "propertyNameAtParent": "session" diff --git a/Projects/Foundations/Schemas/App-Schema/live-learning-session.json b/Projects/Foundations/Schemas/App-Schema/live-learning-session.json index 0f470182a..ba8218d8b 100644 --- a/Projects/Foundations/Schemas/App-Schema/live-learning-session.json +++ b/Projects/Foundations/Schemas/App-Schema/live-learning-session.json @@ -96,7 +96,8 @@ { "name": "socialBots", "type": "node", - "childType": "Social Bots" + "childType": "Social Bots", + "project": "Social-Bots" } ], "propertyNameAtParent": "session" diff --git a/Projects/Foundations/Schemas/App-Schema/live-trading-session.json b/Projects/Foundations/Schemas/App-Schema/live-trading-session.json index d76898c43..a646da3fa 100644 --- a/Projects/Foundations/Schemas/App-Schema/live-trading-session.json +++ b/Projects/Foundations/Schemas/App-Schema/live-trading-session.json @@ -108,7 +108,8 @@ { "name": "socialBots", "type": "node", - "childType": "Social Bots" + "childType": "Social Bots", + "project": "Social-Bots" } ], "propertyNameAtParent": "session" diff --git a/Projects/Foundations/Schemas/App-Schema/paper-trading-session.json b/Projects/Foundations/Schemas/App-Schema/paper-trading-session.json index 88f5ff479..0e440b059 100644 --- a/Projects/Foundations/Schemas/App-Schema/paper-trading-session.json +++ b/Projects/Foundations/Schemas/App-Schema/paper-trading-session.json @@ -108,7 +108,8 @@ { "name": "socialBots", "type": "node", - "childType": "Social Bots" + "childType": "Social Bots", + "project": "Social-Bots" } ], "propertyNameAtParent": "session" diff --git a/Projects/Social-Bots/Schemas/App-Schema/social-bots.json b/Projects/Social-Bots/Schemas/App-Schema/social-bots.json index fb33a5a49..e5fb9417d 100644 --- a/Projects/Social-Bots/Schemas/App-Schema/social-bots.json +++ b/Projects/Social-Bots/Schemas/App-Schema/social-bots.json @@ -22,6 +22,13 @@ "actionFunction": "payload.executeAction", "actionProject": "Foundations" }, + { + "action": "Add UI Object", + "label": "Add Twitter Bot", + "relatedUiObject": "Twitter Bot", + "actionFunction": "payload.executeAction", + "actionProject": "Foundations" + }, { "action": "Delete UI Object", "askConfirmation": true, @@ -59,7 +66,14 @@ "childType": "Slack Bot", "autoAdd": true, "project": "Social-Bots" + }, + { + "name": "twitterkBots", + "type": "array", + "childType": "Twitter Bot", + "autoAdd": true, + "project": "Social-Bots" } ], "propertyNameAtParent": "socialBots" -} +} \ No newline at end of file diff --git a/Projects/Social-Bots/Schemas/App-Schema/twitter-bot.json b/Projects/Social-Bots/Schemas/App-Schema/twitter-bot.json new file mode 100644 index 000000000..8d878319c --- /dev/null +++ b/Projects/Social-Bots/Schemas/App-Schema/twitter-bot.json @@ -0,0 +1,58 @@ +{ + "type": "Twitter Bot", + "editors": { + "config": true + }, + "menuItems": [ + { + "action": "Configure", + "actionFunction": "uiObject.configEditor.activate", + "label": "Configure", + "iconPathOn": "configuration", + "iconPathOff": "configuration", + "actionProject": "Foundations" + }, + { + "action": "Add UI Object", + "label": "Add Social Bot Command", + "relatedUiObject": "Social Bot Command", + "actionFunction": "payload.executeAction", + "actionProject": "Foundations" + }, + { + "action": "Send Twitter Test Message", + "label": "Send Twitter Test Message", + "iconPathOn": "test-entity", + "iconPathOff": "test-entity", + "actionFunction": "payload.executeAction" + }, + { + "action": "Delete UI Object", + "askConfirmation": true, + "confirmationLabel": "Confirm to Delete", + "label": "Delete", + "iconPathOn": "delete-entity", + "iconPathOff": "delete-entity", + "actionFunction": "payload.executeAction", + "actionProject": "Foundations" + } + ], + "initialValues": { + "config": "{ \n\"botToken\": \"Paste the bot token obtained from Twitter \",\n}" + }, + "addLeftIcons": true, + "level": 3, + "attachingRules": { + "compatibleTypes": "->Social Bots->" + }, + "childrenNodesProperties": [ + { + "name": "socialBotCommand", + "type": "array", + "childType": "Social Bot Command", + "autoAdd": false, + "project": "Social-Bots" + } + ], + "propertyNameAtParent": "twitterBots" +} \ No newline at end of file From 3405818181a4a5431c824ada1438209712f224e7 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sun, 10 Oct 2021 11:19:06 +0200 Subject: [PATCH 06/11] Docs-Nodes moved --- .../Announcement-Condition/announcement-condition.json | 0 .../A/Announcement/Announcement-Formula/announcement-formula.json | 0 .../Docs-Nodes/A/Announcement/Announcement/announcement.json | 0 .../Schemas/Docs-Nodes/D/Discord/Discord-Bot/discord-bot.json | 0 .../S/Social/Social-Bot-Command/social-bot-command.json | 0 .../Schemas/Docs-Nodes/S/Social/Social-Bots/social-bots.json | 0 .../Schemas/Docs-Nodes/T/Telegram/Telegram-Bot/telegram-bot.json | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename Projects/{Foundations => Social-Bots}/Schemas/Docs-Nodes/A/Announcement/Announcement-Condition/announcement-condition.json (100%) rename Projects/{Foundations => Social-Bots}/Schemas/Docs-Nodes/A/Announcement/Announcement-Formula/announcement-formula.json (100%) rename Projects/{Foundations => Social-Bots}/Schemas/Docs-Nodes/A/Announcement/Announcement/announcement.json (100%) rename Projects/{Foundations => Social-Bots}/Schemas/Docs-Nodes/D/Discord/Discord-Bot/discord-bot.json (100%) rename Projects/{Foundations => Social-Bots}/Schemas/Docs-Nodes/S/Social/Social-Bot-Command/social-bot-command.json (100%) rename Projects/{Foundations => Social-Bots}/Schemas/Docs-Nodes/S/Social/Social-Bots/social-bots.json (100%) rename Projects/{Foundations => Social-Bots}/Schemas/Docs-Nodes/T/Telegram/Telegram-Bot/telegram-bot.json (100%) diff --git a/Projects/Foundations/Schemas/Docs-Nodes/A/Announcement/Announcement-Condition/announcement-condition.json b/Projects/Social-Bots/Schemas/Docs-Nodes/A/Announcement/Announcement-Condition/announcement-condition.json similarity index 100% rename from Projects/Foundations/Schemas/Docs-Nodes/A/Announcement/Announcement-Condition/announcement-condition.json rename to Projects/Social-Bots/Schemas/Docs-Nodes/A/Announcement/Announcement-Condition/announcement-condition.json diff --git a/Projects/Foundations/Schemas/Docs-Nodes/A/Announcement/Announcement-Formula/announcement-formula.json b/Projects/Social-Bots/Schemas/Docs-Nodes/A/Announcement/Announcement-Formula/announcement-formula.json similarity index 100% rename from Projects/Foundations/Schemas/Docs-Nodes/A/Announcement/Announcement-Formula/announcement-formula.json rename to Projects/Social-Bots/Schemas/Docs-Nodes/A/Announcement/Announcement-Formula/announcement-formula.json diff --git a/Projects/Foundations/Schemas/Docs-Nodes/A/Announcement/Announcement/announcement.json b/Projects/Social-Bots/Schemas/Docs-Nodes/A/Announcement/Announcement/announcement.json similarity index 100% rename from Projects/Foundations/Schemas/Docs-Nodes/A/Announcement/Announcement/announcement.json rename to Projects/Social-Bots/Schemas/Docs-Nodes/A/Announcement/Announcement/announcement.json diff --git a/Projects/Foundations/Schemas/Docs-Nodes/D/Discord/Discord-Bot/discord-bot.json b/Projects/Social-Bots/Schemas/Docs-Nodes/D/Discord/Discord-Bot/discord-bot.json similarity index 100% rename from Projects/Foundations/Schemas/Docs-Nodes/D/Discord/Discord-Bot/discord-bot.json rename to Projects/Social-Bots/Schemas/Docs-Nodes/D/Discord/Discord-Bot/discord-bot.json diff --git a/Projects/Foundations/Schemas/Docs-Nodes/S/Social/Social-Bot-Command/social-bot-command.json b/Projects/Social-Bots/Schemas/Docs-Nodes/S/Social/Social-Bot-Command/social-bot-command.json similarity index 100% rename from Projects/Foundations/Schemas/Docs-Nodes/S/Social/Social-Bot-Command/social-bot-command.json rename to Projects/Social-Bots/Schemas/Docs-Nodes/S/Social/Social-Bot-Command/social-bot-command.json diff --git a/Projects/Foundations/Schemas/Docs-Nodes/S/Social/Social-Bots/social-bots.json b/Projects/Social-Bots/Schemas/Docs-Nodes/S/Social/Social-Bots/social-bots.json similarity index 100% rename from Projects/Foundations/Schemas/Docs-Nodes/S/Social/Social-Bots/social-bots.json rename to Projects/Social-Bots/Schemas/Docs-Nodes/S/Social/Social-Bots/social-bots.json diff --git a/Projects/Foundations/Schemas/Docs-Nodes/T/Telegram/Telegram-Bot/telegram-bot.json b/Projects/Social-Bots/Schemas/Docs-Nodes/T/Telegram/Telegram-Bot/telegram-bot.json similarity index 100% rename from Projects/Foundations/Schemas/Docs-Nodes/T/Telegram/Telegram-Bot/telegram-bot.json rename to Projects/Social-Bots/Schemas/Docs-Nodes/T/Telegram/Telegram-Bot/telegram-bot.json From c187c276df57b2de111d4258e9903b6c9ed2ee30 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sun, 10 Oct 2021 11:26:09 +0200 Subject: [PATCH 07/11] Action Switch upgraded --- .../UI/Function-Libraries/ActionSwitch.js | 15 --------------- .../Schemas/App-Schema/discord-bot.json | 3 ++- .../Schemas/App-Schema/slack-bot.json | 3 ++- .../Schemas/App-Schema/telegram-bot.json | 3 ++- .../Schemas/App-Schema/twitter-bot.json | 3 ++- .../UI/Function-Libraries/ActionSwitch.js | 17 +++++++++++------ .../Function-Libraries/SocialBotsFunctions.js | 7 ++++++- 7 files changed, 25 insertions(+), 26 deletions(-) diff --git a/Projects/Foundations/UI/Function-Libraries/ActionSwitch.js b/Projects/Foundations/UI/Function-Libraries/ActionSwitch.js index 58f302e07..af78b8559 100644 --- a/Projects/Foundations/UI/Function-Libraries/ActionSwitch.js +++ b/Projects/Foundations/UI/Function-Libraries/ActionSwitch.js @@ -609,21 +609,6 @@ function newFoundationsActionSwitch() { UI.projects.foundations.spaces.floatingSpace.uiObjectConstructor.createUiObject(true, action.node.payload) } break - case 'Send Telegram Test Message': - { - UI.projects.foundations.functionLibraries.socialBotsFunctions.sendTelegramTestMessage(action.node, action.callBackFunction) - } - break - case 'Send Discord Test Message': - { - UI.projects.foundations.functionLibraries.socialBotsFunctions.sendDiscordTestMessage(action.node, action.callBackFunction) - } - break - case 'Send Slack Test Message': - { - UI.projects.foundations.functionLibraries.socialBotsFunctions.sendSlackTestMessage(action.node, action.callBackFunction) - } - break case 'Save node to be moved': { UI.projects.foundations.spaces.floatingSpace.saveFloatingObjectToBeMoved() diff --git a/Projects/Social-Bots/Schemas/App-Schema/discord-bot.json b/Projects/Social-Bots/Schemas/App-Schema/discord-bot.json index 6a54c294b..d96f4890b 100644 --- a/Projects/Social-Bots/Schemas/App-Schema/discord-bot.json +++ b/Projects/Social-Bots/Schemas/App-Schema/discord-bot.json @@ -17,7 +17,8 @@ "label": "Send Discord Test Message", "iconPathOn": "test-entity", "iconPathOff": "test-entity", - "actionFunction": "payload.executeAction" + "actionFunction": "payload.executeAction", + "actionProject": "SocialBots" }, { "action": "Delete UI Object", diff --git a/Projects/Social-Bots/Schemas/App-Schema/slack-bot.json b/Projects/Social-Bots/Schemas/App-Schema/slack-bot.json index 68aceafd9..cba595d2f 100644 --- a/Projects/Social-Bots/Schemas/App-Schema/slack-bot.json +++ b/Projects/Social-Bots/Schemas/App-Schema/slack-bot.json @@ -17,7 +17,8 @@ "label": "Send Slack Test Message", "iconPathOn": "test-entity", "iconPathOff": "test-entity", - "actionFunction": "payload.executeAction" + "actionFunction": "payload.executeAction", + "actionProject": "SocialBots" }, { "action": "Delete UI Object", diff --git a/Projects/Social-Bots/Schemas/App-Schema/telegram-bot.json b/Projects/Social-Bots/Schemas/App-Schema/telegram-bot.json index fdd969968..805a7d143 100644 --- a/Projects/Social-Bots/Schemas/App-Schema/telegram-bot.json +++ b/Projects/Social-Bots/Schemas/App-Schema/telegram-bot.json @@ -24,7 +24,8 @@ "label": "Send Telegram Test Message", "iconPathOn": "test-entity", "iconPathOff": "test-entity", - "actionFunction": "payload.executeAction" + "actionFunction": "payload.executeAction", + "actionProject": "SocialBots" }, { "action": "Delete UI Object", diff --git a/Projects/Social-Bots/Schemas/App-Schema/twitter-bot.json b/Projects/Social-Bots/Schemas/App-Schema/twitter-bot.json index 8d878319c..f81257b0a 100644 --- a/Projects/Social-Bots/Schemas/App-Schema/twitter-bot.json +++ b/Projects/Social-Bots/Schemas/App-Schema/twitter-bot.json @@ -24,7 +24,8 @@ "label": "Send Twitter Test Message", "iconPathOn": "test-entity", "iconPathOff": "test-entity", - "actionFunction": "payload.executeAction" + "actionFunction": "payload.executeAction", + "actionProject": "SocialBots" }, { "action": "Delete UI Object", diff --git a/Projects/Social-Bots/UI/Function-Libraries/ActionSwitch.js b/Projects/Social-Bots/UI/Function-Libraries/ActionSwitch.js index c8ee8cb63..747eedfbb 100644 --- a/Projects/Social-Bots/UI/Function-Libraries/ActionSwitch.js +++ b/Projects/Social-Bots/UI/Function-Libraries/ActionSwitch.js @@ -18,19 +18,24 @@ function newSocialBotsActionSwitch() { async function executeAction(action) { switch (action.name) { - case 'Add All Output Datasets': + case 'Send Telegram Test Message': { - UI.projects.dataMining.functionLibraries.mineFunctions.addAllOutputDatasets(action.node) + UI.projects.socialBots.functionLibraries.socialBotsFunctions.sendTelegramTestMessage(action.node, action.callBackFunction) } break - case 'Add All Data Dependencies': + case 'Send Discord Test Message': { - UI.projects.dataMining.functionLibraries.mineFunctions.addAllDataDependencies(action.node) + UI.projects.socialBots.functionLibraries.socialBotsFunctions.sendDiscordTestMessage(action.node, action.callBackFunction) } break - case 'Add All Data Mine Dependencies': + case 'Send Slack Test Message': { - UI.projects.dataMining.functionLibraries.mineFunctions.addAllDataMineDataDependencies(action.node, action.rootNodes) + UI.projects.socialBots.functionLibraries.socialBotsFunctions.sendSlackTestMessage(action.node, action.callBackFunction) + } + break + case 'Send Twitter Test Message': + { + UI.projects.socialBots.functionLibraries.socialBotsFunctions.sendTwitterTestMessage(action.node, action.callBackFunction) } break } diff --git a/Projects/Social-Bots/UI/Function-Libraries/SocialBotsFunctions.js b/Projects/Social-Bots/UI/Function-Libraries/SocialBotsFunctions.js index 31923fe33..914a2d0f0 100644 --- a/Projects/Social-Bots/UI/Function-Libraries/SocialBotsFunctions.js +++ b/Projects/Social-Bots/UI/Function-Libraries/SocialBotsFunctions.js @@ -2,7 +2,8 @@ function newSocialBotsFunctionLibrarySocialBotsFunctions() { let thisObject = { sendTelegramTestMessage: sendTelegramTestMessage, sendDiscordTestMessage: sendDiscordTestMessage, - sendSlackTestMessage: sendSlackTestMessage + sendSlackTestMessage: sendSlackTestMessage, + sendTwitterTestMessage: sendTwitterTestMessage } return thisObject @@ -183,4 +184,8 @@ function newSocialBotsFunctionLibrarySocialBotsFunctions() { } } } + + function sendTwitterTestMessage(node, callBackFunction) { + + } } From db6b6603af004de8e632f42e2a8ee216face977a Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sun, 10 Oct 2021 11:35:09 +0200 Subject: [PATCH 08/11] Refactoring project name --- .../Low-Frequency-Trading/TradingOrders.js | 2 +- .../Low-Frequency-Trading/TradingStages.js | 2 +- .../TS/Bot-Modules/Trading-Bot/TradingSession.js | 2 +- .../TS/Bot-Modules/Learning-Bot/LearningSession.js | 2 +- Projects/Social-Bots/TS/Bot-Modules/SocialBots.js | 11 +++++++---- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Projects/Algorithmic-Trading/TS/Bot-Modules/Trading-Bot/Low-Frequency-Trading/TradingOrders.js b/Projects/Algorithmic-Trading/TS/Bot-Modules/Trading-Bot/Low-Frequency-Trading/TradingOrders.js index 4558064e4..693af35df 100644 --- a/Projects/Algorithmic-Trading/TS/Bot-Modules/Trading-Bot/Low-Frequency-Trading/TradingOrders.js +++ b/Projects/Algorithmic-Trading/TS/Bot-Modules/Trading-Bot/Low-Frequency-Trading/TradingOrders.js @@ -17,7 +17,7 @@ exports.newAlgorithmicTradingBotModulesTradingOrders = function (processIndex) { let sessionParameters let exchangeAPIModuleObject = TS.projects.algorithmicTrading.botModules.exchangeAPI.newAlgorithmicTradingBotModulesExchangeAPI(processIndex) - let announcementsModuleObject = TS.projects.foundations.botModules.announcements.newSocialBotsBotModulesAnnouncements(processIndex) + let announcementsModuleObject = TS.projects.socialBots.botModules.announcements.newSocialBotsBotModulesAnnouncements(processIndex) return thisObject diff --git a/Projects/Algorithmic-Trading/TS/Bot-Modules/Trading-Bot/Low-Frequency-Trading/TradingStages.js b/Projects/Algorithmic-Trading/TS/Bot-Modules/Trading-Bot/Low-Frequency-Trading/TradingStages.js index 31458fe13..180cd85bb 100644 --- a/Projects/Algorithmic-Trading/TS/Bot-Modules/Trading-Bot/Low-Frequency-Trading/TradingStages.js +++ b/Projects/Algorithmic-Trading/TS/Bot-Modules/Trading-Bot/Low-Frequency-Trading/TradingStages.js @@ -24,7 +24,7 @@ exports.newAlgorithmicTradingBotModulesTradingStages = function (processIndex) { let tradingStrategyModuleObject = TS.projects.algorithmicTrading.botModules.tradingStrategy.newAlgorithmicTradingBotModulesTradingStrategy(processIndex) let tradingPositionModuleObject = TS.projects.algorithmicTrading.botModules.tradingPosition.newAlgorithmicTradingBotModulesTradingPosition(processIndex) let tradingExecutionModuleObject = TS.projects.algorithmicTrading.botModules.tradingExecution.newAlgorithmicTradingBotModulesTradingExecution(processIndex) - let announcementsModuleObject = TS.projects.foundations.botModules.announcements.newSocialBotsBotModulesAnnouncements(processIndex) + let announcementsModuleObject = TS.projects.socialBots.botModules.announcements.newSocialBotsBotModulesAnnouncements(processIndex) let snapshotsModuleObject = TS.projects.algorithmicTrading.botModules.snapshots.newAlgorithmicTradingBotModulesSnapshots(processIndex) let tradingEpisodeModuleObject = TS.projects.algorithmicTrading.botModules.tradingEpisode.newAlgorithmicTradingBotModulesTradingEpisode(processIndex) diff --git a/Projects/Algorithmic-Trading/TS/Bot-Modules/Trading-Bot/TradingSession.js b/Projects/Algorithmic-Trading/TS/Bot-Modules/Trading-Bot/TradingSession.js index 081e044bb..7fca5136c 100644 --- a/Projects/Algorithmic-Trading/TS/Bot-Modules/Trading-Bot/TradingSession.js +++ b/Projects/Algorithmic-Trading/TS/Bot-Modules/Trading-Bot/TradingSession.js @@ -7,7 +7,7 @@ } TS.projects.foundations.globals.processVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).SOCIAL_BOTS_MODULE = - TS.projects.foundations.botModules.socialBots.newSocialBotsBotModulesSocialBots(processIndex) + TS.projects.socialBots.botModules.socialBots.newSocialBotsBotModulesSocialBots(processIndex) return thisObject; diff --git a/Projects/Machine-Learning/TS/Bot-Modules/Learning-Bot/LearningSession.js b/Projects/Machine-Learning/TS/Bot-Modules/Learning-Bot/LearningSession.js index 3831288b2..58df9554f 100644 --- a/Projects/Machine-Learning/TS/Bot-Modules/Learning-Bot/LearningSession.js +++ b/Projects/Machine-Learning/TS/Bot-Modules/Learning-Bot/LearningSession.js @@ -7,7 +7,7 @@ } TS.projects.foundations.globals.processVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).SOCIAL_BOTS_MODULE = - TS.projects.foundations.botModules.socialBots.newSocialBotsBotModulesSocialBots(processIndex) + TS.projects.socialBots.botModules.socialBots.newSocialBotsBotModulesSocialBots(processIndex) return thisObject; diff --git a/Projects/Social-Bots/TS/Bot-Modules/SocialBots.js b/Projects/Social-Bots/TS/Bot-Modules/SocialBots.js index 3dbbb07a6..4efb56d44 100644 --- a/Projects/Social-Bots/TS/Bot-Modules/SocialBots.js +++ b/Projects/Social-Bots/TS/Bot-Modules/SocialBots.js @@ -19,13 +19,16 @@ exports.newSocialBotsBotModulesSocialBots = function (processIndex) { let config = socialBot.config let commands = socialBot.socialBotCommand if (socialBot.type === "Telegram Bot") { - socialBot.botInstance = TS.projects.foundations.botModules.telegramBot.newSocialBotsBotModulesTelegramBot(processIndex) + socialBot.botInstance = TS.projects.socialBots.botModules.telegramBot.newSocialBotsBotModulesTelegramBot(processIndex) socialBot.botInstance.initialize(config, commands) } else if (socialBot.type === "Discord Bot") { - socialBot.botInstance = TS.projects.foundations.botModules.discordBot.newSocialBotsBotModulesDiscordBot(processIndex) + socialBot.botInstance = TS.projects.socialBots.botModules.discordBot.newSocialBotsBotModulesDiscordBot(processIndex) socialBot.botInstance.initialize(config) } else if (socialBot.type === "Slack Bot") { - socialBot.botInstance = TS.projects.foundations.botModules.slackBot.newSocialBotsBotModulesSlackBot(processIndex) + socialBot.botInstance = TS.projects.socialBots.botModules.slackBot.newSocialBotsBotModulesSlackBot(processIndex) + socialBot.botInstance.initialize(config) + } else if (socialBot.type === "Twitter Bot") { + socialBot.botInstance = TS.projects.socialBots.botModules.slackBot.newSocialBotsBotModulesTwitterBot(processIndex) socialBot.botInstance.initialize(config) } } @@ -41,7 +44,7 @@ exports.newSocialBotsBotModulesSocialBots = function (processIndex) { try { if (socialBot.type === "Telegram Bot") { socialBot.botInstance.telegramAPI.sendMessage(socialBot.botInstance.chatId, text).catch(err => TS.projects.foundations.globals.loggerVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).BOT_MAIN_LOOP_LOGGER_MODULE_OBJECT.write(MODULE_NAME, "[WARN] initialize -> initializeSocialBots -> announce -> Telegram API error -> err = " + err)) - } else if (socialBot.type === "Discord Bot" ||socialBot.type === "Slack Bot" ) { + } else if (socialBot.type === "Discord Bot" || socialBot.type === "Slack Bot") { socialBot.botInstance.sendMessage(text).catch(err => TS.projects.foundations.globals.loggerVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).BOT_MAIN_LOOP_LOGGER_MODULE_OBJECT.write(MODULE_NAME, "[WARN] initialize -> initializeSocialBots -> announce -> Discord Bot error -> err = " + err)) } } catch (err) { From 48ebaeb9257c577f43194ddeea041a3a98c4d691 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sun, 10 Oct 2021 11:45:14 +0200 Subject: [PATCH 09/11] Bug Fixes plus icons --- .../Schemas/App-Schema/back-learning-session.json | 7 +++++++ .../Schemas/App-Schema/backtesting-session.json | 3 ++- .../Schemas/App-Schema/forward-testing-session.json | 3 ++- .../Schemas/App-Schema/live-learning-session.json | 7 +++++++ .../Schemas/App-Schema/live-trading-session.json | 3 ++- .../Schemas/App-Schema/paper-trading-session.json | 3 ++- .../Icons/social-bot-command.png | Bin .../Icons/social-bots.png | Bin 8 files changed, 22 insertions(+), 4 deletions(-) rename Projects/{Foundations => Social-Bots}/Icons/social-bot-command.png (100%) rename Projects/{Foundations => Social-Bots}/Icons/social-bots.png (100%) diff --git a/Projects/Foundations/Schemas/App-Schema/back-learning-session.json b/Projects/Foundations/Schemas/App-Schema/back-learning-session.json index 86ff90c22..5c51f17a2 100644 --- a/Projects/Foundations/Schemas/App-Schema/back-learning-session.json +++ b/Projects/Foundations/Schemas/App-Schema/back-learning-session.json @@ -43,6 +43,13 @@ "dontShowAtFullscreen": true, "actionFunction": "uiObject.configEditor.activate" }, + { + "action": "Add UI Object", + "label": "Add Social Bots", + "relatedUiObject": "Social Bots", + "actionFunction": "payload.executeAction", + "relatedUiObjectProject": "Social-Bots" + }, { "action": "Add Missing Children", "label": "Add Missing Children", diff --git a/Projects/Foundations/Schemas/App-Schema/backtesting-session.json b/Projects/Foundations/Schemas/App-Schema/backtesting-session.json index 16ea9027f..c6f168a55 100644 --- a/Projects/Foundations/Schemas/App-Schema/backtesting-session.json +++ b/Projects/Foundations/Schemas/App-Schema/backtesting-session.json @@ -47,7 +47,8 @@ "action": "Add UI Object", "label": "Add Social Bots", "relatedUiObject": "Social Bots", - "actionFunction": "payload.executeAction" + "actionFunction": "payload.executeAction", + "relatedUiObjectProject": "Social-Bots" }, { "action": "Add Missing Children", diff --git a/Projects/Foundations/Schemas/App-Schema/forward-testing-session.json b/Projects/Foundations/Schemas/App-Schema/forward-testing-session.json index b48af1ee9..282bd4532 100644 --- a/Projects/Foundations/Schemas/App-Schema/forward-testing-session.json +++ b/Projects/Foundations/Schemas/App-Schema/forward-testing-session.json @@ -47,7 +47,8 @@ "action": "Add UI Object", "label": "Add Social Bots", "relatedUiObject": "Social Bots", - "actionFunction": "payload.executeAction" + "actionFunction": "payload.executeAction", + "relatedUiObjectProject": "Social-Bots" }, { "action": "Add Missing Children", diff --git a/Projects/Foundations/Schemas/App-Schema/live-learning-session.json b/Projects/Foundations/Schemas/App-Schema/live-learning-session.json index ba8218d8b..e53108b38 100644 --- a/Projects/Foundations/Schemas/App-Schema/live-learning-session.json +++ b/Projects/Foundations/Schemas/App-Schema/live-learning-session.json @@ -43,6 +43,13 @@ "dontShowAtFullscreen": true, "actionFunction": "uiObject.configEditor.activate" }, + { + "action": "Add UI Object", + "label": "Add Social Bots", + "relatedUiObject": "Social Bots", + "actionFunction": "payload.executeAction", + "relatedUiObjectProject": "Social-Bots" + }, { "action": "Add Missing Children", "label": "Add Missing Children", diff --git a/Projects/Foundations/Schemas/App-Schema/live-trading-session.json b/Projects/Foundations/Schemas/App-Schema/live-trading-session.json index a646da3fa..dccbfc0f3 100644 --- a/Projects/Foundations/Schemas/App-Schema/live-trading-session.json +++ b/Projects/Foundations/Schemas/App-Schema/live-trading-session.json @@ -47,7 +47,8 @@ "action": "Add UI Object", "label": "Add Social Bots", "relatedUiObject": "Social Bots", - "actionFunction": "payload.executeAction" + "actionFunction": "payload.executeAction", + "relatedUiObjectProject": "Social-Bots" }, { "action": "Add Missing Children", diff --git a/Projects/Foundations/Schemas/App-Schema/paper-trading-session.json b/Projects/Foundations/Schemas/App-Schema/paper-trading-session.json index 0e440b059..472a246c8 100644 --- a/Projects/Foundations/Schemas/App-Schema/paper-trading-session.json +++ b/Projects/Foundations/Schemas/App-Schema/paper-trading-session.json @@ -47,7 +47,8 @@ "action": "Add UI Object", "label": "Add Social Bots", "relatedUiObject": "Social Bots", - "actionFunction": "payload.executeAction" + "actionFunction": "payload.executeAction", + "relatedUiObjectProject": "Social-Bots" }, { "action": "Add Missing Children", diff --git a/Projects/Foundations/Icons/social-bot-command.png b/Projects/Social-Bots/Icons/social-bot-command.png similarity index 100% rename from Projects/Foundations/Icons/social-bot-command.png rename to Projects/Social-Bots/Icons/social-bot-command.png diff --git a/Projects/Foundations/Icons/social-bots.png b/Projects/Social-Bots/Icons/social-bots.png similarity index 100% rename from Projects/Foundations/Icons/social-bots.png rename to Projects/Social-Bots/Icons/social-bots.png From 025792fe4297807e2a9f94583ba90acb8016dc64 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sun, 10 Oct 2021 12:12:44 +0200 Subject: [PATCH 10/11] UI Bug Fixes --- .../UI/Function-Libraries/ActionSwitch.js | 19 +++++++++++------ .../Spaces/Floating-Space/CircularMenuItem.js | 20 +++++++++++++++--- .../Icons/Announcement/twitter-bot.png | Bin 0 -> 13855 bytes .../Schemas/App-Schema/announcement.json | 2 ++ .../Schemas/App-Schema/social-bots.json | 14 +++++++----- .../Schemas/App-Schema/telegram-bot.json | 3 ++- .../Schemas/App-Schema/twitter-bot.json | 3 ++- 7 files changed, 44 insertions(+), 17 deletions(-) create mode 100644 Projects/Social-Bots/Icons/Announcement/twitter-bot.png diff --git a/Projects/Foundations/UI/Function-Libraries/ActionSwitch.js b/Projects/Foundations/UI/Function-Libraries/ActionSwitch.js index af78b8559..ac8b7efc0 100644 --- a/Projects/Foundations/UI/Function-Libraries/ActionSwitch.js +++ b/Projects/Foundations/UI/Function-Libraries/ActionSwitch.js @@ -101,7 +101,12 @@ function newFoundationsActionSwitch() { break case 'Add UI Object': { - UI.projects.foundations.functionLibraries.uiObjectsFromNodes.addUIObject(action.node, action.relatedNodeType, action.rootNodes, action.project) + UI.projects.foundations.functionLibraries.uiObjectsFromNodes.addUIObject( + action.node, + action.relatedNodeType, + action.rootNodes, + action.relatedNodeProject + ) } break case 'Add Missing Children': @@ -610,14 +615,14 @@ function newFoundationsActionSwitch() { } break case 'Save node to be moved': - { - UI.projects.foundations.spaces.floatingSpace.saveFloatingObjectToBeMoved() - } + { + UI.projects.foundations.spaces.floatingSpace.saveFloatingObjectToBeMoved() + } break case 'Snap saved node to position': - { - UI.projects.foundations.spaces.floatingSpace.moveFloatingObject(action.node.payload.position) - } + { + UI.projects.foundations.spaces.floatingSpace.moveFloatingObject(action.node.payload.position) + } break } } diff --git a/Projects/Foundations/UI/Spaces/Floating-Space/CircularMenuItem.js b/Projects/Foundations/UI/Spaces/Floating-Space/CircularMenuItem.js index 9f4a3e5d8..abb7b2cc1 100644 --- a/Projects/Foundations/UI/Spaces/Floating-Space/CircularMenuItem.js +++ b/Projects/Foundations/UI/Spaces/Floating-Space/CircularMenuItem.js @@ -112,7 +112,7 @@ function newCircularMenuItem() { iconPhysics() if (thisObject.icon === undefined) { - console.log('[ERROR] newCircularMenuItem -> initialize -> err = Icon not found, Action: "' + thisObject.action + '", relatedUiObject: "' + thisObject.relatedUiObject +'", label: "' + thisObject.label + '"') + console.log('[ERROR] newCircularMenuItem -> initialize -> err = Icon not found, Action: "' + thisObject.action + '", relatedUiObject: "' + thisObject.relatedUiObject + '", label: "' + thisObject.label + '"') } selfMouseOverEventSubscriptionId = thisObject.container.eventHandler.listenToEvent('onMouseOver', onMouseOver) @@ -379,7 +379,21 @@ function newCircularMenuItem() { } /* Execute the action and wait for callbacks to update our statuus. */ - thisObject.actionFunction({ node: thisObject.payload.node, name: thisObject.action, project: thisObject.actionProject, relatedNodeType: thisObject.relatedUiObject, callBackFunction: onPrimaryCallBack }) + let relatedNodeProject = thisObject.actionProject + if (thisObject.relatedUiObjectProject !== undefined) { + relatedNodeProject = thisObject.relatedUiObjectProject + } + + thisObject.actionFunction( + { + node: thisObject.payload.node, + name: thisObject.action, + project: thisObject.actionProject, + relatedNodeType: thisObject.relatedUiObject, + relatedNodeProject: relatedNodeProject, + callBackFunction: onPrimaryCallBack + } + ) return } if (temporaryStatus === STATUS_PRIMARY_WORK_DONE && thisObject.secondaryAction !== undefined) { @@ -502,7 +516,7 @@ function newCircularMenuItem() { if (thisObject.icon === undefined) { thisObject.icon = UI.projects.foundations.spaces.designSpace.getIconByProjectAndName('Foundations', 'missing-image') } - + if (thisObject.icon !== undefined) { if (thisObject.icon.canDrawIcon === true && thisObject.currentRadius > 1 && thisObject.isDeployed === true) { browserCanvasContext.drawImage(thisObject.icon, menuPosition.x - iconSize, menuPosition.y - iconSize, iconSize * 2, iconSize * 2) diff --git a/Projects/Social-Bots/Icons/Announcement/twitter-bot.png b/Projects/Social-Bots/Icons/Announcement/twitter-bot.png new file mode 100644 index 0000000000000000000000000000000000000000..c41449c12d74ced7842ab0b07351ed15eb940575 GIT binary patch literal 13855 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 literal 0 HcmV?d00001 diff --git a/Projects/Social-Bots/Schemas/App-Schema/announcement.json b/Projects/Social-Bots/Schemas/App-Schema/announcement.json index 6f6639ae4..e308e50a5 100644 --- a/Projects/Social-Bots/Schemas/App-Schema/announcement.json +++ b/Projects/Social-Bots/Schemas/App-Schema/announcement.json @@ -18,6 +18,7 @@ "propertyToCheckFor": "announcementFormula", "label": "Add Announcement Formula", "relatedUiObject": "Announcement Formula", + "relatedUiObjectProject": "Social-Bots", "actionFunction": "payload.executeAction", "actionProject": "Foundations" }, @@ -27,6 +28,7 @@ "propertyToCheckFor": "announcementCondition", "label": "Add Announcement Condition", "relatedUiObject": "Announcement Condition", + "relatedUiObjectProject": "Social-Bots", "actionFunction": "payload.executeAction", "actionProject": "Foundations" }, diff --git a/Projects/Social-Bots/Schemas/App-Schema/social-bots.json b/Projects/Social-Bots/Schemas/App-Schema/social-bots.json index e5fb9417d..ecb7f1c91 100644 --- a/Projects/Social-Bots/Schemas/App-Schema/social-bots.json +++ b/Projects/Social-Bots/Schemas/App-Schema/social-bots.json @@ -6,28 +6,32 @@ "label": "Add Telegram Bot", "relatedUiObject": "Telegram Bot", "actionFunction": "payload.executeAction", - "actionProject": "Foundations" + "actionProject": "Foundations", + "relatedUiObjectProject": "Social-Bots" }, { "action": "Add UI Object", "label": "Add Discord Bot", "relatedUiObject": "Discord Bot", "actionFunction": "payload.executeAction", - "actionProject": "Foundations" + "actionProject": "Foundations", + "relatedUiObjectProject": "Social-Bots" }, { "action": "Add UI Object", "label": "Add Slack Bot", "relatedUiObject": "Slack Bot", "actionFunction": "payload.executeAction", - "actionProject": "Foundations" + "actionProject": "Foundations", + "relatedUiObjectProject": "Social-Bots" }, { "action": "Add UI Object", "label": "Add Twitter Bot", "relatedUiObject": "Twitter Bot", "actionFunction": "payload.executeAction", - "actionProject": "Foundations" + "actionProject": "Foundations", + "relatedUiObjectProject": "Social-Bots" }, { "action": "Delete UI Object", @@ -68,7 +72,7 @@ "project": "Social-Bots" }, { - "name": "twitterkBots", + "name": "twitterBots", "type": "array", "childType": "Twitter Bot", "autoAdd": true, diff --git a/Projects/Social-Bots/Schemas/App-Schema/telegram-bot.json b/Projects/Social-Bots/Schemas/App-Schema/telegram-bot.json index 805a7d143..51c4345d5 100644 --- a/Projects/Social-Bots/Schemas/App-Schema/telegram-bot.json +++ b/Projects/Social-Bots/Schemas/App-Schema/telegram-bot.json @@ -17,7 +17,8 @@ "label": "Add Social Bot Command", "relatedUiObject": "Social Bot Command", "actionFunction": "payload.executeAction", - "actionProject": "Foundations" + "actionProject": "Foundations", + "relatedUiObjectProject": "Social-Bots" }, { "action": "Send Telegram Test Message", diff --git a/Projects/Social-Bots/Schemas/App-Schema/twitter-bot.json b/Projects/Social-Bots/Schemas/App-Schema/twitter-bot.json index f81257b0a..c5f07af3b 100644 --- a/Projects/Social-Bots/Schemas/App-Schema/twitter-bot.json +++ b/Projects/Social-Bots/Schemas/App-Schema/twitter-bot.json @@ -17,7 +17,8 @@ "label": "Add Social Bot Command", "relatedUiObject": "Social Bot Command", "actionFunction": "payload.executeAction", - "actionProject": "Foundations" + "actionProject": "Foundations", + "relatedUiObjectProject": "Social-Bots" }, { "action": "Send Twitter Test Message", From dd20afb9e858d404eecbbd3314d6bed9fc7ff300 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sun, 10 Oct 2021 12:30:46 +0200 Subject: [PATCH 11/11] Social-Bots project extracted from Fundations --- .../Schemas/App-Schema/cancel-order-event.json | 6 ++++-- .../Schemas/App-Schema/close-stage-event.json | 6 ++++-- Projects/Foundations/Schemas/App-Schema/close-stage.json | 6 ++++-- .../Schemas/App-Schema/create-order-event.json | 6 ++++-- .../Foundations/Schemas/App-Schema/manage-stage.json | 6 ++++-- .../Schemas/App-Schema/move-to-phase-event.json | 6 ++++-- .../Foundations/Schemas/App-Schema/next-phase-event.json | 6 ++++-- Projects/Foundations/Schemas/App-Schema/open-stage.json | 6 ++++-- Projects/Foundations/Schemas/App-Schema/phase.json | 9 ++++++--- .../Schemas/App-Schema/take-position-event.json | 6 ++++-- .../Schemas/App-Schema/trigger-off-event.json | 6 ++++-- .../Foundations/Schemas/App-Schema/trigger-on-event.json | 6 ++++-- .../Foundations/Schemas/App-Schema/trigger-stage.json | 6 ++++-- 13 files changed, 54 insertions(+), 27 deletions(-) diff --git a/Projects/Foundations/Schemas/App-Schema/cancel-order-event.json b/Projects/Foundations/Schemas/App-Schema/cancel-order-event.json index 84611a87c..105e60b90 100644 --- a/Projects/Foundations/Schemas/App-Schema/cancel-order-event.json +++ b/Projects/Foundations/Schemas/App-Schema/cancel-order-event.json @@ -11,7 +11,8 @@ "action": "Add UI Object", "label": "Add Announcement", "relatedUiObject": "Announcement", - "actionFunction": "payload.executeAction" + "actionFunction": "payload.executeAction", + "relatedUiObjectProject": "Social-Bots" }, { "action": "Delete UI Object", @@ -38,7 +39,8 @@ { "name": "announcements", "type": "array", - "childType": "Announcement" + "childType": "Announcement", + "project": "Social-Bots" } ], "propertyNameAtParent": "cancelOrderEvent" diff --git a/Projects/Foundations/Schemas/App-Schema/close-stage-event.json b/Projects/Foundations/Schemas/App-Schema/close-stage-event.json index 4e1009380..6608cda87 100644 --- a/Projects/Foundations/Schemas/App-Schema/close-stage-event.json +++ b/Projects/Foundations/Schemas/App-Schema/close-stage-event.json @@ -11,7 +11,8 @@ "action": "Add UI Object", "label": "Add Announcement", "relatedUiObject": "Announcement", - "actionFunction": "payload.executeAction" + "actionFunction": "payload.executeAction", + "relatedUiObjectProject": "Social-Bots" }, { "action": "Delete UI Object", @@ -38,7 +39,8 @@ { "name": "announcements", "type": "array", - "childType": "Announcement" + "childType": "Announcement", + "project": "Social-Bots" } ], "propertyNameAtParent": "closeStageEvent" diff --git a/Projects/Foundations/Schemas/App-Schema/close-stage.json b/Projects/Foundations/Schemas/App-Schema/close-stage.json index 2a976b11d..96fcfb310 100644 --- a/Projects/Foundations/Schemas/App-Schema/close-stage.json +++ b/Projects/Foundations/Schemas/App-Schema/close-stage.json @@ -18,7 +18,8 @@ "action": "Add UI Object", "label": "Add Announcement", "relatedUiObject": "Announcement", - "actionFunction": "payload.executeAction" + "actionFunction": "payload.executeAction", + "relatedUiObjectProject": "Social-Bots" }, { "action": "Delete UI Object", @@ -63,7 +64,8 @@ { "name": "announcements", "type": "array", - "childType": "Announcement" + "childType": "Announcement", + "project": "Social-Bots" }, { "name": "userDefinedCode", diff --git a/Projects/Foundations/Schemas/App-Schema/create-order-event.json b/Projects/Foundations/Schemas/App-Schema/create-order-event.json index f53293ca5..beb2eb7fd 100644 --- a/Projects/Foundations/Schemas/App-Schema/create-order-event.json +++ b/Projects/Foundations/Schemas/App-Schema/create-order-event.json @@ -11,7 +11,8 @@ "action": "Add UI Object", "label": "Add Announcement", "relatedUiObject": "Announcement", - "actionFunction": "payload.executeAction" + "actionFunction": "payload.executeAction", + "relatedUiObjectProject": "Social-Bots" }, { "action": "Delete UI Object", @@ -38,7 +39,8 @@ { "name": "announcements", "type": "array", - "childType": "Announcement" + "childType": "Announcement", + "project": "Social-Bots" } ], "propertyNameAtParent": "createOrderEvent" diff --git a/Projects/Foundations/Schemas/App-Schema/manage-stage.json b/Projects/Foundations/Schemas/App-Schema/manage-stage.json index 128eb5c14..5476e35f9 100644 --- a/Projects/Foundations/Schemas/App-Schema/manage-stage.json +++ b/Projects/Foundations/Schemas/App-Schema/manage-stage.json @@ -11,7 +11,8 @@ "action": "Add UI Object", "label": "Add Announcement", "relatedUiObject": "Announcement", - "actionFunction": "payload.executeAction" + "actionFunction": "payload.executeAction", + "relatedUiObjectProject": "Social-Bots" }, { "action": "Delete UI Object", @@ -44,7 +45,8 @@ { "name": "announcements", "type": "array", - "childType": "Announcement" + "childType": "Announcement", + "project": "Social-Bots" }, { "name": "userDefinedCode", diff --git a/Projects/Foundations/Schemas/App-Schema/move-to-phase-event.json b/Projects/Foundations/Schemas/App-Schema/move-to-phase-event.json index 1fffd486f..34a979f2a 100644 --- a/Projects/Foundations/Schemas/App-Schema/move-to-phase-event.json +++ b/Projects/Foundations/Schemas/App-Schema/move-to-phase-event.json @@ -11,7 +11,8 @@ "action": "Add UI Object", "label": "Add Announcement", "relatedUiObject": "Announcement", - "actionFunction": "payload.executeAction" + "actionFunction": "payload.executeAction", + "relatedUiObjectProject": "Social-Bots" }, { "action": "Delete UI Object", @@ -41,7 +42,8 @@ { "name": "announcements", "type": "array", - "childType": "Announcement" + "childType": "Announcement", + "project": "Social-Bots" } ], "propertyNameAtParent": "moveToPhaseEvents" diff --git a/Projects/Foundations/Schemas/App-Schema/next-phase-event.json b/Projects/Foundations/Schemas/App-Schema/next-phase-event.json index 17c5a63df..c649534d0 100644 --- a/Projects/Foundations/Schemas/App-Schema/next-phase-event.json +++ b/Projects/Foundations/Schemas/App-Schema/next-phase-event.json @@ -11,7 +11,8 @@ "action": "Add UI Object", "label": "Add Announcement", "relatedUiObject": "Announcement", - "actionFunction": "payload.executeAction" + "actionFunction": "payload.executeAction", + "relatedUiObjectProject": "Social-Bots" }, { "action": "Delete UI Object", @@ -38,7 +39,8 @@ { "name": "announcements", "type": "array", - "childType": "Announcement" + "childType": "Announcement", + "project": "Social-Bots" } ], "propertyNameAtParent": "nextPhaseEvent" diff --git a/Projects/Foundations/Schemas/App-Schema/open-stage.json b/Projects/Foundations/Schemas/App-Schema/open-stage.json index 0a0badc3e..76ec0bfb3 100644 --- a/Projects/Foundations/Schemas/App-Schema/open-stage.json +++ b/Projects/Foundations/Schemas/App-Schema/open-stage.json @@ -18,7 +18,8 @@ "action": "Add UI Object", "label": "Add Announcement", "relatedUiObject": "Announcement", - "actionFunction": "payload.executeAction" + "actionFunction": "payload.executeAction", + "relatedUiObjectProject": "Social-Bots" }, { "action": "Delete UI Object", @@ -63,7 +64,8 @@ { "name": "announcements", "type": "array", - "childType": "Announcement" + "childType": "Announcement", + "project": "Social-Bots" }, { "name": "userDefinedCode", diff --git a/Projects/Foundations/Schemas/App-Schema/phase.json b/Projects/Foundations/Schemas/App-Schema/phase.json index 5d21bd71c..613eebef0 100644 --- a/Projects/Foundations/Schemas/App-Schema/phase.json +++ b/Projects/Foundations/Schemas/App-Schema/phase.json @@ -21,13 +21,15 @@ "action": "Add UI Object", "label": "Add Move To Phase Event", "relatedUiObject": "Move To Phase Event", - "actionFunction": "payload.executeAction" + "actionFunction": "payload.executeAction", + "relatedUiObjectProject": "Social-Bots" }, { "action": "Add UI Object", "label": "Add Announcement", "relatedUiObject": "Announcement", - "actionFunction": "payload.executeAction" + "actionFunction": "payload.executeAction", + "relatedUiObjectProject": "Social-Bots" }, { "action": "Delete UI Object", @@ -65,7 +67,8 @@ { "name": "announcements", "type": "array", - "childType": "Announcement" + "childType": "Announcement", + "project": "Social-Bots" } ], "propertyNameAtParent": "phases" diff --git a/Projects/Foundations/Schemas/App-Schema/take-position-event.json b/Projects/Foundations/Schemas/App-Schema/take-position-event.json index 6f430c606..0dc5d5415 100644 --- a/Projects/Foundations/Schemas/App-Schema/take-position-event.json +++ b/Projects/Foundations/Schemas/App-Schema/take-position-event.json @@ -11,7 +11,8 @@ "action": "Add UI Object", "label": "Add Announcement", "relatedUiObject": "Announcement", - "actionFunction": "payload.executeAction" + "actionFunction": "payload.executeAction", + "relatedUiObjectProject": "Social-Bots" }, { "action": "Delete UI Object", @@ -38,7 +39,8 @@ { "name": "announcements", "type": "array", - "childType": "Announcement" + "childType": "Announcement", + "project": "Social-Bots" } ], "propertyNameAtParent": "takePosition" diff --git a/Projects/Foundations/Schemas/App-Schema/trigger-off-event.json b/Projects/Foundations/Schemas/App-Schema/trigger-off-event.json index 0869afd50..d31f72585 100644 --- a/Projects/Foundations/Schemas/App-Schema/trigger-off-event.json +++ b/Projects/Foundations/Schemas/App-Schema/trigger-off-event.json @@ -11,7 +11,8 @@ "action": "Add UI Object", "label": "Add Announcement", "relatedUiObject": "Announcement", - "actionFunction": "payload.executeAction" + "actionFunction": "payload.executeAction", + "relatedUiObjectProject": "Social-Bots" }, { "action": "Delete UI Object", @@ -38,7 +39,8 @@ { "name": "announcements", "type": "array", - "childType": "Announcement" + "childType": "Announcement", + "project": "Social-Bots" } ], "propertyNameAtParent": "triggerOff" diff --git a/Projects/Foundations/Schemas/App-Schema/trigger-on-event.json b/Projects/Foundations/Schemas/App-Schema/trigger-on-event.json index b397722a0..da937a55b 100644 --- a/Projects/Foundations/Schemas/App-Schema/trigger-on-event.json +++ b/Projects/Foundations/Schemas/App-Schema/trigger-on-event.json @@ -11,7 +11,8 @@ "action": "Add UI Object", "label": "Add Announcement", "relatedUiObject": "Announcement", - "actionFunction": "payload.executeAction" + "actionFunction": "payload.executeAction", + "relatedUiObjectProject": "Social-Bots" }, { "action": "Delete UI Object", @@ -38,7 +39,8 @@ { "name": "announcements", "type": "array", - "childType": "Announcement" + "childType": "Announcement", + "project": "Social-Bots" } ], "propertyNameAtParent": "triggerOn" diff --git a/Projects/Foundations/Schemas/App-Schema/trigger-stage.json b/Projects/Foundations/Schemas/App-Schema/trigger-stage.json index 0864e2d95..aa8496136 100644 --- a/Projects/Foundations/Schemas/App-Schema/trigger-stage.json +++ b/Projects/Foundations/Schemas/App-Schema/trigger-stage.json @@ -11,7 +11,8 @@ "action": "Add UI Object", "label": "Add Announcement", "relatedUiObject": "Announcement", - "actionFunction": "payload.executeAction" + "actionFunction": "payload.executeAction", + "relatedUiObjectProject": "Social-Bots" }, { "action": "Delete UI Object", @@ -50,7 +51,8 @@ { "name": "announcements", "type": "array", - "childType": "Announcement" + "childType": "Announcement", + "project": "Social-Bots" }, { "name": "userDefinedCode",