Merge pull request #174 from Superalgos/develop

Telegram Bots Fixed
This commit is contained in:
Luis Fernando Molina authored and GitHub committed 2020-03-26 16:39:56 +01:00
commit 30a66c9126
6 files changed
+11 -7

No files matched your search

+1 -2
View File
@@ -4485,7 +4485,6 @@
"actionFunction": "payload.onMenuItemClick"
}
],
"isTitleAllwaysVisible": true,
"initialValues": {
"code": "{ \n\"text\": \"Write here what you want to announce when there is no Formula.\"\n}"
},
@@ -4500,7 +4499,7 @@
"properties": [
{
"name": "formula",
"type": "nide",
"type": "node",
"childType": "Formula",
"autoAdd": true
}
@@ -191,6 +191,8 @@ function newCCXTFunctions () {
newMarket.baseAsset.payload.referenceParent = baseAsset
newMarket.quotedAsset.payload.referenceParent = quotedAsset
currentMarkets.set(name, newMarket)
let superActions = node.payload.parentNode.payload.parentNode.payload.parentNode.superActions
for (let j = 0; j < superActions.superActions.length; j++) {
@@ -45,7 +45,7 @@ function newSessionFunctions () {
'Stop->Take Profit->' +
'Phase->Formula->Next Phase Event->' +
'Situation->Condition->Javascript Code->' +
'Announcement->Telegram Bot->' +
'Announcement->Telegram Bot->Formula->' +
'Close Stage->Close Execution->'
let tradingSystem = functionLibraryProtocolNode.getProtocolNode(node.payload.referenceParent, false, true, true, false, false, lightingPath)
@@ -54,7 +54,8 @@ function newSessionFunctions () {
'Backtesting Session->Paper Trading Session->Fordward Testing Session->Live Trading Session->' +
'Parameters->' +
'Base Asset->Quoted Asset->Time Range->Time Frame->Slippage->Fee Structure->' +
'Exchange Account Asset->Asset->'
'Exchange Account Asset->Asset->' +
'Social Bots->Telegram Bot->'
let session = functionLibraryProtocolNode.getProtocolNode(node, false, true, true, false, false, lightingPath)
+1 -1
View File
@@ -22,7 +22,7 @@ The current version opens up the door to working with multiple exchanges and mul
| HitBTC | &#x2610; | &#x2610; | Not tested yet. |
| Kraken | &#x2610; | &#x2610; | Historical data only accessed by id (not by date). Live trading not tested yet. |
| Poloniex | &#x2610; | &#x2610; | At the moment we can not retrieve OHLCVs from Poloniex because we require 1 minute time frame while Poloniex only offers 5 minutes and above. |
| Bittrex | &#x2611; | &#x2610; | Only 6 Months of historical data is provided. Live trading not tested yet. |
| Bittrex | &#x2611; | &#x2610; | Only 6 Months of historical data is provided. Live trading not available because Bittrex allows limit orders only and Superalgos is placing only market orders for now. |
| Gemini | &#x2611; | &#x2610; | Only a few hours of historical data is provided. Live trading not tested yet. |
[*] The ability to fetch historic data for backtesting purposes has been verified.
+1 -1
View File
@@ -512,7 +512,7 @@
for (let i = 0; i < bot.SESSION.socialBots.bots.length; i++) {
let socialBot = bot.SESSION.socialBots.bots[i]
try {
let code = JSON.parse(announcement.code)
let code = announcement.code
if (socialBot.id === announcement.referenceParent.id) {
if (socialBot.type === "Telegram Bot") {
if (announcement.formulaValue !== undefined) {
+3 -1
View File
@@ -2746,7 +2746,9 @@
}
announcement.formulaValue = formulaValue
bot.SESSION.socialBots.announce(announcement)
if (bot.SESSION.socialBots !== undefined) {
bot.SESSION.socialBots.announce(announcement)
}
}
}
}