d0s3t3ch
/
tg-bot
mirror of https://git.wownero.com/lza_menace/tg-bot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix markdown syntax and include more debug msg for user

This commit is contained in:
lza_menace 2020-08-06 01:24:39 -07:00
parent b061822092
commit 63a1939fd0
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tipbot/commands/tip.py
View File

@ -1,5 +1,6 @@
import logging
from decimal import Decimal
from telegram import ParseMode
from tipbot import wownero
from tipbot import db
from tipbot.helpers.decorators import wallet_rpc_required, log_event, registration_required
@ -61,9 +62,11 @@ def tip(update, context):
tx = wownero.Wallet().transfer(dest_address=address, amount=wownero.as_wownero(amount), priority=2, account=tipper.account_index)
if 'tx_hash' in tx:
h = tx['tx_hash']
update.message.reply_text(f'Tipped @{target_un} {amount} WOW! TX ID: [{h}](https://wownero.xmrauctions.com/transaction/{h})')
msg = f'Tipped @{target_un} {amount} WOW! TX ID: [{h}](https://wownero.xmrauctions.com/transaction/{h})'
update.message.reply_text(msg, parse_mode=ParseMode.MARKDOWN_V2)
else:
update.message.reply_text('Failed to send a tip. Ask for help.')
logging.error(f'Transaction failure details for {tipper.telegram_user} ({tipper.telegram_id}): {tx}')
update.message.reply_text(f'Failed to send a tip. Reason: "{tx["message"]}"')
except Exception as e:
logging.error(f'Unable to send transfer: {e}. Debug: {update.message}')
update.message.reply_text('Failed to send a tip. Ask for help.')

9
tipbot/commands/withdraw.py
View File

@ -1,5 +1,6 @@
import logging
from decimal import Decimal
from telegram import ParseMode
from tipbot import wownero
from tipbot import db
from tipbot.helpers.decorators import wallet_rpc_required, log_event, registration_required
@ -42,9 +43,11 @@ def withdraw(update, context):
tx = wownero.Wallet().transfer(dest_address=address, amount=wownero.as_wownero(amount), priority=2, account=sender.account_index)
if 'tx_hash' in tx:
h = tx['tx_hash']
update.message.reply_text(f'Sent {amount} WOW! TX ID: [{h}](https://wownero.xmrauctions.com/transaction/{h})')
msg = f'Sent {amount} WOW! TX ID: [{h}](https://wownero.xmrauctions.com/transaction/{h})'
update.message.reply_text(msg, parse_mode=ParseMode.MARKDOWN_V2)
else:
update.message.reply_text('Failed to send Wownero. Ask for help.')
logging.error(f'Transaction failure details for {sender.telegram_user} ({sender.telegram_id}): {tx}')
update.message.reply_text(f'Failed to withdraw Wownero. Reason: "{tx["message"]}"')
except Exception as e:
logging.error(f'Unable to send transfer: {e}. Debug: {update.message}')
update.message.reply_text('Failed to send Wownero. Ask for help.')
update.message.reply_text('Failed to withdraw Wownero. Ask for help.')