price.py

@@ -397,14 +397,8 @@ def ogre(bot, trigger):
 
 @sopel.module.commands('trex', 'bittrex')
 def trex(bot, trigger):
-    geturl = ""
     if not trigger.group(2):
-         bot.say("spineless...")
+         geturl = trexurl+'xmr'
-         break
-    else:
-        if trigger.group(2) == "xmr":
-            bot.say("spineless")
-            break
     else:
         geturl = trexurl + trigger.group(2)
     try:
@@ -670,17 +664,17 @@ def xmrtall(bot, trigger):
         bot.say("Borka borka ┌∩┐(◣_◢)┌∩┐")
 
     # Trex
-#    geturl = trexurl+'xmr'
+    geturl = trexurl+'xmr'
-#    try:
+    try:
-#        r = requests.get(geturl)
+        r = requests.get(geturl)
-#        j = r.json()
+        j = r.json()
-#        xmr=j['result'][0]
+        xmr=j['result'][0]
-#        last=float(xmr['Last'])
+        last=float(xmr['Last'])
 #       change=((last/float(xmr['PrevDay']))-1)
-#        vol=float(xmr['BaseVolume'])
+        vol=float(xmr['BaseVolume'])
-#        stringtosend += "Bittrex last: {0:.6f} BTC on {1:.2f} BTC volume | ".format(last, vol)
+        stringtosend += "Bittrex last: {0:.6f} BTC on {1:.2f} BTC volume | ".format(last, vol)
-#    except:
+    except:
-#        bot.say("Something borked -_-")
+        bot.say("Something borked -_-")
 
     #Finally... print to IRC
     bot.say(stringtosend[:-2])