X-Git-Url: https://git.sommitrealweird.co.uk/twirssi-net-twitter-lite.git/blobdiff_plain/ffecda58bcaff0f441dd3a0583347a20a6abf3ee..5716c1e0ce7cd0149f01d3755e9fc52a45d8c484:/twirssi.pl?ds=inline

diff --git a/twirssi.pl b/twirssi.pl
index 47089f7..af37616 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: 342 $' =~ /(\d+)/;
+$VERSION = "1.7.2";
+my ($REV) = '$Rev: 348 $' =~ /(\d+)/;
 %IRSSI = (
     authors     => 'Dan Boger',
     contact     => 'zigdon@gmail.com',
@@ -21,7 +21,7 @@ my ($REV) = '$Rev: 342 $' =~ /(\d+)/;
       . 'Can optionally set your bitlbee /away message to same',
     license => 'GNU GPL v2',
     url     => 'http://tinyurl.com/twirssi',
-    changed => '$Date: 2009-01-05 16:26:47 -0800 (Mon, 05 Jan 2009) $',
+    changed => '$Date: 2009-01-06 11:09:34 -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;
     }
@@ -553,7 +553,8 @@ sub load_friends {
     eval {
         while (1)
         {
-            print $fh "Loading friends page $page...\n" if ( $fh and &debug );
+            print $fh "type:debug Loading friends page $page...\n"
+              if ( $fh and &debug );
             my $friends = $twit->friends( { page => $page } );
             last unless $friends;
             $new_friends{ $_->{screen_name} } = time foreach @$friends;
@@ -563,19 +564,20 @@ sub load_friends {
     };
 
     if ($@) {
-        &notice("Error during friends list update.  Aborted.");
+        print $fh "type:error Error during friends list update.  Aborted.\n";
         return;
     }
 
     my ( $added, $removed ) = ( 0, 0 );
-    print $fh "Scanning for new friends...\n" if ( $fh and &debug );
+    print $fh "type:debug Scanning for new friends...\n" if ( $fh and &debug );
     foreach ( keys %new_friends ) {
         next if exists $friends{$_};
         $friends{$_} = time;
         $added++;
     }
 
-    print $fh "Scanning for removed friends...\n" if ( $fh and &debug );
+    print $fh "type:debug Scanning for removed friends...\n"
+      if ( $fh and &debug );
     foreach ( keys %friends ) {
         next if exists $new_friends{$_};
         delete $friends{$_};
@@ -605,7 +607,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,15 +616,16 @@ 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);
         if ( $added + $removed ) {
-            print $fh "%R***%n Friends list updated: ",
+            print $fh "type:debug %R***%n Friends list updated: ",
               join( ", ",
                 sprintf( "%d added",   $added ),
                 sprintf( "%d removed", $removed ) ),
@@ -632,7 +635,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;
     }
@@ -646,13 +655,23 @@ sub do_updates {
     my $tweets;
     eval {
         $tweets = $obj->friends_timeline(
-            { since => HTTP::Date::time2str($last_poll) } )
-          || [];
+            { since => HTTP::Date::time2str($last_poll) } );
     };
 
     if ($@) {
         print $fh "type:error Error during friends_timeline call.  Aborted.\n";
-        return;
+        return 1;
+    }
+
+    unless ( ref $tweets ) {
+        if ( $obj->can("get_error") ) {
+            print $fh "type:error API Error during friends_timeline call: ",
+              JSON::Any->jsonToObj( $obj->get_error() ), "  Aborted.\n";
+        } else {
+            print $fh
+              "type:error API Error during friends_timeline call. Aborted.\n";
+        }
+        return 1;
     }
 
     foreach my $t ( reverse @$tweets ) {
@@ -695,7 +714,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 +737,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,14 +748,18 @@ 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)   = @_;
     my $filename = $data->[0];
+    my $attempt  = $data->[1];
 
-    print scalar localtime, " - checking child log at $filename" if &debug;
-    my $old_last_poll = $last_poll;
+    print scalar localtime, " - checking child log at $filename ($attempt)"
+      if &debug;
+    my $new_last_poll;
     if ( open FILE, $filename ) {
         my @lines;
         while (<FILE>) {
@@ -748,7 +771,7 @@ sub monitor_child {
                 $meta{$key} = $1;
             }
 
-            next if exists $tweet_cache{ $meta{id} };
+            next if exists $meta{id} and exists $tweet_cache{ $meta{id} };
             $tweet_cache{ $meta{id} } = time;
             my $account = "";
             if ( $meta{account} ne $user ) {
@@ -774,24 +797,26 @@ 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";
             } elsif ( $meta{type} eq 'debug' ) {
-                push @lines, "debug: $_\n" if &debug,;
+                print "$_" if &debug,;
+            } else {
+                print "Unknown line type $meta{type}: $_" if &debug,;
             }
         }
 
         %friends = ();
         while (<FILE>) {
             if (/^\d+$/) {
-                $last_poll = $_;
+                $new_last_poll = $_;
                 last;
             }
             my ( $f, $t ) = split ' ', $_;
             $nicks{$f} = $friends{$f} = $t;
         }
 
-        if ( $last_poll != $old_last_poll ) {
-            print "new last_poll = $last_poll" if &debug;
+        if ($new_last_poll) {
+            print "new last_poll = $new_last_poll" if &debug;
             foreach my $line (@lines) {
                 chomp $line;
                 $window->print( $line, MSGLEVEL_PUBLIC );
@@ -807,9 +832,10 @@ sub monitor_child {
 
             # keep enough cached tweets, to make sure we don't show duplicates.
             foreach ( keys %tweet_cache ) {
-                next if $tweet_cache{$_} >= $old_last_poll;
+                next if $tweet_cache{$_} >= $last_poll;
                 delete $tweet_cache{$_};
             }
+            $last_poll = $new_last_poll;
 
             # save id_map hash
             if ( keys %id_map
@@ -828,7 +854,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 {
@@ -842,12 +875,8 @@ sub notice {
 sub sig_complete {
     my ( $complist, $window, $word, $linestart, $want_space ) = @_;
 
-    if (
-        $linestart =~ /^\/twitter_reply(?:_as)?\s*$/
-        or ( Irssi::settings_get_bool("twirssi_use_reply_aliases")
-            and $linestart =~ /^\/reply(?:_as)?\s*$/ )
-      )
-    {    # /twitter_reply gets a nick:num
+    # /twitter_reply gets a nick:num
+    if ( $linestart =~ /^\/twitter_reply(?:_as)?\s*$/ ) {
         @$complist = grep /^\Q$word/i, sort keys %{ $id_map{__indexes} };
     }
 
@@ -871,13 +900,12 @@ Irssi::settings_add_str( "twirssi", "twitter_usernames", undef );
 Irssi::settings_add_str( "twirssi", "twitter_passwords", undef );
 Irssi::settings_add_str( "twirssi", "twirssi_replies_store",
     ".irssi/scripts/twirssi.json" );
-Irssi::settings_add_bool( "twirssi", "tweet_to_away",             0 );
-Irssi::settings_add_bool( "twirssi", "show_reply_context",        0 );
-Irssi::settings_add_bool( "twirssi", "show_own_tweets",           1 );
-Irssi::settings_add_bool( "twirssi", "twirssi_debug",             0 );
-Irssi::settings_add_bool( "twirssi", "twirssi_first_run",         1 );
-Irssi::settings_add_bool( "twirssi", "twirssi_track_replies",     1 );
-Irssi::settings_add_bool( "twirssi", "twirssi_use_reply_aliases", 0 );
+Irssi::settings_add_bool( "twirssi", "tweet_to_away",         0 );
+Irssi::settings_add_bool( "twirssi", "show_reply_context",    0 );
+Irssi::settings_add_bool( "twirssi", "show_own_tweets",       1 );
+Irssi::settings_add_bool( "twirssi", "twirssi_debug",         0 );
+Irssi::settings_add_bool( "twirssi", "twirssi_first_run",     1 );
+Irssi::settings_add_bool( "twirssi", "twirssi_track_replies", 1 );
 $window = Irssi::window_find_name( Irssi::settings_get_str('twitter_window') );
 
 if ($window) {
@@ -891,10 +919,6 @@ if ($window) {
     Irssi::command_bind( "twitter_logout",   "cmd_logout" );
     Irssi::command_bind( "twitter_switch",   "cmd_switch" );
     Irssi::command_bind( "twirssi_upgrade",  "cmd_upgrade" );
-    if ( Irssi::settings_get_bool("twirssi_use_reply_aliases") ) {
-        Irssi::command_bind( "reply",    "cmd_reply" );
-        Irssi::command_bind( "reply_as", "cmd_reply_as" );
-    }
     Irssi::command_bind(
         "twirssi_dump",
         sub {