diff --git a/README.md b/README.md index e401965..caa16f6 100644 --- a/README.md +++ b/README.md @@ -85,6 +85,7 @@ For now only two templating variables are available, more coming soon. You add a Template | Description --- | --- +`{{id}}` | Tweet ID `{{tweet}}` | Tweet content `{{date}}` | Formatted tweet date `{{avatar}}` | User's Avatar Image diff --git a/api/config.php b/api/config.php index 17ae02e..0180bd9 100644 --- a/api/config.php +++ b/api/config.php @@ -2,16 +2,15 @@ /** * Your Twitter App Info */ - + // Consumer Key - define('CONSUMER_KEY', 'CONSUMER_KEY_HERE'); - define('CONSUMER_SECRET', 'CONSUMER_SECRET_HERE'); + define('CONSUMER_KEY', 'zlgRmKt5yR7LnpXWEammKUFZE'); + define('CONSUMER_SECRET', 'vCNsvScV6OQgG2SDrm1CHiMnve6qfNoB9UlH5lvEKHxe5ocqAF'); // User Access Token - define('ACCESS_TOKEN', 'ACCESS_TOKEN_HERE'); - define('ACCESS_SECRET', 'ACCESS_SECRET_HERE'); - + define('ACCESS_TOKEN', '8550002-ptt6rJnaQQLanMOk66oDJoNDjRlEZEWmbhLLPkHoQL'); + define('ACCESS_SECRET', 'CTWDWfdzpsCk3ZNG96VkG9Dzm2WmnoIx27nvEo1JuPzdi'); // Cache Settings define('CACHE_ENABLED', false); define('CACHE_LIFETIME', 3600); // in seconds - define('HASH_SALT', md5(dirname(__FILE__))); \ No newline at end of file + define('HASH_SALT', md5(dirname(__FILE__))); diff --git a/index.html b/index.html index 1f8dbe1..f2d3c38 100644 --- a/index.html +++ b/index.html @@ -106,7 +106,7 @@ -moz-border-radius: 3px; border-radius: 3px; } - + .example2 .tweet { overflow: hidden; } @@ -137,7 +137,7 @@ - \ No newline at end of file + diff --git a/tweetie.js b/tweetie.js index 6dfbfaf..15fe11c 100644 --- a/tweetie.js +++ b/tweetie.js @@ -80,7 +80,7 @@ */ var templating = function (data) { var temp = settings.template; - var temp_variables = ['date', 'tweet', 'avatar', 'url', 'retweeted', 'screen_name', 'user_name']; + var temp_variables = ['id', 'date', 'tweet', 'avatar', 'url', 'retweeted', 'screen_name', 'user_name']; for (var i = 0, len = temp_variables.length; i < len; i++) { temp = temp.replace(new RegExp('{{' + temp_variables[i] + '}}', 'gi'), data[temp_variables[i]]); @@ -110,6 +110,7 @@ } var temp_data = { + id: tweet.id, user_name: tweet.user.name, date: dating(tweet.created_at), tweet: (tweet.retweeted) ? linking('RT @'+ tweet.user.screen_name +': '+ tweet.retweeted_status.text) : linking(tweet.text),