Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
  • 3 commits
  • 11 files changed
  • 0 commit comments
  • 1 contributor
View
4 CHANGELOG
@@ -14,6 +14,10 @@ $ - Language fix or change
- - Removed
! - Note
+21-May-2012 Michael Babker
+- Remove the damn rate limit check finally
+# Links in .TDB-tweet-time container smaller than other text
+
27-February-2012 Michael Babker
^ [#35] Internationalize hover titles on Web Intent actions
View
2  build.xml
@@ -4,7 +4,7 @@
<property file="./build.properties" />
<property name="repo.dir" value="." />
<resolvepath propertyName="repo.dir.resolved" file="${repo.dir}" />
- <property name="version" value="2.1.3" />
+ <property name="version" value="2.1.3+dev" />
<tstamp>
<format property="build.date" pattern="%Y-%m-%d" />
</tstamp>
View
51 helper.php
@@ -29,21 +29,6 @@ class ModTweetDisplayBackHelper
*/
static public function compileData($params)
{
- // Initialize the object
- $twitter = new stdClass;
-
- // Check if we're bypassing the limit check
- if ($params->get('bypassLimit', '0') == '0')
- {
- // Check the number of hits available
- $hits = self::getLimit($params);
- if ($hits == 0)
- {
- $twitter->hits = '';
- return $twitter;
- }
- }
-
// Load the parameters
$uname = $params->get('twitterName', '');
$list = $params->get('twitterList', '');
@@ -59,8 +44,8 @@ static public function compileData($params)
// Get the user info
$twitter = self::prepareUser($params);
- // Check to see if we have an error
- if (isset ($twitter->error))
+ // Check to see if we have an error or are out of hits
+ if (isset($twitter->error) || isset($twitter->hits))
{
return $twitter;
}
@@ -179,37 +164,6 @@ static public function getJSON($req)
}
/**
- * Function to get the rate limit of a Twitter user
- *
- * @param JRegistry $params The module parameters
- *
- * @return string The number of remaining hits on a user's rate limit
- *
- * @since 1.0
- */
- static protected function getLimit($params)
- {
- // Load the parameters
- $uname = $params->get('twitterName', '');
- $req = 'http://api.twitter.com/1/account/rate_limit_status.json?screen_name=' . $uname;
-
- // Fetch the decoded JSON
- $obj = self::getJSON($req);
-
- // Get the remaining hits count
- if (isset($obj['remaining_hits']))
- {
- $hits = $obj['remaining_hits'];
- }
- else
- {
- $hits = '';
- }
-
- return $hits;
- }
-
- /**
* Function to fetch the user JSON and render it
*
* @param JRegistry $params The module parameters
@@ -515,6 +469,7 @@ static protected function processItem(&$twitter, $o, $i, $params)
$tweetRTCount = $params->get('tweetRetweetCount', 1);
// Initialize a new object
+ $twitter[$i] = new stdClass;
$twitter[$i]->tweet = new stdClass;
// Check if the item is a retweet, and if so gather data from the retweeted_status datapoint
View
2  language/1.5/en-GB/en-GB.mod_tweetdisplayback.ini
@@ -16,8 +16,6 @@ MOD_TWEETDISPLAYBACK_CREATE_WEEKS="%s weeks ago"
MOD_TWEETDISPLAYBACK_ERROR_NOCURL="PHP CURL is not installed or activated on this server. This module requires CURL to load data."
MOD_TWEETDISPLAYBACK_ERROR_NOHITS="This user has reached the maximum allowable queries against Twitter's API for the hour."
MOD_TWEETDISPLAYBACK_ERROR_UNABLETOLOAD="Due to an error, potentially a timed-out connection to Twitter, this user's tweets are unable to be displayed."
-MOD_TWEETDISPLAYBACK_FIELDSET_ADVANCED_BYPASSINTENT_DESCRIPTION="Choose to bypass the Twitter Web Intents script when clicking user links. This will cause user links to go to twitter.com instead of being displayed in a popup. Actions links are unaffected."
-MOD_TWEETDISPLAYBACK_FIELDSET_ADVANCED_BYPASSINTENT_LABEL="Bypass Web Intents for User Links"
MOD_TWEETDISPLAYBACK_FIELDSET_ADVANCED_BYPASSLIMIT_DESCRIPTION="Choose to bypass the Twitter API's limit check. Note that this does not guarantee that your tweet stream will render."
MOD_TWEETDISPLAYBACK_FIELDSET_ADVANCED_BYPASSLIMIT_LABEL="Bypass Limit Check"
MOD_TWEETDISPLAYBACK_FIELDSET_FILTER_MENTIONS_DESCRIPTION="Show tweets which contain user mentions. If set to no, @replies are still displayed."
View
2  language/1.7/en-GB/en-GB.mod_tweetdisplayback.ini
@@ -28,8 +28,6 @@ MOD_TWEETDISPLAYBACK_ERROR_NOHITS="This user has reached the maximum allowable q
MOD_TWEETDISPLAYBACK_ERROR_UNABLETOLOAD="Due to an error, potentially a timed-out connection to Twitter, this user's tweets are unable to be displayed."
MOD_TWEETDISPLAYBACK_FIELDSET_ADVANCED_BYPASSINTENT_DESCRIPTION="Choose to bypass the Twitter Web Intents script when clicking user links. This will cause user links to go to twitter.com instead of being displayed in a popup. Actions links are unaffected."
MOD_TWEETDISPLAYBACK_FIELDSET_ADVANCED_BYPASSINTENT_LABEL="Bypass Web Intents for User Links"
-MOD_TWEETDISPLAYBACK_FIELDSET_ADVANCED_BYPASSLIMIT_DESCRIPTION="Choose to bypass the Twitter API's limit check. Note that this does not guarantee that your tweet stream will render."
-MOD_TWEETDISPLAYBACK_FIELDSET_ADVANCED_BYPASSLIMIT_LABEL="Bypass Limit Check"
MOD_TWEETDISPLAYBACK_FIELDSET_FILTER_MENTIONS_DESCRIPTION="Show tweets which contain user mentions. If set to no, @replies are still displayed."
MOD_TWEETDISPLAYBACK_FIELDSET_FILTER_MENTIONS_LABEL="Show user mentions"
MOD_TWEETDISPLAYBACK_FIELDSET_FILTER_OVERRIDECOUNT_DESCRIPTION="If yes, then instead of retrieving the number of tweets defined in the "_QQ_"# of Tweets"_QQ_" field, the module will retrieve the number of tweets you specify below for processing. This is beneficial if filtering is enabled and you are not receiving the number of tweets you are expecting."
View
1  media/css/construct-css3.css
@@ -111,7 +111,6 @@ span.TDB-header-avatar-right {
}
.TDB-tweet-time a {
- font-size: 85%;
}
.TDB-tweet-align-left {
View
1  media/css/construct.css
@@ -105,7 +105,6 @@ span.TDB-header-avatar-right {
}
.TDB-tweet-time a {
- font-size: 85%;
}
.TDB-tweet-align-left {
View
1  media/css/default-css3.css
@@ -116,7 +116,6 @@ span.TDB-header-avatar-right {
}
.TDB-tweet-time a {
- font-size: 85%;
}
.TDB-tweet-align-left .TDB-tweet-time, .TDB-tweet-align-left .TDB-tweet-actions {
View
1  media/css/default.css
@@ -110,7 +110,6 @@ span.TDB-header-avatar-right {
}
.TDB-tweet-time a {
- font-size: 85%;
}
.TDB-tweet-align-left .TDB-tweet-time, .TDB-tweet-align-left .TDB-tweet-actions {
View
1  media/css/nostyle.css
@@ -73,7 +73,6 @@ span.TDB-header-avatar-right {
}
.TDB-tweet-time a {
- font-size: 85%;
}
.TDB-tweet-align-left {
View
11 mod_tweetdisplayback_17.xml
@@ -659,17 +659,6 @@
label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC" />
<field
- name="bypassLimit"
- type="radio"
- default="0"
- label="MOD_TWEETDISPLAYBACK_FIELDSET_ADVANCED_BYPASSLIMIT_LABEL"
- description="MOD_TWEETDISPLAYBACK_FIELDSET_ADVANCED_BYPASSLIMIT_DESCRIPTION" >
- <option
- value="1">JYES</option>
- <option
- value="0">JNO</option>
- </field>
- <field
name="bypassIntent"
type="radio"
default="0"

No commit comments for this range

Something went wrong with that request. Please try again.