🧹 More refactoring

This commit is contained in:
Nikolaj
2021-08-17 18:05:41 +02:00
parent 074a06e863
commit 573d081734
31 changed files with 1971 additions and 1787 deletions

View File

@ -51,10 +51,10 @@ class Money():
"""
self.bot.log("checking "+user+"'s account balance")
userData = self.database["users"].find_one({"_id": user})
user_data = self.database["users"].find_one({"_id": user})
if userData is not None:
return userData["money"]
if user_data is not None:
return user_data["money"]
else:
return 0
@ -90,18 +90,18 @@ class Money():
"""
self.bot.log("adding "+str(amount)+" to "+user+"'s account")
userData = self.database["users"].find_one({"_id": user})
user_data = self.database["users"].find_one({"_id": user})
if userData is not None:
if user_data is not None:
updater = {"$inc": {"money": amount}}
self.database["users"].update_one({"_id": user}, updater)
else:
newUser = {
new_user = {
"_id": user,
"user name": self.bot.database_funcs.get_name(user),
"money": amount
}
self.database["users"].insert_one(newUser)
self.database["users"].insert_one(new_user)
# Transfers money from one user to another
async def giveMoney(self, ctx: discord_slash.context.SlashContext,
@ -125,15 +125,15 @@ class Money():
if member.display_name.lower() == username.lower():
username = member.display_name
user_id = f"#{member.id}"
newUser = {
new_user = {
"_id": user_id,
"user name": username,
"money": 0
}
self.bot.database["users"].insert_one(newUser)
self.bot.database["users"].insert_one(new_user)
userid = f"#{ctx.author.id}"
userData = self.database["users"].find_one({"_id": userid})
user_data = self.database["users"].find_one({"_id": userid})
targetUser = self.bot.database_funcs.get_id(username)
if amount <= 0:
@ -142,7 +142,7 @@ class Money():
elif targetUser is None:
self.bot.log("They weren't in the system")
await ctx.send("The target doesn't exist")
elif userData is None or userData["money"] < amount:
elif user_data is None or user_data["money"] < amount:
self.bot.log("They didn't have enough GwendoBucks")
await ctx.send("You don't have that many GwendoBuck")
else: