Merge pull request #146 from thenoodle68/develop

pullderp
2013-09-05 01:14:20 -07:00 · 2013-09-05 01:14:20 -07:00 · f96a975b70
commit f96a975b70
parent 49e306568d 8f789222b1
2 changed files with 5 additions and 4 deletions
--- a/config.default
+++ b/config.default
@ -30,7 +30,9 @@
    "twitter_access_token": "",
    "twitter_access_secret": "",
    "wunderground": "",
-    "googletranslate": ""
+    "googletranslate": "",
+    "rdio_key": "",
+    "rdio_secret": ""
  },
  "permissions": {
    "admins": {
--- a/plugins/rdio.py
+++ b/plugins/rdio.py
@ -4,9 +4,8 @@ import re
 from util import hook
 import oauth2 as oauth

-
-CONSUMER_KEY = "KEY"
-CONSUMER_SECRET = "SECRET"
+CONSUMER_KEY = conn.conf['api_keys'].get("rdio_key", "KEY")
+CONSUMER_SECRET = conn.conf['api_keys'].get("rdio_secret", "SECRET")


 def getdata(inp, types):