From f12066df0ad53ae32232be693a5ea1e16ad80ce0 Mon Sep 17 00:00:00 2001 From: Fletcher Boyd Date: Thu, 5 Sep 2013 16:09:27 +0800 Subject: [PATCH 1/2] rdio api added to config. --- config.default | 4 +++- plugins/rdio.py | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/config.default b/config.default index 824cfd1..1d0c4b5 100644 --- 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": { diff --git a/plugins/rdio.py b/plugins/rdio.py index 297c8f5..847c642 100644 --- a/plugins/rdio.py +++ b/plugins/rdio.py @@ -4,9 +4,9 @@ import re from util import hook import oauth2 as oauth - -CONSUMER_KEY = "KEY" -CONSUMER_SECRET = "SECRET" +bot.config.get("api_keys") +CONSUMER_KEY = conn.conf['api_keys'].get("rdio_key", "KEY") +CONSUMER_SECRET = conn.conf['api_keys'].get("rdio_secret", "SECRET") def getdata(inp, types): From 8f789222b166245c57c845111302d586f1ed8f9c Mon Sep 17 00:00:00 2001 From: Fletcher Boyd Date: Thu, 5 Sep 2013 16:12:41 +0800 Subject: [PATCH 2/2] I'm a muppet. --- plugins/rdio.py | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/rdio.py b/plugins/rdio.py index 847c642..81883ce 100644 --- a/plugins/rdio.py +++ b/plugins/rdio.py @@ -4,7 +4,6 @@ import re from util import hook import oauth2 as oauth -bot.config.get("api_keys") CONSUMER_KEY = conn.conf['api_keys'].get("rdio_key", "KEY") CONSUMER_SECRET = conn.conf['api_keys'].get("rdio_secret", "SECRET")