From 9001491e6be60e20f179451e6fded5074ca277e4 Mon Sep 17 00:00:00 2001
From: root <root@monerobux.localdomain>
Date: Thu, 18 Oct 2018 23:49:23 +0000
Subject: [PATCH] update before merge

---
 network.py  |  2 +-
 price.py    | 16 ++++++++++++++--
 trifling.py | 32 ++++++++++++++++++++++++++------
 3 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/network.py b/network.py
index e732477..de1d63b 100644
--- a/network.py
+++ b/network.py
@@ -16,7 +16,7 @@ def fork(bot, trigger):
     pass
   try:
     height=j["height"]
-    forkheight=1400000
+    forkheight=1685555
     if forkheight > height:
       bot.say("The current block height is {0:,}. Fork height is {1:,}. {2:,} blocks to go, happening in approximately {3:.2f} hours.".format(height,forkheight,forkheight-height,(forkheight-height)/30.0))
     else:
diff --git a/price.py b/price.py
index b78f720..9cb6f27 100644
--- a/price.py
+++ b/price.py
@@ -602,7 +602,19 @@ def tall(bot, trigger):
     except:
 	gdaxjson = False
     if gdaxjson:
-        stringtosend += "GDAX last: ${0:,.2f}, vol: {1:,.1f} | ".format(gdaxprice, gdaxvolume)
+        stringtosend += "CBP last: ${0:,.2f}, vol: {1:,.1f} | ".format(gdaxprice, gdaxvolume)
+    # Binance
+    try:
+        binanceresult = requests.get(binanceurl)
+        binancejson = binanceresult.json()
+        for i in binancejson:
+            if i["symbol"] == "BTCUSDT":
+                binanceprice = float(i['lastPrice'])
+                binancevolume = float(i['volume'])
+    except:
+	binancejson = False
+    if binancejson:
+        stringtosend += "Binance last: ${0:,.2f}, vol: {1:,.1f} | ".format(binanceprice, binancevolume)
     # Bitfinex
     try:
         finexresult = requests.get(finexurl)
@@ -785,7 +797,7 @@ def comm(bot, trigger):
                 code = i['code']
     except:
         bot.say("Error getting data or commodity not priced")
-        break
+        return
     try:
         r2 = requests.get(commurl+code+'/data/'+apitoken)
         j = r2.json()
diff --git a/trifling.py b/trifling.py
index 6539051..9c7d2ae 100644
--- a/trifling.py
+++ b/trifling.py
@@ -11,11 +11,15 @@ from threading import Timer
 def fourmatter(bot, trigger):
     bot.say('Irish I be fookin <3 Milo')
 
-@sopel.module.commands('allah')
-def allah(bot, trigger):
-    bot.say('allah is doing')
-    bot.say('sun is not doing allah is doing')
-    bot.say('to accept Islam say that i bear witness that there is no deity worthy of worship except Allah and Muhammad peace be upon him is his slave and messenger')
+# @sopel.module.commands('allah')
+# def allah(bot, trigger):
+#     bot.say('allah is doing')
+#     bot.say('sun is not doing allah is doing')
+#     bot.say('to accept Islam say that i bear witness that there is no deity worthy of worship except Allah and Muhammad peace be upon him is his slave and messenger')
+
+@sopel.module.commands('ada', 'hoskinson')
+def ada(bot, trigger):
+    bot.say('DO YOU KNOW WHO I AM?')
 
 @sopel.module.commands('aminorex')
 def aminorex(bot, trigger):
@@ -49,6 +53,10 @@ def bear(bot, trigger):
 def brothers(bot, trigger):
     bot.say(u'http://www.trollaxor.com/2011/11/brief-history-of-ascii-penis.html'.encode('utf8'))
 
+@sopel.module.commands('bp', 'bps', 'bulletproof', 'bulletproofs')
+def bulletproofs(bot, trigger):
+    bot.say(u'https://www.youtube.com/watch?v=Kk8eJh4i8Lo'.encode('utf8'))
+
 @sopel.module.commands('buyorsell')
 def buyorsell(bot, trigger):
     draw = random.random()
@@ -279,6 +287,10 @@ def major(bot, trigger):
 def masternode(bot, trigger):
     bot.say('http://hadoopilluminated.com/hadoop_illuminated/images/hdfs3.jpg')
 
+@sopel.module.commands('monerov', 'v')
+def monerov(bot, trigger):
+    bot.say(u"🔒🔒🔒 MoneroV is more secured than others. That's why it is better invest on moneroV. 💰💰💰".encode('utf8'))
+
 @sopel.module.commands('moon')
 def moon(bot, trigger):
     bot.say(u'┗(°0°)┛'.encode('utf8'))
@@ -297,7 +309,7 @@ def needmoney(bot, trigger):
 
 @sopel.module.commands('nioc')
 def nioc(bot, trigger):
-    bot.say(u'If I had a monero for every time I went to the salt mines...I would have a lot of moneros'.encode('utf8'))
+    bot.say(u'https://ifunny.co/fun/laeIohx56'.encode('utf8'))
 
 @sopel.module.commands('nomnomnom')
 def nomnomnom(bot, trigger):
@@ -307,6 +319,10 @@ def nomnomnom(bot, trigger):
 def noom(bot, trigger):
     bot.say(u'┏(.0.)┓'.encode('utf8'))
 
+@sopel.module.commands('notbad', 'dorian')
+def notbad(bot, trigger):
+    bot.say(u'（´ー｀） http://hackingdistributed.com/images/2014-01-01-bitcoin/dorian1.jpg （´ー｀）'.encode('utf8'))
+
 odboptions = [
 "FBI don't you be watching me",
 "Ooo baby I like it raw",
@@ -345,6 +361,10 @@ def pony(bot, trigger):
 def primer(bot, trigger):
     bot.say("The point is not how much i made, point is fluffy did this on purpose, more than 10 people were in on it. His commit access needs to be revoked asap!")
 
+@sopel.module.commands('praise')
+def praise(bot, trigger):
+    bot.say("https://praisemonero.com")
+
 @sopel.module.commands('pubg')
 def pubg(bot, trigger):
     bot.say("https://i.redd.it/o6o5gqmetacz.jpg")