ChCh/CloudBot
Archived
11
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #146 from thenoodle68/develop

Browse source 
pullderp
This commit is contained in:
Luke Rogers 2013-09-05 01:14:20 -07:00
commit f96a975b70
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
config.default
View file

@ -30,7 +30,9 @@
"twitter_access_token": "", "twitter_access_token": "",
"twitter_access_secret": "", "twitter_access_secret": "",
"wunderground": "", "wunderground": "",
"googletranslate": "" "googletranslate": "",
"rdio_key": "",
"rdio_secret": ""
}, },
"permissions": { "permissions": {
"admins": { "admins": {

5
plugins/rdio.py
View file

@ -4,9 +4,8 @@ import re
from util import hook from util import hook
import oauth2 as oauth import oauth2 as oauth
CONSUMER_KEY = conn.conf['api_keys'].get("rdio_key", "KEY")
CONSUMER_KEY = "KEY" CONSUMER_SECRET = conn.conf['api_keys'].get("rdio_secret", "SECRET")
CONSUMER_SECRET = "SECRET"
def getdata(inp, types): def getdata(inp, types):