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

Move redeem-amount/redeem-delay logic to their own functions in modules/coins.py

Browse source
This commit is contained in:
jesopo 2018-10-16 14:06:38 +01:00
parent 5d6a7a60eb
commit 0c7c48d752
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
modules/coins.py
View file

@ -74,6 +74,12 @@ class Module(ModuleManager.BaseModule):
coins = list(filter(lambda coin: decimal.Decimal(coin[1]), coins)) coins = list(filter(lambda coin: decimal.Decimal(coin[1]), coins))
return dict([(coin[0], decimal.Decimal(coin[1])) for coin in coins]) return dict([(coin[0], decimal.Decimal(coin[1])) for coin in coins])
def _redeem_amount(self, server):
return decimal.Decimal(server.get_setting("redeem-amount",
DEFAULT_REDEEM_AMOUNT))
def _redeem_delay(self, server):
return server.get_setting("redeem-delay", DEFAULT_REDEEM_DELAY)
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)
@ -200,15 +206,13 @@ class Module(ModuleManager.BaseModule):
if user_coins == DECIMAL_ZERO: if user_coins == DECIMAL_ZERO:
cache = self._redeem_cache(event["server"], event["user"]) cache = self._redeem_cache(event["server"], event["user"])
if not self.bot.cache.has_item(cache): if not self.bot.cache.has_item(cache):
redeem_amount = decimal.Decimal(event["server" redeem_amount = self._redeem_amount(event["server"])
].get_setting("redeem-amount", DEFAULT_REDEEM_AMOUNT))
self._give(event["server"], event["user"], redeem_amount) self._give(event["server"], event["user"], redeem_amount)
event["stdout"].write("Redeemed %s coins" % self._coin_str( event["stdout"].write("Redeemed %s coins" % self._coin_str(
redeem_amount)) redeem_amount))
redeem_delay = event["server"].get_setting("redeem-delay", redeem_delay = self._redeem_delay(event["server"])
DEFAULT_REDEEM_DELAY)
self.bot.cache.temporary_cache(cache, redeem_delay) self.bot.cache.temporary_cache(cache, redeem_delay)
else: else:
time_left = self.bot.cache.until_expiration(cache) time_left = self.bot.cache.until_expiration(cache)
@ -296,8 +300,7 @@ class Module(ModuleManager.BaseModule):
return return
user_coins = self._get_user_coins(event["user"]) user_coins = self._get_user_coins(event["user"])
redeem_amount = decimal.Decimal(event["server"].get_setting( redeem_amount = self._redeem_amount(event["server"])
"redeem-amount", DEFAULT_REDEEM_AMOUNT))
new_user_coins = user_coins-send_amount new_user_coins = user_coins-send_amount
if user_coins == DECIMAL_ZERO: if user_coins == DECIMAL_ZERO:
@ -462,8 +465,7 @@ class Module(ModuleManager.BaseModule):
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 = self._redeem_amount(server)
"redeem-amount", DEFAULT_REDEEM_AMOUNT))
for nickname, coins in all_coins: for nickname, coins in all_coins:
if coins > redeem_amount: if coins > redeem_amount: