[Bank] Allow bank managers to set the maximum allowed balance in the bank #2926
Conversation
`[p]bankset maxbal` can be used to set the maximum bank balance Signed-off-by: Guy <guyreis96@gmail.com>
`[p]bankset maxbal` can be used to set the maximum bank balance Signed-off-by: Guy <guyreis96@gmail.com>
`[p]bankset maxbal` can be used to set the maximum bank balance Signed-off-by: Guy <guyreis96@gmail.com>
Signed-off-by: Guy <guyreis96@gmail.com>
|
Lets merge this one AFTER #2925, these 2 conflict, once 2925 is merged I will update this one accordingly. |
Signed-off-by: guyre <27962761+drapersniper@users.noreply.github.com>
* Fixed `[p]local start` Playlist picker auto selects if theres just 1 playlist found `[p]queue cleanself` added Signed-off-by: Guy <guyreis96@gmail.com> * Black.... you are supposed to trigger before commits Signed-off-by: Guy <guyreis96@gmail.com> * Added `BalanceTooHigh` to the docstrings of `bank.transfer_credits()` Signed-off-by: guyre <27962761+drapersniper@users.noreply.github.com> * Bring this in line with #2926 to reduce conflicts,`is_global()` already is called inside `get_currency_name` and as such it does not need to be called outside Signed-off-by: guyre <27962761+drapersniper@users.noreply.github.com>
|
Conflicts have been resolved, this should be ready to be tested/merged now |
|
The upper limit on the balance was put in place to prevent an integer overflow on MongoDB. Specifically, this means the upper limit should always be 2^64 - 1 (although it's probably 2^32 - 1 on 32-bit systems running Mongo, Mongo isn't recommended on 32-bit systems) |
|
@Tobotimus The limit is still bound to that here as an upper limit (not made clear in the description) |
| @@ -550,14 +550,16 @@ def __init__(self, bot: Red): | |||
| "Slot cooldown: {slot_time}\n" | |||
| "Payday amount: {payday_amount}\n" | |||
| "Payday cooldown: {payday_time}\n" | |||
| "Amount given at account registration: {register_amount}" | |||
| "Amount given at account registration: {register_amount}\n" | |||
| "Maximum allowed balance: {maximum_bal}" | |||
There was a problem hiding this comment.
Should this be under economyset or bankset? The command to change it is under bankset.
There was a problem hiding this comment.
I've added it to both now , i think given that economyset sets the payday values etc its nice to haver it there.
Flame442
added
the
QA: Changes Requested
… and `[p]bank balance` will set the users balance to max balance if the bank maxbal is lower than the previous user balance Signed-off-by: guyre <27962761+drapersniper@users.noreply.github.com>
Signed-off-by: guyre <27962761+drapersniper@users.noreply.github.com>
There was a problem hiding this comment.
Looking much better, the only other thing is that the payday and starting balance values can be set higher than the max balance if the max balance is changed to lower than either of those values. It isn't really an issue since the balance will be set to where it should be at some point anyway, however it is a small inconsistency. If you can think of a good way to fix it, fix it. If not, don't stress about it.
| @@ -766,6 +768,10 @@ def _invalid_amount(amount: int) -> bool: | |||
|
|
|||
| """ | |||
| amount = int(amount) | |||
| max_bal = await get_max_balance(guild) | |||
There was a problem hiding this comment.
I think raising an error would be better than silently changing the value. Make sure you also change the command to respond to whatever error is raised.
There was a problem hiding this comment.
Looking much better, the only other thing is that the payday and starting balance values can be set higher than the max balance if the max balance is changed to lower than either of those values. It isn't really an issue since the balance will be set to where it should be at some point anyway, however it is a small inconsistency. If you can think of a good way to fix it, fix it. If not, don't stress about it.
As discussed in discord
We have 2 options:
-
Set it the payday amount and initial balance amount with the
bankset maxbalcommand if the old value is higher than the current max -
Change the values in
banksetandeconomysethelp message to the max value if they are higher than the current max value
My issue with 1 is that since this is in the Bank cog it shouldn't edit settings for the Economy Cog, with 2 it's technically False values
Signed-off-by: guyre <27962761+drapersniper@users.noreply.github.com>
Flame442
added
QA: Passed
* Removes `MAX_BALANCE` from bank, user `bank.get_max_balance()` now `[p]bankset maxbal` can be used to set the maximum bank balance Signed-off-by: Guy <guyreis96@gmail.com> * Pushed the Fix for new issue introduced by #2926 Signed-off-by: guyre <27962761+drapersniper@users.noreply.github.com> * Changelogs Signed-off-by: guyre <27962761+drapersniper@users.noreply.github.com> * Rename changelog to a misc Signed-off-by: guyre <27962761+drapersniper@users.noreply.github.com> * Address Flame's review Signed-off-by: guyre <27962761+drapersniper@users.noreply.github.com> * Correct an outdated reference in the docs Signed-off-by: guyre <27962761+drapersniper@users.noreply.github.com> * Reword docstring for the RuntimeError Signed-off-by: guyre <27962761+drapersniper@users.noreply.github.com>
Type
Description of the changes
[p]bankset maxbalcan be used to set the maximum bank balanceNOTE: This removes the
MAX_BALANCEconstant from thebankmoduleTo get the maximum allowed balance use the new
bank.get_max_balance()method