update before merge

price.py

@@ -540,7 +540,9 @@ def top(bot, trigger):
     	            market_cap_short = float(round(market_cap_usd,-8)/1e9)
                	rounded_mcap = str(market_cap_short)+"B"
             else:
-            	rounded_mcap = "tiny"
+            	#rounded_mcap = "tiny"
+    	        market_cap_short = float(round(market_cap_usd,-5)/1e6)
+               	rounded_mcap = str(market_cap_short)+"M"
             topXstring += "{0}. {1} ${2} | ".format(rank, symbol, rounded_mcap) #TODO: add price_usd, rounded
         bot.say(topXstring[:-2])
     except:
@@ -766,24 +768,24 @@ def xmrtall(bot, trigger):
     except:
         bot.say("Something borked -_-")
 
-    # Cryptopia
+    # # Cryptopia
-    try:
+    # try:
-        coin = 'XMR'
+    #     coin = 'XMR'
-        pair = 'BTC'
+    #     pair = 'BTC'
-        r = requests.get(cryptopiaurl)
+    #     r = requests.get(cryptopiaurl)
-        j = r.json()
+    #     j = r.json()
-        found = False
+    #     found = False
-        for i in j["Data"]:
+    #     for i in j["Data"]:
-            if i["Label"] == coin+"/"+pair:
+    #         if i["Label"] == coin+"/"+pair:
-                last=float(i['LastPrice'])
+    #             last=float(i['LastPrice'])
-                change=float(i['Change'])
+    #             change=float(i['Change'])
-                vol=float(i['Volume'])
+    #             vol=float(i['Volume'])
-                stringtosend += "Cryptopia last: {0:.6f} {1} on {2:.2f} {1} volume | ".format(last, pair, vol*last)
+    #             stringtosend += "Cryptopia last: {0:.6f} {1} on {2:.2f} {1} volume | ".format(last, pair, vol*last)
-                found = True
+    #             found = True
-        if found == False:
+    #     if found == False:
-            bot.say("WTF?!?")
+    #         bot.say("WTF?!?")
-    except:
+    # except:
-        bot.say("Something borked （ -.-）ノ-=≡≡卍")
+    #     bot.say("Something borked （ -.-）ノ-=≡≡卍 (<-- this is a ninja star, nothing naziish)")
 
     # Tux
     # try:

trifling.py

@@ -68,6 +68,10 @@ def buyorsell(bot, trigger):
         silly_string = "Buy, buy, buy!"
     bot.say(silly_string)
 
+@sopel.module.commands('chad')
+def chad(bot, trigger):
+      bot.say('https://i.redd.it/6pvmtwkoy0a21.jpg')
+
 @sopel.module.commands('cheerup')
 def cheerup(bot, trigger):
       bot.say('https://www.youtube.com/watch?v=NXfC16rv_fs')
@@ -137,6 +141,10 @@ def encrypt(bot, trigger):
 def eth(bot, trigger):
     bot.say(u'The world computer 💻🌐'.encode('utf8'))
 
+@sopel.module.commands('ferret', 'ferretinjapan')
+def ferret(bot, trigger):
+    bot.say(u'♥‿♥ https://crypto314.com/wp-content/uploads/2017/09/monero-1505185532555-723x1024.png ♥‿♥'.encode('utf8'))
+
 @sopel.module.commands('fib', 'fibonacci')
 def fib(bot, trigger):
     bot.say(u'Pardon me, do you have a moment to discuss our lord and savior ✞Cheesus Monero✞?'.encode('utf8'))
@@ -323,6 +331,10 @@ def noom(bot, trigger):
 def notbad(bot, trigger):
     bot.say(u'（´ー｀） http://hackingdistributed.com/images/2014-01-01-bitcoin/dorian1.jpg （´ー｀）'.encode('utf8'))
 
+@sopel.module.commands('obama')
+def obama(bot, trigger):
+    bot.say('https://media0.giphy.com/media/9W4FM9Eis7Vyo/giphy.gif')
+
 odboptions = [
 "FBI don't you be watching me",
 "Ooo baby I like it raw",
@@ -391,6 +403,10 @@ projectingoptions = [
 def projecting(bot, trigger):
     bot.say(random.choice(projectingoptions))
 
+@sopel.module.commands('purge')
+def purge(bot, trigger):
+    bot.say(u'♔♔♔ Bow to the king https://preview.redd.it/fr8q7x9utnzy.png?width=612&auto=webp&s=8bf7aa7674d2dc3157b776ae07771144833cd879  ♔♔♔'.encode('utf8'))
+
 @sopel.module.commands('rarepepe', 'rare')
 def rarepepe(bot, trigger):
     try:
@@ -474,6 +490,10 @@ suraeoptions = [
 def surae(bot, trigger):
     bot.say(random.choice(suraeoptions))
 
+@sopel.module.commands('thicc')
+def thicc(bot, trigger):
+    bot.say("https://pics.me.me/you-on-the-beach-and-luigi-walk-pass-and-give-42542268.png")
+
 @sopel.module.commands('timetravelpp')
 def timetravelpp(bot, trigger):
     bot.say("A journey is best measured in pepes, rather than miles http://rarepepedirectory.com/wp-content/uploads/2016/09/timetravelpepe.jpg")