From 178eab4f9ece3f92a83e28426e24585fc31d7898 Mon Sep 17 00:00:00 2001
From: root <root@monerobux.localdomain>
Date: Sun, 7 May 2017 18:00:44 +0000
Subject: [PATCH] Update before merge ferret fix

---
 price.py    |  1 +
 trifling.py | 20 ++++++++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/price.py b/price.py
index 1b714e9..7570513 100644
--- a/price.py
+++ b/price.py
@@ -6,6 +6,7 @@ import random
 
 polourl = "https://poloniex.com/public?command=returnTicker"
 poloxmrlendurl = "https://poloniex.com/public?command=returnLoanOrders&currency=XMR&limit=999999"
+polobtclendurl = "https://poloniex.com/public?command=returnLoanOrders&currency=BTC&limit=999999"
 prevamnt, prevtime = 0, 0
 trexurl = "https://bittrex.com/api/v1.1/public/getmarketsummary?market=btc-"
 cryptopiaurl = "https://www.cryptopia.co.nz/api/GetMarkets"
diff --git a/trifling.py b/trifling.py
index 4d7dce2..a5d02f9 100644
--- a/trifling.py
+++ b/trifling.py
@@ -129,15 +129,15 @@ def gui(bot, trigger):
 
 @sopel.module.commands('hmm', 'hmmm')
 def hmm(bot, trigger):
-    try:
-        sub=reddit.get_subreddit('hmmm')
-        posts=sub.get_new(limit=100)
+    # try:
+        sub=reddit.subreddit('hmmm')
+        posts=sub.new(limit=100)
         n=random.randint(0,100)
         for i, post in enumerate(posts):
             if i==n:
                 bot.say(post.url)
-    except:
-        bot.say("Something something reddit's servers")
+    # except:
+    #     bot.say("Something something reddit's servers")
 
 @sopel.module.commands('isittrue')
 def isittrue(bot, trigger):
@@ -288,12 +288,16 @@ def summon(bot, trigger):
 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")
 
-reddit=praw.Reddit(client_id=client_id, client_secret=client_secret, user_agent='monerobux')
+reddit=praw.Reddit(client_id=client_id, 
+                   client_secret=client_secret, 
+                   user_agent='monerobux',
+                   username=username,
+                   password=password)
 @sopel.module.commands('tinytrump')
 def tinytrump(bot, trigger):
     try:
-        sub=reddit.get_subreddit('tinytrump')
-        posts=sub.get_new(limit=100)
+        sub=reddit.subreddit('tinytrump')
+        posts=sub.new(limit=100)
         n=random.randint(0,100)
         for i, post in enumerate(posts):
             if i==n: