Update before merge ferret fix
This commit is contained in:
parent
b58d4006d2
commit
178eab4f9e
1
price.py
1
price.py
|
@ -6,6 +6,7 @@ import random
|
||||||
|
|
||||||
polourl = "https://poloniex.com/public?command=returnTicker"
|
polourl = "https://poloniex.com/public?command=returnTicker"
|
||||||
poloxmrlendurl = "https://poloniex.com/public?command=returnLoanOrders¤cy=XMR&limit=999999"
|
poloxmrlendurl = "https://poloniex.com/public?command=returnLoanOrders¤cy=XMR&limit=999999"
|
||||||
|
polobtclendurl = "https://poloniex.com/public?command=returnLoanOrders¤cy=BTC&limit=999999"
|
||||||
prevamnt, prevtime = 0, 0
|
prevamnt, prevtime = 0, 0
|
||||||
trexurl = "https://bittrex.com/api/v1.1/public/getmarketsummary?market=btc-"
|
trexurl = "https://bittrex.com/api/v1.1/public/getmarketsummary?market=btc-"
|
||||||
cryptopiaurl = "https://www.cryptopia.co.nz/api/GetMarkets"
|
cryptopiaurl = "https://www.cryptopia.co.nz/api/GetMarkets"
|
||||||
|
|
20
trifling.py
20
trifling.py
|
@ -129,15 +129,15 @@ def gui(bot, trigger):
|
||||||
|
|
||||||
@sopel.module.commands('hmm', 'hmmm')
|
@sopel.module.commands('hmm', 'hmmm')
|
||||||
def hmm(bot, trigger):
|
def hmm(bot, trigger):
|
||||||
try:
|
# try:
|
||||||
sub=reddit.get_subreddit('hmmm')
|
sub=reddit.subreddit('hmmm')
|
||||||
posts=sub.get_new(limit=100)
|
posts=sub.new(limit=100)
|
||||||
n=random.randint(0,100)
|
n=random.randint(0,100)
|
||||||
for i, post in enumerate(posts):
|
for i, post in enumerate(posts):
|
||||||
if i==n:
|
if i==n:
|
||||||
bot.say(post.url)
|
bot.say(post.url)
|
||||||
except:
|
# except:
|
||||||
bot.say("Something something reddit's servers")
|
# bot.say("Something something reddit's servers")
|
||||||
|
|
||||||
@sopel.module.commands('isittrue')
|
@sopel.module.commands('isittrue')
|
||||||
def isittrue(bot, trigger):
|
def isittrue(bot, trigger):
|
||||||
|
@ -288,12 +288,16 @@ def summon(bot, trigger):
|
||||||
def timetravelpp(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")
|
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')
|
@sopel.module.commands('tinytrump')
|
||||||
def tinytrump(bot, trigger):
|
def tinytrump(bot, trigger):
|
||||||
try:
|
try:
|
||||||
sub=reddit.get_subreddit('tinytrump')
|
sub=reddit.subreddit('tinytrump')
|
||||||
posts=sub.get_new(limit=100)
|
posts=sub.new(limit=100)
|
||||||
n=random.randint(0,100)
|
n=random.randint(0,100)
|
||||||
for i, post in enumerate(posts):
|
for i, post in enumerate(posts):
|
||||||
if i==n:
|
if i==n:
|
||||||
|
|
Loading…
Reference in New Issue