X-Git-Url: https://git.sommitrealweird.co.uk/twirssi-net-twitter-lite.git/blobdiff_plain/e70df48b8a9df567e5411ee411c6092f3bd96c08..59954446e357f5c09a6fcba29099982b9b1717dd:/twirssi.pl?ds=inline

diff --git a/twirssi.pl b/twirssi.pl
index 73f5136..776091a 100644
--- a/twirssi.pl
+++ b/twirssi.pl
@@ -11,8 +11,8 @@ $Data::Dumper::Indent = 1;
 
 use vars qw($VERSION %IRSSI);
 
-$VERSION = "1.7";
-my ($REV) = '$Rev: 341 $' =~ /(\d+)/;
+$VERSION = "1.7.1";
+my ($REV) = '$Rev: 346 $' =~ /(\d+)/;
 %IRSSI = (
     authors     => 'Dan Boger',
     contact     => 'zigdon@gmail.com',
@@ -21,7 +21,7 @@ my ($REV) = '$Rev: 341 $' =~ /(\d+)/;
       . 'Can optionally set your bitlbee /away message to same',
     license => 'GNU GPL v2',
     url     => 'http://tinyurl.com/twirssi',
-    changed => 'Mon Dec  1 15:36:01 PST 2008',
+    changed => '$Date: 2009-01-06 07:14:23 -0800 (Tue, 06 Jan 2009) $',
 );
 
 my $window;
@@ -171,7 +171,7 @@ sub cmd_tweet_as {
             $away = 1;
         } else {
             &notice( "Can't find bitlbee server.",
-                "Update bitlbee_server or disalbe tweet_to_away" );
+                "Update bitlbee_server or disable tweet_to_away" );
         }
     }
 
@@ -233,7 +233,7 @@ sub cmd_reply_as {
     my $nick;
     $id =~ s/[^\w\d\-:]+//g;
     ( $nick, $id ) = split /:/, $id;
-    unless ( exists $id_map{$nick} ) {
+    unless ( exists $id_map{ lc $nick } ) {
         &notice("Can't find a tweet from $nick to reply to!");
         return;
     }
@@ -605,7 +605,7 @@ sub get_updates {
     my $pid = fork();
 
     if ($pid) {    # parent
-        Irssi::timeout_add_once( 5000, 'monitor_child', [$filename] );
+        Irssi::timeout_add_once( 5000, 'monitor_child', [ $filename, 0 ] );
         Irssi::pidwait_add($pid);
     } elsif ( defined $pid ) {    # child
         close STDIN;
@@ -614,10 +614,11 @@ sub get_updates {
 
         my $new_poll = time;
 
-        &do_updates( $fh, $user, $twit );
+        my $error = 0;
+        $error += &do_updates( $fh, $user, $twit );
         foreach ( keys %twits ) {
             next if $_ eq $user;
-            &do_updates( $fh, $_, $twits{$_} );
+            $error += &do_updates( $fh, $_, $twits{$_} );
         }
 
         my ( $added, $removed ) = &load_friends($fh);
@@ -632,7 +633,13 @@ sub get_updates {
         foreach ( sort keys %friends ) {
             print $fh "$_ $friends{$_}\n";
         }
-        print $fh $new_poll;
+
+        if ($error) {
+            print $fh "type:error Update encountered errors.  Aborted\n";
+            print $fh $last_poll;
+        } else {
+            print $fh $new_poll;
+        }
         close $fh;
         exit;
     }
@@ -652,7 +659,7 @@ sub do_updates {
 
     if ($@) {
         print $fh "type:error Error during friends_timeline call.  Aborted.\n";
-        return;
+        return 1;
     }
 
     foreach my $t ( reverse @$tweets ) {
@@ -695,7 +702,7 @@ sub do_updates {
 
     if ($@) {
         print $fh "type:error Error during replies call.  Aborted.\n";
-        return;
+        return 1;
     }
 
     foreach my $t ( reverse @$tweets ) {
@@ -718,7 +725,7 @@ sub do_updates {
 
     if ($@) {
         print $fh "type:error Error during direct_messages call.  Aborted.\n";
-        return;
+        return 1;
     }
 
     foreach my $t ( reverse @$tweets ) {
@@ -729,10 +736,12 @@ sub do_updates {
           $t->{id}, $username, $t->{sender_screen_name}, $text;
     }
     print scalar localtime, " - Done" if &debug;
+
+    return 0;
 }
 
 sub monitor_child {
-    my $data     = shift;
+    my ( $data, $attempt ) = @_;
     my $filename = $data->[0];
 
     print scalar localtime, " - checking child log at $filename" if &debug;
@@ -774,7 +783,7 @@ sub monitor_child {
             } elsif ( $meta{type} eq 'dm' ) {
                 push @lines, "[$account%B\@$meta{nick}%n (%WDM%n)] $_\n",;
             } elsif ( $meta{type} eq 'error' ) {
-                push @lines, "debug: $_\n" if &debug,;
+                push @lines, "error: $_\n" if &debug,;
             } elsif ( $meta{type} eq 'debug' ) {
                 push @lines, "debug: $_\n" if &debug,;
             }
@@ -828,7 +837,14 @@ sub monitor_child {
     }
 
     close FILE;
-    Irssi::timeout_add_once( 5000, 'monitor_child', [$filename] );
+
+    if ( $attempt < 12 ) {
+        Irssi::timeout_add_once( 5000, 'monitor_child',
+            [ $filename, $attempt + 1 ] );
+    } else {
+        &notice("Giving up on polling $filename");
+        unlink $filename unless &debug;
+    }
 }
 
 sub debug {