[Economy] Detect max balance and prevent OverflowError (#2211)

Resolves #2091.

This doesn't fix every OverflowError with MongoDB; but at least the seemingly easiest one to achieve with core cogs.

Signed-off-by: Toby Harradine <tobyharradine@gmail.com>
This commit is contained in:
Toby Harradine 2018-10-16 09:30:53 +11:00 committed by GitHub
parent aff62a8006
commit d2d26835c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 109 additions and 28 deletions

View File

@ -8,7 +8,7 @@ from typing import cast, Iterable
import discord import discord
from redbot.cogs.bank import check_global_setting_guildowner, check_global_setting_admin from redbot.cogs.bank import check_global_setting_guildowner, check_global_setting_admin
from redbot.core import Config, bank, commands from redbot.core import Config, bank, commands, errors
from redbot.core.i18n import Translator, cog_i18n from redbot.core.i18n import Translator, cog_i18n
from redbot.core.utils.chat_formatting import box from redbot.core.utils.chat_formatting import box
from redbot.core.utils.menus import menu, DEFAULT_CONTROLS from redbot.core.utils.menus import menu, DEFAULT_CONTROLS
@ -171,7 +171,7 @@ class Economy(commands.Cog):
try: try:
await bank.transfer_credits(from_, to, amount) await bank.transfer_credits(from_, to, amount)
except ValueError as e: except (ValueError, errors.BalanceTooHigh) as e:
return await ctx.send(str(e)) return await ctx.send(str(e))
await ctx.send( await ctx.send(
@ -195,36 +195,35 @@ class Economy(commands.Cog):
author = ctx.author author = ctx.author
currency = await bank.get_currency_name(ctx.guild) currency = await bank.get_currency_name(ctx.guild)
try:
if creds.operation == "deposit": if creds.operation == "deposit":
await bank.deposit_credits(to, creds.sum) await bank.deposit_credits(to, creds.sum)
await ctx.send( msg = _("{author} added {num} {currency} to {user}'s account.").format(
_("{author} added {num} {currency} to {user}'s account.").format(
author=author.display_name, author=author.display_name,
num=creds.sum, num=creds.sum,
currency=currency, currency=currency,
user=to.display_name, user=to.display_name,
) )
)
elif creds.operation == "withdraw": elif creds.operation == "withdraw":
await bank.withdraw_credits(to, creds.sum) await bank.withdraw_credits(to, creds.sum)
await ctx.send( msg = _("{author} removed {num} {currency} from {user}'s account.").format(
_("{author} removed {num} {currency} from {user}'s account.").format(
author=author.display_name, author=author.display_name,
num=creds.sum, num=creds.sum,
currency=currency, currency=currency,
user=to.display_name, user=to.display_name,
) )
)
else: else:
await bank.set_balance(to, creds.sum) await bank.set_balance(to, creds.sum)
await ctx.send( msg = _("{author} set {user}'s account balance to {num} {currency}.").format(
_("{author} set {user}'s account balance to {num} {currency}.").format(
author=author.display_name, author=author.display_name,
num=creds.sum, num=creds.sum,
currency=currency, currency=currency,
user=to.display_name, user=to.display_name,
) )
) except (ValueError, errors.BalanceTooHigh) as e:
await ctx.send(str(e))
else:
await ctx.send(msg)
@_bank.command() @_bank.command()
@check_global_setting_guildowner() @check_global_setting_guildowner()
@ -260,7 +259,18 @@ class Economy(commands.Cog):
if await bank.is_global(): # Role payouts will not be used if await bank.is_global(): # Role payouts will not be used
next_payday = await self.config.user(author).next_payday() next_payday = await self.config.user(author).next_payday()
if cur_time >= next_payday: if cur_time >= next_payday:
try:
await bank.deposit_credits(author, await self.config.PAYDAY_CREDITS()) await bank.deposit_credits(author, await self.config.PAYDAY_CREDITS())
except errors.BalanceTooHigh as exc:
await bank.set_balance(author, exc.max_balance)
await ctx.send(
_(
"You've reached the maximum amount of {currency}! (**{balance:,}**) "
"Please spend some more \N{GRIMACING FACE}\n\n"
"You currently have {new_balance} {currency}."
).format(currency=credits_name, new_balance=exc.max_balance)
)
return
next_payday = cur_time + await self.config.PAYDAY_TIME() next_payday = cur_time + await self.config.PAYDAY_TIME()
await self.config.user(author).next_payday.set(next_payday) await self.config.user(author).next_payday.set(next_payday)
@ -297,14 +307,25 @@ class Economy(commands.Cog):
).PAYDAY_CREDITS() # Nice variable name ).PAYDAY_CREDITS() # Nice variable name
if role_credits > credit_amount: if role_credits > credit_amount:
credit_amount = role_credits credit_amount = role_credits
try:
await bank.deposit_credits(author, credit_amount) await bank.deposit_credits(author, credit_amount)
except errors.BalanceTooHigh as exc:
await bank.set_balance(author, exc.max_balance)
await ctx.send(
_(
"You've reached the maximum amount of {currency}! "
"Please spend some more \N{GRIMACING FACE}\n\n"
"You currently have {new_balance} {currency}."
).format(currency=credits_name, new_balance=exc.max_balance)
)
return
next_payday = cur_time + await self.config.guild(guild).PAYDAY_TIME() next_payday = cur_time + await self.config.guild(guild).PAYDAY_TIME()
await self.config.member(author).next_payday.set(next_payday) await self.config.member(author).next_payday.set(next_payday)
pos = await bank.get_leaderboard_position(author) pos = await bank.get_leaderboard_position(author)
await ctx.send( await ctx.send(
_( _(
"{author.mention} Here, take some {currency}. " "{author.mention} Here, take some {currency}. "
"Enjoy! (+{amount} {new_balance}!)\n\n" "Enjoy! (+{amount} {currency}!)\n\n"
"You currently have {new_balance} {currency}.\n\n" "You currently have {new_balance} {currency}.\n\n"
"You are currently #{pos} on the global leaderboard!" "You are currently #{pos} on the global leaderboard!"
).format( ).format(
@ -444,7 +465,21 @@ class Economy(commands.Cog):
then = await bank.get_balance(author) then = await bank.get_balance(author)
pay = payout["payout"](bid) pay = payout["payout"](bid)
now = then - bid + pay now = then - bid + pay
try:
await bank.set_balance(author, now) await bank.set_balance(author, now)
except errors.BalanceTooHigh as exc:
await bank.set_balance(author, exc.max_balance)
await channel.send(
_(
"You've reached the maximum amount of {currency}! "
"Please spend some more \N{GRIMACING FACE}\n{old_balance} -> {new_balance}!"
).format(
currency=await bank.get_currency_name(getattr(channel, "guild", None)),
old_balance=then,
new_balance=exc.max_balance,
)
)
return
phrase = T_(payout["phrase"]) phrase = T_(payout["phrase"])
else: else:
then = await bank.get_balance(author) then = await bank.get_balance(author)
@ -561,10 +596,10 @@ class Economy(commands.Cog):
async def paydayamount(self, ctx: commands.Context, creds: int): async def paydayamount(self, ctx: commands.Context, creds: int):
"""Set the amount earned each payday.""" """Set the amount earned each payday."""
guild = ctx.guild guild = ctx.guild
credits_name = await bank.get_currency_name(guild) if creds <= 0 or creds > bank.MAX_BALANCE:
if creds <= 0:
await ctx.send(_("Har har so funny.")) await ctx.send(_("Har har so funny."))
return return
credits_name = await bank.get_currency_name(guild)
if await bank.is_global(): if await bank.is_global():
await self.config.PAYDAY_CREDITS.set(creds) await self.config.PAYDAY_CREDITS.set(creds)
else: else:
@ -579,6 +614,9 @@ class Economy(commands.Cog):
async def rolepaydayamount(self, ctx: commands.Context, role: discord.Role, creds: int): async def rolepaydayamount(self, ctx: commands.Context, role: discord.Role, creds: int):
"""Set the amount earned each payday for a role.""" """Set the amount earned each payday for a role."""
guild = ctx.guild guild = ctx.guild
if creds <= 0 or creds > bank.MAX_BALANCE:
await ctx.send(_("Har har so funny."))
return
credits_name = await bank.get_currency_name(guild) credits_name = await bank.get_currency_name(guild)
if await bank.is_global(): if await bank.is_global():
await ctx.send(_("The bank must be per-server for per-role paydays to work.")) await ctx.send(_("The bank must be per-server for per-role paydays to work."))

View File

@ -4,9 +4,10 @@ from typing import Union, List, Optional
import discord import discord
from redbot.core import Config from . import Config, errors
__all__ = [ __all__ = [
"MAX_BALANCE",
"Account", "Account",
"get_balance", "get_balance",
"set_balance", "set_balance",
@ -26,6 +27,8 @@ __all__ = [
"set_default_balance", "set_default_balance",
] ]
MAX_BALANCE = 2 ** 63 - 1
_DEFAULT_GLOBAL = { _DEFAULT_GLOBAL = {
"is_global": False, "is_global": False,
"bank_name": "Twentysix bank", "bank_name": "Twentysix bank",
@ -170,10 +173,22 @@ async def set_balance(member: discord.Member, amount: int) -> int:
------ ------
ValueError ValueError
If attempting to set the balance to a negative number. If attempting to set the balance to a negative number.
BalanceTooHigh
If attempting to set the balance to a value greater than
``bank.MAX_BALANCE``
""" """
if amount < 0: if amount < 0:
raise ValueError("Not allowed to have negative balance.") raise ValueError("Not allowed to have negative balance.")
if amount > MAX_BALANCE:
currency = (
await get_currency_name()
if await is_global()
else await get_currency_name(member.guild)
)
raise errors.BalanceTooHigh(
user=member.display_name, max_balance=MAX_BALANCE, currency_name=currency
)
if await is_global(): if await is_global():
group = _conf.user(member) group = _conf.user(member)
else: else:

View File

@ -1,4 +1,11 @@
import importlib.machinery import importlib.machinery
from typing import Optional
import discord
from .i18n import Translator
_ = Translator(__name__, __file__)
class RedError(Exception): class RedError(Exception):
@ -14,3 +21,24 @@ class PackageAlreadyLoaded(RedError):
def __str__(self) -> str: def __str__(self) -> str:
return f"There is already a package named {self.spec.name.split('.')[-1]} loaded" return f"There is already a package named {self.spec.name.split('.')[-1]} loaded"
class BankError(RedError):
"""Base error class for bank-related errors."""
class BalanceTooHigh(BankError, OverflowError):
"""Raised when trying to set a user's balance to higher than the maximum."""
def __init__(
self, user: discord.abc.User, max_balance: int, currency_name: str, *args, **kwargs
):
super().__init__(*args, **kwargs)
self.user = user
self.max_balance = max_balance
self.currency_name = currency_name
def __str__(self) -> str:
return _("{user}'s balance cannot rise above {max:,} {currency}.").format(
user=self.user, max=self.max_balance, currency=self.currency_name
)