Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

Move logic to get all coins to it's own function in modules/coins.py

Browse source
This commit is contained in:
jesopo 2018-10-16 13:58:02 +01:00
parent ff7ac9fe89
commit 5d6a7a60eb
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
modules/coins.py
View file

@ -69,6 +69,11 @@ class Module(ModuleManager.BaseModule):
def _reset_user_coins(self, user): def _reset_user_coins(self, user):
user.del_setting("coins") user.del_setting("coins")
def _all_coins(self, server):
coins = server.get_all_user_settings("coins", [])
coins = list(filter(lambda coin: decimal.Decimal(coin[1]), coins))
return dict([(coin[0], decimal.Decimal(coin[1])) for coin in coins])
def _give(self, server, user, amount): def _give(self, server, user, amount):
user_coins = self._get_user_coins(user) user_coins = self._get_user_coins(user)
self._take_from_pool(server, amount) self._take_from_pool(server, amount)
@ -177,13 +182,7 @@ class Module(ModuleManager.BaseModule):
""" """
:help: Show the top 10 richest users :help: Show the top 10 richest users
""" """
all_coins = event["server"].get_all_user_settings("coins", []) top_10 = utils.top_10(self._all_coins(event["server"]),
all_coins = list(filter(lambda coin: decimal.Decimal(coin[1]),
all_coins))
items = [(coin[0], decimal.Decimal(coin[1])) for coin in all_coins]
all_coins = dict(items)
top_10 = utils.top_10(all_coins,
convert_key=lambda nickname: utils.prevent_highlight( convert_key=lambda nickname: utils.prevent_highlight(
event["server"].get_user(nickname).nickname), event["server"].get_user(nickname).nickname),
value_format=lambda value: self._coin_str(value)) value_format=lambda value: self._coin_str(value))
@ -459,14 +458,14 @@ class Module(ModuleManager.BaseModule):
@utils.hook("timer.coin-interest") @utils.hook("timer.coin-interest")
def interest(self, event): def interest(self, event):
for server in self.bot.servers.values(): for server in self.bot.servers.values():
all_coins = server.get_all_user_settings( all_coins = self._all_coins(server)
"coins", [])
interest_rate = decimal.Decimal(server.get_setting( interest_rate = decimal.Decimal(server.get_setting(
"interest-rate", DEFAULT_INTEREST_RATE)) "interest-rate", DEFAULT_INTEREST_RATE))
redeem_amount = decimal.Decimal(server.get_setting( redeem_amount = decimal.Decimal(server.get_setting(
"redeem-amount", DEFAULT_REDEEM_AMOUNT)) "redeem-amount", DEFAULT_REDEEM_AMOUNT))
for nickname, coins in all_coins: for nickname, coins in all_coins:
coins = decimal.Decimal(coins)
if coins > redeem_amount: if coins > redeem_amount:
interest = round(coins*interest_rate, 2) interest = round(coins*interest_rate, 2)
self._take_from_pool(server, interest) self._take_from_pool(server, interest)