diff --git a/lib/Twitter.js b/lib/Twitter.js index 2da39bc..2f0de96 100644 --- a/lib/Twitter.js +++ b/lib/Twitter.js @@ -4,14 +4,12 @@ var DEBUG = (process.env.DEBUG !== undefined); +var config = require('../../../data/twitter_config.js'); var OAuth = require('oauth').OAuth; var qs = require('qs'); function Twitter() { - var configPath = "data/twitter_config"; try { - var config = process.env; - this.consumerKey = config.twitterConsumerKey; this.consumerSecret = config.twitterConsumerSecret; this.accessToken = config.twitterAccessToken; @@ -28,7 +26,6 @@ function Twitter() { 'HMAC-SHA1' ); } catch (err) { - //console.log(err) console.log("no 'data/twitter_config' file, continuing without..."); } } @@ -195,7 +192,7 @@ Twitter.prototype.retweet = function(id, error, success){ var url = this.baseUrl + '/statuses/retweet/'+id+'.json'; this.doPost(url, {}, error, success); } - + Twitter.prototype.unretweet = function(id, error, success){ var url = this.baseUrl + '/statuses/unretweet/'+id+'.json'; this.doPost(url, {}, error, success); @@ -208,7 +205,7 @@ Twitter.prototype.doPost = function (url, post_body, error, success) { .replace(/\(/g, "%28") .replace(/\)/g, "%29") .replace(/\*/g, "%2A"); - //(url, oauth_token, oauth_token_secret, post_body, post_content_type, callback + //(url, oauth_token, oauth_token_secret, post_body, post_content_type, callback this.oauth.post(url, this.accessToken, this.accessTokenSecret, post_body, "application/x-www-form-urlencoded", function (err, body, response) { if (DEBUG) console.log('URL [%s]', url); if (!err && response.statusCode == 200) { diff --git a/twitter_config b/twitter_config.js similarity index 87% rename from twitter_config rename to twitter_config.js index e3edbfb..ad94d3c 100644 --- a/twitter_config +++ b/twitter_config.js @@ -1,7 +1,7 @@ -{ +module.exports = { "consumerKey": "XXX", "consumerSecret": "XXX", "accessToken": "XXX", "accessTokenSecret": "XXX", "callBackUrl": "XXX" -} \ No newline at end of file +}