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

Added emoji's to Telegram RPC (from newest develop version)

Browse Source
This commit is contained in:
Theagainmen 2020-06-05 17:50:52 +02:00 committed by GitHub
parent a19e738e03
commit 680a5fec56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 41 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
freqtrade/rpc/telegram.py
View File

@ -327,7 +327,6 @@ class Telegram(RPC):
stake_cur = self._config['stake_currency'] stake_cur = self._config['stake_currency']
fiat_disp_cur = self._config.get('fiat_display_currency', '') fiat_disp_cur = self._config.get('fiat_display_currency', '')
try:
stats = self._rpc_trade_statistics( stats = self._rpc_trade_statistics(
stake_cur, stake_cur,
fiat_disp_cur) fiat_disp_cur)
@ -343,22 +342,28 @@ class Telegram(RPC):
avg_duration = stats['avg_duration'] avg_duration = stats['avg_duration']
best_pair = stats['best_pair'] best_pair = stats['best_pair']
best_rate = stats['best_rate'] best_rate = stats['best_rate']
if stats['trade_count'] == 0:
markdown_msg = 'No trades yet.'
else:
# Message to display # Message to display
markdown_msg = "*ROI:* Close trades\n" \ if stats['closed_trade_count'] > 0:
f"∙ `{profit_closed_coin:.8f} {stake_cur} "\ markdown_msg = ("*ROI:* Closed trades\n"
f"({profit_closed_percent:.2f}%)`\n" \ f"∙ `{profit_closed_coin:.8f} {stake_cur} "
f"∙ `{profit_closed_fiat:.3f} {fiat_disp_cur}`\n" \ f"({profit_closed_percent:.2f}%)`\n"
f"*ROI:* All trades\n" \ f"∙ `{profit_closed_fiat:.3f} {fiat_disp_cur}`\n")
f"∙ `{profit_all_coin:.8f} {stake_cur} ({profit_all_percent:.2f}%)`\n" \ else:
f"∙ `{profit_all_fiat:.3f} {fiat_disp_cur}`\n" \ markdown_msg = "`No closed trade` \n"
f"*Total Trade Count:* `{trade_count}`\n" \
f"*First Trade opened:* `{first_trade_date}`\n" \ markdown_msg += (f"*ROI:* All trades\n"
f"*Latest Trade opened:* `{latest_trade_date}`\n" \ f"∙ `{profit_all_coin:.8f} {stake_cur} ({profit_all_percent:.2f}%)`\n"
f"*Avg. Duration:* `{avg_duration}`\n" \ f"∙ `{profit_all_fiat:.3f} {fiat_disp_cur}`\n"
f"*Best Performing:* `{best_pair}: {best_rate:.2f}%`" f"*Total Trade Count:* `{trade_count}`\n"
f"*First Trade opened:* `{first_trade_date}`\n"
f"*Latest Trade opened:* `{latest_trade_date}`")
if stats['closed_trade_count'] > 0:
markdown_msg += (f"\n*Avg. Duration:* `{avg_duration}`\n"
f"*Best Performing:* `{best_pair}: {best_rate:.2f}%`")
self._send_msg(markdown_msg) self._send_msg(markdown_msg)
except RPCException as e:
self._send_msg(str(e))
@authorized_only @authorized_only
def _balance(self, update: Update, context: CallbackContext) -> None: def _balance(self, update: Update, context: CallbackContext) -> None:
@ -550,6 +555,11 @@ class Telegram(RPC):
try: try:
blacklist = self._rpc_blacklist(context.args) blacklist = self._rpc_blacklist(context.args)
errmsgs = []
for pair, error in blacklist['errors'].items():
errmsgs.append(f"Error adding `{pair}` to blacklist: `{error['error_msg']}`")
if errmsgs:
self._send_msg('\n'.join(errmsgs))
message = f"Blacklist contains {blacklist['length']} pairs\n" message = f"Blacklist contains {blacklist['length']} pairs\n"
message += f"`{', '.join(blacklist['blacklist'])}`" message += f"`{', '.join(blacklist['blacklist'])}`"