Skip to content
This repository was archived by the owner on Feb 7, 2026. It is now read-only.

Fix string opening and closing formatting and remove redundant fstrings #286

Merged
notsniped merged 2 commits into from
May 28, 2023
Merged

Fix string opening and closing formatting and remove redundant fstrings #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f773976
Fix broken string opening/closing formatting
notsniped May 28, 2023
28b1d39
Remove all redundant fstrings
notsniped May 28, 2023
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
81 changes: 42 additions & 39 deletions cogs/economy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ async def beg(self, ctx: ApplicationContext):
x = randint(10, 100)
currency["wallet"][str(ctx.author.id)] += x
save()
await ctx.respond(embed=discord.Embed(title=random.choice(names), description=f'"Oh you poor beggar, here\'s {x} coin(s) for you. Hope it helps!"'))
await ctx.respond(embed=discord.Embed(title=random.choice(names), description=f"Oh you poor beggar, here's {x} coin(s) for you. Hope it helps!"))
else: await ctx.respond(embed=discord.Embed(title=random.choice(names), description=f'"{random.choice(fail_responses)}"'))

@commands.slash_command(
Expand All @@ -208,7 +208,7 @@ async def beg(self, ctx: ApplicationContext):
async def daily(self, ctx: ApplicationContext):
currency['wallet'][str(ctx.author.id)] += 10000
save()
await ctx.respond(f'You claimed 10000 coins from the daily reward. Check back in 24 hours for your next one!')
await ctx.respond('You claimed 10000 coins from the daily reward. Check back in 24 hours for your next one!')

@commands.slash_command(
name='weekly',
Expand All @@ -218,7 +218,7 @@ async def daily(self, ctx: ApplicationContext):
async def weekly(self, ctx: ApplicationContext):
currency['wallet'][str(ctx.author.id)] += 45000
save()
await ctx.respond(f'You claimed 45000 coins from the weekly reward. Check back in 7 days for your next one!')
await ctx.respond('You claimed 45000 coins from the weekly reward. Check back in 7 days for your next one!')

@commands.slash_command(
name='monthly',
Expand All @@ -228,7 +228,7 @@ async def weekly(self, ctx: ApplicationContext):
async def monthly(self, ctx: ApplicationContext):
currency['wallet'][str(ctx.author.id)] += 1000000
save()
await ctx.respond(f'You claimed 1000000 coins from the monthly reward. Check back in 1 month for your next one!')
await ctx.respond('You claimed 1000000 coins from the monthly reward. Check back in 1 month for your next one!')

@commands.slash_command(
name='rob',
Expand All @@ -243,17 +243,17 @@ async def rob(self, ctx: ApplicationContext, user:discord.User):
x = randint(5000, currency['wallet'][str(user.id)])
currency['wallet'][str(ctx.author.id)] += x
currency['wallet'][str(user.id)] -= x
await ctx.respond(f'You just stole {x} coins from {user.display_name}! Feels good, doesn\'t it?')
await ctx.respond(f"You just stole {x} coins from {user.display_name}! Feels good, doesn't it?")
else:
x = randint(5000, currency['wallet'][str(ctx.author.id)])
currency['wallet'][str(ctx.author.id)] -= x
currency['wallet'][str(user.id)] += x
await ctx.respond(f'LOL YOU GOT CAUGHT! You paid {user.display_name} {x} coins as compensation for your action.')
await ctx.respond(f"LOL YOU GOT CAUGHT! You paid {user.display_name} {x} coins as compensation for your action.")
save()

@commands.slash_command(
name='bankrob',
description='Raids someone\'s bank account'
description="Raids someone's bank account"
)
@option(name="user", description="Whose bank account do you want to raid?", type=discord.User)
@commands.cooldown(1, (60*5), commands.BucketType.user)
Expand All @@ -264,19 +264,19 @@ async def bankrob(self, ctx: ApplicationContext, user:discord.User):
x = randint(10000, currency['wallet'][str(user.id)])
currency['wallet'][str(ctx.author.id)] += x
currency['bank'][str(user.id)] -= x
await ctx.respond(f'You raided {user.display_name}\'s bank and ended up looting {x} coins from them! Now thats what I like to call *success*.')
await ctx.respond(f"You raided {user.display_name}'s bank and ended up looting {x} coins from them! Now thats what I like to call *success*.")
else:
x = 10000
currency['wallet'][str(ctx.author.id)] -= x
await ctx.respond(f'Have you ever thought of this as the outcome? You failed AND ended up getting caught by the police. You just lost {x} coins, you absolute loser.')
await ctx.respond(f"Have you ever thought of this as the outcome? You failed AND ended up getting caught by the police. You just lost {x} coins, you absolute loser.")

@commands.slash_command(
name='hunt',
description='Pull out your rifle and hunt down animals'
)
@commands.cooldown(1, 30, commands.BucketType.user)
async def hunt(self, ctx: ApplicationContext):
if items[str(ctx.author.id)]['rifle'] == 0: return await ctx.respond('I\'d hate to see you hunt with your bare hands. Please buy a hunting rifle from the shop. ||/buy rifle||')
if items[str(ctx.author.id)]['rifle'] == 0: return await ctx.respond("I'd hate to see you hunt with your bare hands. Please buy a hunting rifle from the shop. ||/buy rifle||")
loot = ['rock', 'ant', 'skunk', 'boar', 'deer', 'dragon', 'nothing', 'died']
choice = random.choice(loot)
if choice != "nothing" and choice != "died":
Expand All @@ -287,15 +287,15 @@ async def hunt(self, ctx: ApplicationContext):
elif (choice == "died"):
currency['wallet'][str(ctx.author.id)] -= 1000
save()
await ctx.respond('Stupid, you died while hunting and lost 1000 coins...')
await ctx.respond("Stupid, you died while hunting and lost 1000 coins...")

@commands.slash_command(
name='fish',
description='Prepare your fishing rod and catch some fish'
)
@commands.cooldown(1, 45, commands.BucketType.user)
async def fish(self, ctx: ApplicationContext):
if (items[str(ctx.author.id)]['fishingpole'] == 0): return await ctx.respond('I don\'t think you can fish with your bare hands... or you can just put yo hands in the water bro **giga chad moment**\nAnyway it\'s just better to buy a fishing pole from the shop. ||/buy fishingpole||')
if (items[str(ctx.author.id)]['fishingpole'] == 0): return await ctx.respond("I don't think you can fish with your bare hands... or you can just put yo hands in the water bro **giga chad moment**\nAnyway it's just better to buy a fishing pole from the shop. ||/buy fishingpole||")
loot = ['shrimp', 'fish', 'rare fish', 'exotic fish', 'jellyfish', 'shark', 'nothing']
choice = random.choice(loot)
if choice != "nothing":
Expand All @@ -310,7 +310,7 @@ async def fish(self, ctx: ApplicationContext):
)
@commands.cooldown(1, 45, commands.BucketType.user)
async def dig(self, ctx: ApplicationContext):
if (items[str(ctx.author.id)]['shovel'] == 0): return await ctx.respond('You\'re too good to have to dig with your bare hands..... at least I hope so. Please buy a shovel from the shop. ||/buy shovel||')
if (items[str(ctx.author.id)]['shovel'] == 0): return await ctx.respond("You're too good to have to dig with your bare hands..... at least I hope so. Please buy a shovel from the shop. ||/buy shovel||")
loot = [
'coins',
'shovel',
Expand All @@ -327,7 +327,7 @@ async def dig(self, ctx: ApplicationContext):
if (choice == "coins"):
currency['wallet'][str(ctx.author.id)] += random.randint('1000', '5000')
save()
await ctx.respond(f'You went digging and found a bunch of coins. Nice!')
await ctx.respond('You went digging and found a bunch of coins. Nice!')
elif choice != "nothing" and choice != "died":
items[str(ctx.author.id)][choice] += 1
save()
Expand Down Expand Up @@ -655,7 +655,7 @@ async def networth(self, ctx: ApplicationContext, user: discord.User=None):
@option(name="user", description="Whose inventory you want to view?", type=discord.User, default=None)
async def inventory(self, ctx: ApplicationContext, user:discord.User = None):
if user == None: user = ctx.author
localembed = discord.Embed(title=f'{user.display_name}\'s Inventory')
localembed = discord.Embed(title=f"{user.display_name}'s Inventory")
filtered_utility_items = list()
filtered_sellables = list()
filtered_powerups = list()
Expand Down Expand Up @@ -696,7 +696,7 @@ async def balance(self, ctx: ApplicationContext, user=None):
try:
if user == None: user = ctx.author
try:
e = discord.Embed(title=f'{user.display_name}\'s balance', color=color)
e = discord.Embed(title=f"{user.display_name}'s balance", color=color)
e.add_field(name='Cash in wallet', value=f'{currency["wallet"][str(user.id)]} coin(s)', inline=True)
e.add_field(name='Cash in bank account', value=f'{currency["bank"][str(user.id)]} coin(s)', inline=True)
e.add_field(name="Networth", value=f"{get_user_networth(user.id)} coin(s)", inline=True)
Expand All @@ -717,29 +717,32 @@ async def treasury(self, ctx: ApplicationContext):
description="View the global leaderboard for net worth."
)
async def leaderboard_nw(self, ctx: ApplicationContext):
nw_dict = dict()
for person in currency:
nw_dict[str(person)] = int(currency["wallet"][str(person)]) + int(currency["bank"][str(person)])
undicted_leaderboard = sorted(nw_dict.items(), key=lambda x:x[1], reverse=True)
dicted_leaderboard = dict(undicted_leaderboard)
parsed_output = str()
y = 1
for i in dicted_leaderboard:
if y < 5:
try:
if nw_dict[i] != 0:
user_context = await commands.fetch_user(i)
if not user_context.bot:
print(i, nw_dict[i])
if y == 1: yf = ":first_place:"
elif y == 2: yf = ":second_place:"
elif y == 3: yf = ":third_place:"
else: yf = f"#{y}"
parsed_output += f"{yf} **{user_context.name}:** {nw_dict[i]} coins\n"
y += 1
except discord.errors.NotFound: continue
localembed = discord.Embed(title="Global net worth leaderboard", description=parsed_output, color=color)
await ctx.respond(embed=localembed)
await ctx.respond("This command is currently disabled due to an internal issue. I apologize for the inconvenience.", ephemeral=True)
#await ctx.defer()
#nw_dict = dict()
#for person in currency["wallet"]:
# nw_dict[str(person)] = int(currency["wallet"][str(person)]) + int(currency["bank"][str(person)])
#undicted_leaderboard = sorted(nw_dict.items(), key=lambda x:x[1], reverse=True)
#dicted_leaderboard = dict(undicted_leaderboard)
#parsed_output = str()
#y = 1
#for i in dicted_leaderboard:
# if y < 10:
# try:
# if nw_dict[i] != 0:
# user_context = await discord.ext.commands.Bot.fetch_user(self, int(i))
# if not user_context.bot:
# print(i, nw_dict[i])
# if y == 1: yf = ":first_place:"
# elif y == 2: yf = ":second_place:"
# elif y == 3: yf = ":third_place:"
# else: yf = f"#{y}"
# parsed_output += f"{yf} **{user_context.name}:** {nw_dict[i]} coins\n"
# y += 1
# except discord.errors.NotFound: continue
# except Exception as e: print(e)
#localembed = discord.Embed(title="Global net worth leaderboard", description=parsed_output, color=color)
#await ctx.respond(embed=localembed)

# Initialization
def setup(bot):
Expand Down
4 changes: 2 additions & 2 deletions cogs/minigames.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ def check(msg): return msg.author == ctx.author and msg.channel == ctx.channel a
await ctx.respond(f'Congrats! Your number was {numb2} and you won **{coins} coins**.')
currency["wallet"][ctx.author.id] += coins
save()
elif numb < numb2: await ctx.respond(f'Wrong! The number was **{numb2}**.')
elif numb == numb2: await ctx.respond(f'Rip bozo, you just missed your chance of winning 5 million coins because you didn\'t choose `jackpot` XD')
elif numb < numb2: await ctx.respond(f"Wrong! The number was **{numb2}**.")
elif numb == numb2: await ctx.respond("Rip bozo, you just missed your chance of winning 5 million coins because you didn't choose `jackpot` XD")
if msg.content == 'jackpot':
if numb == numb2:
await ctx.respond(f'Congrats! Your luck did you good because your number was {numb2} and you earned **5 million coins**. GG!')
Expand Down
24 changes: 12 additions & 12 deletions main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class plugins:

#Framework Module Loader
colors = framework.isobot.colors.Colors()
currency_unused = framework.isobot.currency.CurrencyAPI(f'{wdir}/database/currency.json', f"{wdir}/logs/currency.log") # Initialize part of the framework (Currency)
currency_unused = framework.isobot.currency.CurrencyAPI(f"{wdir}/database/currency.json", f"{wdir}/logs/currency.log") # Initialize part of the framework (Currency)
# isobank = framework.isobank.manager.IsoBankManager(f"{wdir}/database/isobank/accounts.json", f"{wdir}/database/isobank/auth.json")
isobankauth = framework.isobank.authorize.IsobankAuth(f"{wdir}/database/isobank/auth.json", f"{wdir}/database/isobank/accounts.json")

Expand Down Expand Up @@ -164,20 +164,20 @@ async def on_message(ctx):
async def on_application_command_error(ctx: ApplicationContext, error: discord.DiscordException):
current_time = datetime.time().strftime("%H:%M:%S")
if isinstance(error, commands.CommandOnCooldown):
await ctx.respond(f':stopwatch: Not now! Please try after **{str(datetime.timedelta(seconds=int(round(error.retry_after))))}**')
print(f'[{current_time}] Ignoring exception at {colors.cyan}CommandOnCooldown{colors.end}. Details: This command is currently on cooldown.')
await ctx.respond(f":stopwatch: Not now! Please try after **{str(datetime.timedelta(seconds=int(round(error.retry_after))))}**")
print(f"[{current_time}] Ignoring exception at {colors.cyan}CommandOnCooldown{colors.end}. Details: This command is currently on cooldown.")
elif isinstance(error, commands.MissingPermissions):
await ctx.respond('You don\'t have permission to do this!', ephemeral=True)
print(f'[{current_time}] Ignoring exception at {colors.cyan}MissingPermissions{colors.end}. Details: The user doesn\'t have the required permissions.')
await ctx.respond("You don't have permission to do this!", ephemeral=True)
print(f"[{current_time}] Ignoring exception at {colors.cyan}MissingPermissions{colors.end}. Details: The user doesn\'t have the required permissions.")
elif isinstance(error, commands.BadArgument):
await ctx.respond(':x: Invalid argument.', delete_after=8)
print(f'[{current_time}] Ignoring exception at {colors.cyan}BadArgument{colors.end}.')
await ctx.respond(":x: Invalid argument.", delete_after=8)
print(f"[{current_time}] Ignoring exception at {colors.cyan}BadArgument{colors.end}.")
elif isinstance(error, commands.BotMissingPermissions):
await ctx.respond(':x: I don\'t have the required permissions to use this.')
print(f'[{current_time}] Ignoring exception at {colors.cyan}BotMissingPremissions{colors.end}. Details: The bot doesn\'t have the required permissions.')
await ctx.respond(":x: I don\'t have the required permissions to use this.")
print(f"[{current_time}] Ignoring exception at {colors.cyan}BotMissingPremissions{colors.end}. Details: The bot doesn\'t have the required permissions.")
elif isinstance(error, commands.BadBoolArgument):
await ctx.respond(':x: Invalid true/false argument.', delete_after=8)
print(f'[{current_time}] Ignoring exception at {colors.cyan}BadBoolArgument{colors.end}.')
await ctx.respond(":x: Invalid true/false argument.", delete_after=8)
print(f"[{current_time}] Ignoring exception at {colors.cyan}BadBoolArgument{colors.end}.")

#Commands
@client.slash_command(
Expand Down Expand Up @@ -307,7 +307,7 @@ async def reload(ctx: ApplicationContext, cog: str):
try: client.load_extension(f"cogs.{x}")
except Exception as e:
cog_errors += 1
print(f"[main/Cogs] {colors.red}ERROR: Cog \"{x}\" failed to load: {e}{colors.end}")
print(f"[main/Cogs] {colors.red}ERROR: Cog '{x}' failed to load: {e}{colors.end}")
if cog_errors == 0: print(f"[main/Cogs] {colors.green}All cogs successfully loaded.{colors.end}")
else: print(f"[main/Cogs] {colors.yellow}{cog_errors}/{len(active_cogs)} cogs failed to load.{colors.end}")
print("--------------------")
Expand Down