Merge branch 'development' into feature/license

.github/issue_template.md

@@ -0,0 +1,28 @@
+### Prerequisites
+
+* [ ] Are you running the latest version?
+* [ ] Are you reporting to the correct repository?
+* [ ] Did you search the current opened issues?
+
+
+### Description
+
+[Description of the bug or feature]
+
+### Steps to Reproduce
+
+1. [First Step]
+2. [Second Step]
+3. [and so on...]
+
+**Expected behavior:** [What you expected to happen]
+
+**Actual behavior:** [What actually happened]
+
+### Versions
+
+Bitprophet version: [version]
+
+NPM version: [version]
+
+You can get this information from executing `npm version`.

README.md

@@ -118,22 +118,23 @@ Create your strategies based on the examples.
 
 #### Chat Bots BitProphet Cheat Sheet
 
-* __status__ / __st__ - Check BitProphet's version and status
-* __account__ / __total__ / __ttl__ - Total balance in BTC and USDT, plus BNB amount
-* __btc__ - BTC value
-* __profits__ / __%__ - Profits
-* __profits +__ / __% +__ - Profits detailed
-* __left__ / __l__ - Trades left
-* __pause__ - Pause system (ongoing trades won't be paused)
-* __exit token__ / __sell token__ - Sells token, if it's currently trading
-* __exit token price__ / __sell token price__ - Sells token@price, if it's currently trading
+* __help__ | __h__ - Shows all available commands
+* __status__ | __st__ - Check BitProphet's version and status
+* __account__ | __total__ | __ttl__ - Total balance in BTC and USDT, plus BNB amount
+* __profits__ | __%__ - Profits
+* __profits +__ | __% +__ - Profits detailed
+* __left__ | __l__ - Trades left
+* __sell token__ | __exit token__ - Sells token, if it's currently trading
+* __sell token price__ | __exit token price__ - Sells token@price, if it's currently trading
 * __cancel token__ - Cancel currently trading token
-* __orders__ / __o__ - List open orders
-* __orders token__ / __o token__ - List open orders for the given token
+* __orders__ | __o__ - List open orders
+* __orders token__ | __o token__ - List open orders for the given token
 * __start strategyId__ - Starts strategy
 * __stop strategyId__ - Stops strategy
 * __list__ - Lists all strategies
 * __list strategyId__ - Lists all valid / trading pairs for the given strategy
+* __token__ | __tokenmarket__ - Price for the specified token, BTC market default. (e.g. ada, adaeth)
+* __pause__ - Pause system (ongoing trades won't be paused)
 * __restart__ - Kills the platform. Useful when using a keep alive process manager like [pm2](https://github.com/Unitech/pm2).
 
 ![Profits Discord](https://github.com/andresilvasantos/bitprophet/raw/master/pres/chat_profits.png)

bitprophet.js

@@ -235,15 +235,17 @@ module.exports = function() {
  indicators: indicators,
  options: function(opt) {
  if(typeof opt.strategiesDir === "string") options.strategiesDir = opt.strategiesDir
+ if(typeof opt.commandsCustomDir === "string") options.commandsCustomDir = opt.commandsCustomDir
  if(typeof opt.mainLoopTimer === "number") options.mainLoopTimer = opt.mainLoopTimer
  if(typeof opt.pauseDangerBTC === "boolean") options.pauseDangerBTC = opt.pauseDangerBTC
  if(typeof opt.verbose === "boolean") options.verbose = opt.verbose
  options.binance = opt.binance
- options.telegram = opt.telegram
- options.discord = opt.discord
+ options.telegram = opt.telegram || {}
+ options.discord = opt.discord || {}
  vars.options = options
  },
  listenToChatId: function() {
+ console.log("WTF")
  chatBot.init(true)
  },
  start: function(next) {
@@ -282,9 +284,6 @@ module.exports = function() {
 
  vars.pairs["BTCUSDT"].addWatcherChartUpdates(btcIntervalsWatch)
 
- //TODO load previous active strategies
- //TODO load previous trading pairs
-
  chatBot.sendMessage(":traffic_light: BitProphet started: " + utils.formatDate(new Date(), true, true) + "\nTotal: " +
  vars.startBTCAmount + "BTC | " + balance.usdtTotal.toFixed(2) + "$")