diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..8ac217a --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +client.py +*.pyc diff --git a/network.pyc b/network.pyc deleted file mode 100644 index 698f40e..0000000 Binary files a/network.pyc and /dev/null differ 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¤cy=XMR&limit=999999" +polobtclendurl = "https://poloniex.com/public?command=returnLoanOrders¤cy=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/price.pyc b/price.pyc deleted file mode 100644 index 79b6cfd..0000000 Binary files a/price.pyc and /dev/null differ diff --git a/stock.pyc b/stock.pyc deleted file mode 100644 index 762d848..0000000 Binary files a/stock.pyc and /dev/null differ diff --git a/trifling.py b/trifling.py index 393f70f..4da6b55 100644 --- a/trifling.py +++ b/trifling.py @@ -4,6 +4,7 @@ import random import re import requests import praw +from client import * @sopel.module.commands('4matter') def fourmatter(bot, trigger): @@ -128,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): @@ -287,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(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: diff --git a/trifling.pyc b/trifling.pyc deleted file mode 100644 index add8b42..0000000 Binary files a/trifling.pyc and /dev/null differ