adelorenzo/stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Print sellreason in sell-message

Browse Source
This commit is contained in:
Matthias 2018-12-04 19:58:26 +01:00
parent cc3b84a8de
commit 33e9ed5a5e
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/webhook-config.md
View File

@ -66,6 +66,7 @@ Possible parameters are:
* profit_fiat * profit_fiat
* stake_currency * stake_currency
* fiat_currency * fiat_currency
* sell_reason
### Webhookstatus ### Webhookstatus

1
freqtrade/freqtradebot.py
View File

@ -834,6 +834,7 @@ class FreqtradeBot(object):
'current_rate': current_rate, 'current_rate': current_rate,
'profit_amount': profit_trade, 'profit_amount': profit_trade,
'profit_percent': profit_percent, 'profit_percent': profit_percent,
'sell_reason': sell_reason.value
} }
# For regular case, when the configuration exists # For regular case, when the configuration exists

23
freqtrade/rpc/telegram.py
View File

@ -125,9 +125,9 @@ class Telegram(RPC):
else: else:
msg['stake_amount_fiat'] = 0 msg['stake_amount_fiat'] = 0
message = "*{exchange}:* Buying [{pair}]({market_url})\n" \ message = ("*{exchange}:* Buying [{pair}]({market_url})\n"
"with limit `{limit:.8f}\n" \ "with limit `{limit:.8f}\n"
"({stake_amount:.6f} {stake_currency}".format(**msg) "({stake_amount:.6f} {stake_currency}").format(**msg)
if msg.get('fiat_currency', None): if msg.get('fiat_currency', None):
message += ",{stake_amount_fiat:.3f} {fiat_currency}".format(**msg) message += ",{stake_amount_fiat:.3f} {fiat_currency}".format(**msg)
@ -137,12 +137,13 @@ class Telegram(RPC):
msg['amount'] = round(msg['amount'], 8) msg['amount'] = round(msg['amount'], 8)
msg['profit_percent'] = round(msg['profit_percent'] * 100, 2) msg['profit_percent'] = round(msg['profit_percent'] * 100, 2)
message = "*{exchange}:* Selling [{pair}]({market_url})\n" \ message = ("*{exchange}:* Selling [{pair}]({market_url})\n"
"*Limit:* `{limit:.8f}`\n" \ "*Limit:* `{limit:.8f}`\n"
"*Amount:* `{amount:.8f}`\n" \ "*Amount:* `{amount:.8f}`\n"
"*Open Rate:* `{open_rate:.8f}`\n" \ "*Open Rate:* `{open_rate:.8f}`\n"
"*Current Rate:* `{current_rate:.8f}`\n" \ "*Current Rate:* `{current_rate:.8f}`\n"
"*Profit:* `{profit_percent:.2f}%`".format(**msg) "*Sell Reason:* `{sell_reason}`\n"
"*Profit:* `{profit_percent:.2f}%`").format(**msg)
# Check if all sell properties are available. # Check if all sell properties are available.
# This might not be the case if the message origin is triggered by /forcesell # This might not be the case if the message origin is triggered by /forcesell
@ -150,8 +151,8 @@ class Telegram(RPC):
and self._fiat_converter): and self._fiat_converter):
msg['profit_fiat'] = self._fiat_converter.convert_amount( msg['profit_fiat'] = self._fiat_converter.convert_amount(
msg['profit_amount'], msg['stake_currency'], msg['fiat_currency']) msg['profit_amount'], msg['stake_currency'], msg['fiat_currency'])
message += '` ({gain}: {profit_amount:.8f} {stake_currency}`' \ message += ('` ({gain}: {profit_amount:.8f} {stake_currency}`'
'` / {profit_fiat:.3f} {fiat_currency})`'.format(**msg) '` / {profit_fiat:.3f} {fiat_currency})`').format(**msg)
elif msg['type'] == RPCMessageType.STATUS_NOTIFICATION: elif msg['type'] == RPCMessageType.STATUS_NOTIFICATION:
message = '*Status:* `{status}`'.format(**msg) message = '*Status:* `{status}`'.format(**msg)