Update before merge ferret fix

This commit is contained in:
root 2017-05-07 18:00:44 +00:00
parent b58d4006d2
commit 178eab4f9e
2 changed files with 13 additions and 8 deletions

View File

@ -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"

View File

@ -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: