From e969fa1168054622e3a82af88c9e150918a45699 Mon Sep 17 00:00:00 2001 From: ferretinjapan Date: Sun, 14 May 2017 22:22:43 +0930 Subject: [PATCH 1/3] Retain live STR/XRP reporting This way people that want to follow the live price can compare. --- trifling.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/trifling.py b/trifling.py index 10a1051..f87c9ac 100644 --- a/trifling.py +++ b/trifling.py @@ -434,10 +434,10 @@ def asp(bot, trigger): value_golem = float(last_golem*7374.44608569) value_maidsafecoin = float(last_maidsafecoin*5973.05389222) value_augur = float(last_augur*94.01892768) - #value_stellar = float(last_stellar*318974.81202454) + value_stellar = float(last_stellar*318974.81202454) value_stellar = float(8.34800202) value_nem = float(last_nem*29892.11866946) - #value_ripple = float(last_ripple*27962.37965895) + value_ripple = float(last_ripple*27962.37965895) value_ripple = float(3.17485452) value_zcash = float(last_zcash*16.47649534) total = value_dash + value_decred + value_factom + value_golem + value_maidsafecoin + value_augur + value_stellar + value_nem + value_ripple + value_zcash @@ -453,6 +453,6 @@ def asp(bot, trigger): else: xmrsign = '-' - bot.say("{0} {1:.2f}BTC; {2} {3:.2f}BTC; {4} {5:.2f}BTC; {6} {7:.2f}BTC; {8} {9:.2f}BTC; {10} {11:.2f}BTC; {12}* {13:.2f}BTC; {14} {15:.2f}BTC; {16}* {17:.2f}BTC; {18} {19:.2f}BTC; ASP Total:{20:.2f}BTC/{21:,.0f}USD/{22:,.1f}XMR (02-May outlay, 10BTC/14,950USD/650XMR) (Since begin ASP:{23}{24:.2f}% XMR:{25}{26:.2f}%, Harvested 11.52BTC)".format("DASH", value_dash, "DCR", value_decred, "FCT", value_factom, "GNT", value_golem, "MAID", value_maidsafecoin, "REP", value_augur, "STR", value_stellar, "XEM", value_nem, "XRP", value_ripple, "ZEC", value_zcash, total, stamp_price * total, xmr_totalvalue, aspsign, asppercent, xmrsign, xmrpercent)) + bot.say("{0} {1:.2f}BTC; {2} {3:.2f}BTC; {4} {5:.2f}BTC; {6} {7:.2f}BTC; {8} {9:.2f}BTC; {10} {11:.2f}BTC; {12} {13:.2f}[{14:.2f}]BTC; {15} {16:.2f}BTC; {17} {18:.2f}[{19:.2f}]BTC; {20} {21:.2f}BTC; ASP Total:{22:.2f}BTC/{23:,.0f}USD/{24:,.1f}XMR (02-May outlay, 10BTC/14,950USD/650XMR) (Since begin ASP:{25}{26:.2f}% XMR:{27}{26:.2f}%, Harvested 11.52BTC)".format("DASH", value_dash, "DCR", value_decred, "FCT", value_factom, "GNT", value_golem, "MAID", value_maidsafecoin, "REP", value_augur, "STR", value_stellar, value_stellar_h, "XEM", value_nem, "XRP", value_ripple, value_ripple_h, "ZEC", value_zcash, total, stamp_price * total, xmr_totalvalue, aspsign, asppercent, xmrsign, xmrpercent)) except: bot.say("ERROR!") From caea23cef0ff5eb3de29972fcc16cf2ed8f32574 Mon Sep 17 00:00:00 2001 From: ferretinjapan Date: Sun, 14 May 2017 22:24:13 +0930 Subject: [PATCH 2/3] rename variables clashing variables --- trifling.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/trifling.py b/trifling.py index f87c9ac..27d35b3 100644 --- a/trifling.py +++ b/trifling.py @@ -435,10 +435,10 @@ def asp(bot, trigger): value_maidsafecoin = float(last_maidsafecoin*5973.05389222) value_augur = float(last_augur*94.01892768) value_stellar = float(last_stellar*318974.81202454) - value_stellar = float(8.34800202) + value_stellar_h = float(8.34800202) value_nem = float(last_nem*29892.11866946) value_ripple = float(last_ripple*27962.37965895) - value_ripple = float(3.17485452) + value_ripple_h = float(3.17485452) value_zcash = float(last_zcash*16.47649534) total = value_dash + value_decred + value_factom + value_golem + value_maidsafecoin + value_augur + value_stellar + value_nem + value_ripple + value_zcash xmr_totalvalue = float(total / xmrbtc_price) From d3c95bee31cdde1eaf565ebba2fedefa04c39ed4 Mon Sep 17 00:00:00 2001 From: ferretinjapan Date: Sun, 14 May 2017 22:27:08 +0930 Subject: [PATCH 3/3] Some misused variables Reporeted wrong values. --- trifling.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/trifling.py b/trifling.py index 27d35b3..cafafa9 100644 --- a/trifling.py +++ b/trifling.py @@ -440,7 +440,7 @@ def asp(bot, trigger): value_ripple = float(last_ripple*27962.37965895) value_ripple_h = float(3.17485452) value_zcash = float(last_zcash*16.47649534) - total = value_dash + value_decred + value_factom + value_golem + value_maidsafecoin + value_augur + value_stellar + value_nem + value_ripple + value_zcash + total = value_dash + value_decred + value_factom + value_golem + value_maidsafecoin + value_augur + value_stellar_h + value_nem + value_ripple_h + value_zcash xmr_totalvalue = float(total / xmrbtc_price) asppercent = (((stamp_price * total) / 14950)-1)*100 if asppercent >= 0: @@ -453,6 +453,6 @@ def asp(bot, trigger): else: xmrsign = '-' - bot.say("{0} {1:.2f}BTC; {2} {3:.2f}BTC; {4} {5:.2f}BTC; {6} {7:.2f}BTC; {8} {9:.2f}BTC; {10} {11:.2f}BTC; {12} {13:.2f}[{14:.2f}]BTC; {15} {16:.2f}BTC; {17} {18:.2f}[{19:.2f}]BTC; {20} {21:.2f}BTC; ASP Total:{22:.2f}BTC/{23:,.0f}USD/{24:,.1f}XMR (02-May outlay, 10BTC/14,950USD/650XMR) (Since begin ASP:{25}{26:.2f}% XMR:{27}{26:.2f}%, Harvested 11.52BTC)".format("DASH", value_dash, "DCR", value_decred, "FCT", value_factom, "GNT", value_golem, "MAID", value_maidsafecoin, "REP", value_augur, "STR", value_stellar, value_stellar_h, "XEM", value_nem, "XRP", value_ripple, value_ripple_h, "ZEC", value_zcash, total, stamp_price * total, xmr_totalvalue, aspsign, asppercent, xmrsign, xmrpercent)) + bot.say("{0} {1:.2f}BTC; {2} {3:.2f}BTC; {4} {5:.2f}BTC; {6} {7:.2f}BTC; {8} {9:.2f}BTC; {10} {11:.2f}BTC; {12} {13:.2f}[{14:.2f}]BTC; {15} {16:.2f}BTC; {17} {18:.2f}[{19:.2f}]BTC; {20} {21:.2f}BTC; ASP Total:{22:.2f}BTC/{23:,.0f}USD/{24:,.1f}XMR (02-May outlay, 10BTC/14,950USD/650XMR) (Since begin ASP:{25}{26:.2f}% XMR:{27}{28:.2f}%, Harvested 11.52BTC)".format("DASH", value_dash, "DCR", value_decred, "FCT", value_factom, "GNT", value_golem, "MAID", value_maidsafecoin, "REP", value_augur, "STR", value_stellar, value_stellar_h, "XEM", value_nem, "XRP", value_ripple, value_ripple_h, "ZEC", value_zcash, total, stamp_price * total, xmr_totalvalue, aspsign, asppercent, xmrsign, xmrpercent)) except: bot.say("ERROR!")