diff --git a/redbot/cogs/economy/economy.py b/redbot/cogs/economy/economy.py index cfc3acb7a..c3772e288 100644 --- a/redbot/cogs/economy/economy.py +++ b/redbot/cogs/economy/economy.py @@ -224,7 +224,7 @@ class Economy: user = ctx.author else: user = ctx.guild.owner - success = await bank.wipe_bank(user) + success = await bank.wipe_bank() if success: await ctx.send(_("All bank accounts of this guild have been " "deleted.")) @@ -287,7 +287,7 @@ class Economy: if top < 1: top = 10 if await bank.is_global(): - bank_sorted = sorted(await bank.get_global_accounts(ctx.author), + bank_sorted = sorted(await bank.get_global_accounts(), key=lambda x: x.balance, reverse=True) else: bank_sorted = sorted(await bank.get_guild_accounts(guild), diff --git a/redbot/core/bank.py b/redbot/core/bank.py index f1cc0e9f2..ebcf72ce8 100644 --- a/redbot/core/bank.py +++ b/redbot/core/bank.py @@ -279,24 +279,12 @@ async def transfer_credits(from_: discord.Member, to: discord.Member, amount: in return await deposit_credits(to, amount) -async def wipe_bank(user: Union[discord.User, discord.Member]): - """Delete all accounts from the bank. - - .. important:: - - A member is required if the bank is currently guild specific. - - Parameters - ---------- - user : `discord.User` or `discord.Member` - A user to be used in clearing the bank, this is required for technical - reasons and it does not matter which user/member is used. - - """ +async def wipe_bank(): + """Delete all accounts from the bank.""" if await is_global(): - await _conf.user(user).clear() + await _conf.clear_all_users() else: - await _conf.member(user).clear() + await _conf.clear_all_members() async def get_guild_accounts(guild: discord.Guild) -> List[Account]: @@ -330,14 +318,9 @@ async def get_guild_accounts(guild: discord.Guild) -> List[Account]: return ret -async def get_global_accounts(user: discord.User) -> List[Account]: +async def get_global_accounts() -> List[Account]: """Get all global account data. - Parameters - ---------- - user : discord.User - A user to be used for getting accounts. - Returns ------- `list` of `Account` @@ -409,7 +392,7 @@ async def is_global() -> bool: return await _conf.is_global() -async def set_global(global_: bool, user: Union[discord.User, discord.Member]) -> bool: +async def set_global(global_: bool) -> bool: """Set global status of the bank. .. important::