CopyBot/Red-DiscordBot
1
0
Fork 0
mirror of https://github.com/Cog-Creators/Red-DiscordBot.git synced 2025-11-06 11:18:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

[Economy] Added member ref. to accounts and arbitrary bank json path

Browse Source
This commit is contained in:
Twentysix 2016-06-26 12:08:45 +02:00
parent 65f35a2439
commit 8c82290cc9
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cogs/economy.py
View File

@ -42,8 +42,8 @@ class SameSenderAndReceiver(BankError):
pass pass
class Bank: class Bank:
def __init__(self, bot): def __init__(self, bot, file_path):
self.accounts = dataIO.load_json("data/economy/bank.json") self.accounts = dataIO.load_json(file_path)
self.bot = bot self.bot = bot
def create_account(self, user): def create_account(self, user):
@ -167,14 +167,12 @@ class Bank:
return self._create_account_obj(acc) return self._create_account_obj(acc)
def _create_account_obj(self, account): def _create_account_obj(self, account):
account["member"] = account["server"].get_member(account["id"])
account["created_at"] = datetime.strptime(account["created_at"],
"%Y-%m-%d %H:%M:%S")
Account = namedtuple("Account", "id name " Account = namedtuple("Account", "id name "
"balance created_at server") "balance created_at server")
return Account( return Account(**account)
id = account["id"],
name = account["name"],
balance = account["balance"],
created_at = datetime.strptime(account["created_at"], "%Y-%m-%d %H:%M:%S"),
server = account["server"])
def _save_bank(self): def _save_bank(self):
dataIO.save_json("data/economy/bank.json", self.accounts) dataIO.save_json("data/economy/bank.json", self.accounts)
@ -194,7 +192,7 @@ class Economy:
def __init__(self, bot): def __init__(self, bot):
global default_settings global default_settings
self.bot = bot self.bot = bot
self.bank = Bank(bot) self.bank = Bank(bot, "data/economy/bank.json")
self.settings = fileIO("data/economy/settings.json", "load") self.settings = fileIO("data/economy/settings.json", "load")
if "PAYDAY_TIME" in self.settings: #old format if "PAYDAY_TIME" in self.settings: #old format
default_settings = self.settings default_settings = self.settings