Skip to content

Set "max" and "all" as keywords for max amount in /deposit and /withdraw commands #154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Aug 17, 2022
Merged

Set "max" and "all" as keywords for max amount in /deposit and /withdraw commands #154

Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5e22ada
Set "max" and "all" as keywords for max amount in `/deposit`
notsniped Aug 17, 2022
692ec62
Set "max" and "all" as keywords for max amount in `/withdraw`
notsniped Aug 17, 2022
229188a
Set option type for amount in `/deposit` and `/withdraw` as str
notsniped Aug 17, 2022
116694f
Merge branch 'main' into withdraw+deposit.set-max-to-keyword
notsniped Aug 17, 2022
a54f748
Check if value is not int before checking keyword
notsniped Aug 17, 2022
11c76af
Merge branch 'withdraw+deposit.set-max-to-keyword' of https://github.…
notsniped Aug 17, 2022
075d33e
Return warning if value is str and not a valid keyword
notsniped Aug 17, 2022
3945cc3
Remove "all" as supported keyword
notsniped Aug 17, 2022
0f0cea2
Apply changes to `/withdraw` command
notsniped Aug 17, 2022
e6eb4e8
Convert `amount` to int in logic statements
notsniped Aug 17, 2022
f5453de
Debloat logic
notsniped Aug 17, 2022
f52ef99
Debloat logic further
notsniped Aug 17, 2022
0774988
Replace `isnumeric()` with more stable `isdigit()`
notsniped Aug 17, 2022
88e9aa6
Define amount as str when checking for keywords
notsniped Aug 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,15 +263,17 @@ async def warns_clear(ctx:SlashContext, user):
name='deposit',
description='Deposits a specified amount of cash into the bank.',
options=[
create_option(name='amount', description='Specify an amount to deposit (leave blank for max)', option_type=4, required=False)
create_option(name='amount', description='Specify an amount to deposit (use max for everything)', option_type=3, required=True)
]
)
async def deposit(ctx:SlashContext, amount=None):
async def deposit(ctx:SlashContext, amount):
if plugins.economy:
if amount == None: amount = currency["wallet"][str(ctx.author.id)]
if not amount.isdigit():
if str(amount) == "max": amount = currency["wallet"][str(ctx.author.id)]
else: return await ctx.reply("The amount must be a number, or `max`.", hidden=True)
elif currency['bank'] == 0: return await ctx.reply('You don\'t have anything in your bank account.', hidden=True)
elif amount <= 0: return await ctx.reply('The amount to deposit must be more than `0` coins!', hidden=True)
elif amount > currency["wallet"][str(ctx.author.id)]: return await ctx.reply('The amount to deposit must not be more than what you have in your wallet!', hidden=True)
elif int(amount) <= 0: return await ctx.reply('The amount to deposit must be more than `0` coins!', hidden=True)
elif int(amount) > currency["wallet"][str(ctx.author.id)]: return await ctx.reply('The amount to deposit must not be more than what you have in your wallet!', hidden=True)
currency["wallet"][str(ctx.author.id)] -= int(amount)
currency["bank"][str(ctx.author.id)] += int(amount)
await ctx.send(f'You deposited `{amount}` coin(s) to your bank account.')
Expand All @@ -281,15 +283,17 @@ async def deposit(ctx:SlashContext, amount=None):
name='withdraw',
description='Withdraws a specified amount of cash from the bank.',
options=[
create_option(name='amount', description='Specify an amount to withdraw (leave blank for max)', option_type=4, required=False)
create_option(name='amount', description='Specify an amount to withdraw (use max for everything)', option_type=3, required=True)
]
)
async def withdraw(ctx:SlashContext, amount=None):
async def withdraw(ctx:SlashContext, amount):
if plugins.economy:
if amount == None: amount = currency["bank"][str(ctx.author.id)]
if not amount.isdigit():
if str(amount) == "max": amount = currency["wallet"][str(ctx.author.id)]
else: return await ctx.reply("The amount must be a number, or `max`.", hidden=True)
elif currency['bank'] == 0: return await ctx.reply('You don\'t have anything in your bank account.', hidden=True)
elif amount <= 0: return await ctx.reply('The amount to withdraw must be more than `0` coins!', hidden=True)
elif amount > currency["bank"][str(ctx.author.id)]: return await ctx.reply('The amount to withdraw must not be more than what you have in your bank account!', hidden=True)
elif int(amount) <= 0: return await ctx.reply('The amount to withdraw must be more than `0` coins!', hidden=True)
elif int(amount) > currency["bank"][str(ctx.author.id)]: return await ctx.reply('The amount to withdraw must not be more than what you have in your bank account!', hidden=True)
currency["wallet"][str(ctx.author.id)] += int(amount)
currency["bank"][str(ctx.author.id)] -= int(amount)
await ctx.send(f'You withdrew `{amount}` coin(s) from your bank account.')
Expand Down