Changeset f0550c5

Timestamp:

Apr 6, 2009, 9:16:09 PM (16 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, release-1.10, release-1.7, release-1.8, release-1.9

Children:

b25b5a4

Parents:

4ea78a8

Message:

Handle Twitter being down better.

File:

• lib/BarnOwl/Module/Twitter.pm (modified) (5 diffs)

lib/BarnOwl/Module/Twitter.pm

@@ -22 +22 @@
 use HTML::Entities;
 
-my $twitter;
+our $twitter;
 my $user     = BarnOwl::zephyr_getsender();
 my ($class)  = ($user =~ /(^[^@]+)/);
@@ -145 +145 @@
 sub twitter_error {
     my $ratelimit = $twitter->rate_limit_status;
-    unless(defined($ratelimit)) {
+    unless(defined($ratelimit) && ref($ratelimit) eq 'HASH') {
         # Twitter's just sucking, sleep for 5 minutes
         $last_direct_poll = $last_poll = time + 60*5;
@@ -151 +151 @@
         return;
     }
-    if($ratelimit->{remaining_hits} <= 0) {
+    if(exists($ratelimit->{remaining_hits})
+       && $ratelimit->{remaining_hits} <= 0) {
         $last_direct_poll = $last_poll = $ratelimit->{reset_time_in_seconds};
         die("Twitter: ratelimited until " . $ratelimit->{reset_time} . "\n");
+    } elsif(exists($ratelimit->{error})) {
+        die("Twitter: ". $ratelimit->{error} . "\n");
+        $last_direct_poll = $last_poll = time + 60*20;
     }
 }
@@ -163 +167 @@
 
     my $timeline = $twitter->friends_timeline( { since_id => $last_id } );
-    unless(defined($timeline) && ref($timeline)) {
+    unless(defined($timeline) && ref($timeline) eq 'ARRAY') {
         twitter_error();
         return;
@@ -195 +199 @@
 
     my $direct = $twitter->direct_messages( { since_id => $last_direct } );
-    unless(defined($direct) && ref($direct)) {
+    unless(defined($direct) && ref($direct) eq 'ARRAY') {
         twitter_error();
         return;