diff --git a/tipbot/betutils.py b/tipbot/betutils.py index 514ee03..19b16d5 100644 --- a/tipbot/betutils.py +++ b/tipbot/betutils.py @@ -352,7 +352,7 @@ def Unban(link,cmd): sidentity=link.identity() sidentity=IdentityFromString(link,sidentity) redis_hdel('banned',sidentity) - link.send('%s was unbanned' % (sidentity)) + link.send('%s was unbanned' % (NickFromIdentity(sidentity))) except Exception,e: log_error('Failed to unban %s: %s' % (sidentity,str(e))) link.send('An error occured') diff --git a/tipbot/modules/blackjack.py b/tipbot/modules/blackjack.py index b7b21b6..5fd2fc6 100644 --- a/tipbot/modules/blackjack.py +++ b/tipbot/modules/blackjack.py @@ -566,7 +566,7 @@ def Blackjack(link,cmd): total_units_wagered = units + sidebets["total_amount_wagered"] potential_loss = amount * 1.5 + sidebets["potential_loss"] / coinspecs.atomic_units potential_units_loss = long (potential_loss * coinspecs.atomic_units) - log_info('%s bets a total of %s, potential loss %s, side bets %s' % (identity, AmountToString(total_units_wagered), AmountToString(potential_units_loss), str(sidebets))) + log_info('%s bets a total of %s (%.16g), potential loss %s, side bets %s' % (identity, AmountToString(total_units_wagered), total_amount_wagered, AmountToString(potential_units_loss), str(sidebets))) valid,reason = IsBetValid(link,total_amount_wagered,config.blackjack_min_bet,config.blackjack_max_bet,potential_loss,config.blackjack_max_loss,config.blackjack_max_loss_ratio) if not valid: log_info("Dice: %s's bet refused: %s" % (identity, reason)) @@ -900,8 +900,8 @@ def GetBlackjackStats(link,cmd): return else: sidentity=identity - ShowBlackjackStats(link,sidentity,sidentity) - ShowBlackjackStats(link,"reset:"+sidentity,'%s since reset' % sidentity) + ShowBlackjackStats(link,sidentity,NickFromIdentity(sidentity)) + ShowBlackjackStats(link,"reset:"+sidentity,'%s since reset' % NickFromIdentity(sidentity)) ShowBlackjackStats(link,'','overall') def PlayerSeed(link,cmd): diff --git a/tipbot/modules/dice.py b/tipbot/modules/dice.py index ce34788..8bdf621 100644 --- a/tipbot/modules/dice.py +++ b/tipbot/modules/dice.py @@ -135,8 +135,8 @@ def GetDiceStats(link,cmd): return else: sidentity=identity - ShowDiceStats(link,sidentity,sidentity) - ShowDiceStats(link,"reset:"+sidentity,'%s since reset' % sidentity) + ShowDiceStats(link,sidentity,NickFromIdentity(sidentity)) + ShowDiceStats(link,"reset:"+sidentity,'%s since reset' % NickFromIdentity(sidentity)) ShowDiceStats(link,'','overall') def ResetDiceStats(link,cmd):