From f5bd08508ab77636989fd47726022b42ca3aafe5 Mon Sep 17 00:00:00 2001 From: lza_menace Date: Thu, 30 Jul 2020 02:13:14 -0700 Subject: [PATCH] adjusting some admin commands, removing transfer and normalizing output --- tipbot/admin.py | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/tipbot/admin.py b/tipbot/admin.py index 3f47b9f..444fe45 100644 --- a/tipbot/admin.py +++ b/tipbot/admin.py @@ -9,13 +9,11 @@ def cli(): pass @click.command() -def get_users(): +def get_registered_users(): users = db.User.select() wallet = wownero.Wallet() for u in users: - balances = wallet.balances(account=u.account_index) - address = wallet.addresses(account=u.account_index)[0] - click.echo(f'{u.account_index} - {u.telegram_user} ({u.telegram_id}) - {float(balances[0])} locked, {float(balances[1])} unlocked - {address}') + click.echo(f'{u.account_index} - {u.telegram_id}') @click.command() @click.argument('account_index') @@ -24,15 +22,12 @@ def get_address(account_index): click.echo(address) @click.command() -def get_wallet_accounts(): - accounts = wownero.Wallet().accounts() - click.echo(accounts) - -@click.command() -@click.argument('dest_address') -@click.argument('amount') -def transfer(dest_address, amount): - tx = wownero.Wallet().transfer(dest_address=dest_address, amount=amount, priority=2, account=0) +def get_wallet_balances(): + wallet = wownero.Wallet() + accounts = wallet.accounts() + for acc in accounts: + balances = wallet.balances(account=acc) + click.echo(f'{acc} - {float(balances[0])} locked, {float(balances[1])} unlocked') @click.command() def generate_bot_help(): @@ -41,11 +36,10 @@ def generate_bot_help(): if not 'admin' in c: click.echo(f'{cmd} - {commands.all_commands[cmd]["help"]}') -cli.add_command(get_users) +cli.add_command(get_registered_users) cli.add_command(get_address) -cli.add_command(transfer) cli.add_command(generate_bot_help) -cli.add_command(get_wallet_accounts) +cli.add_command(get_wallet_balances) if __name__ == '__main__': cli()