tidied

[twirssi-net-twitter-lite.git] / twirssi.pl

diff --git a/twirssi.pl b/twirssi.pl
index d894a36da1d1ff893d5b08ac26fd70bad24408d8..80ee2438622539be1a5096a13d5ef1e9696ee4b6 100644 (file)
--- a/twirssi.pl
+++ b/twirssi.pl
@@ -11,9 +11,8 @@ $Data::Dumper::Indent = 1;
 
 use vars qw($VERSION %IRSSI);
 
-$VERSION = "2.3.0beta";
-my ($REV) = '$Rev: 687 $' =~ /(\d+)/;
-%IRSSI = (
+$VERSION = "2.3.0";
+%IRSSI   = (
     authors     => 'Dan Boger',
     contact     => 'zigdon@gmail.com',
     name        => 'twirssi',
@@ -91,7 +90,7 @@ sub cmd_direct_as {
         if ( $twits{$username}
             ->new_direct_message( { user => $target, text => $text } ) )
         {
-            &notice("DM sent to $target");
+            &notice("DM sent to $target: $text");
             $nicks{$target} = time;
         } else {
             my $error;
@@ -699,9 +698,8 @@ sub cmd_upgrade {
 
     my $loc = Irssi::settings_get_str("twirssi_location");
     unless ( -w $loc ) {
-        &notice( "$loc isn't writable, can't upgrade." .
-                 "  Perhaps you need to /set twirssi_location?"
-        );
+        &notice("$loc isn't writable, can't upgrade."
+              . "  Perhaps you need to /set twirssi_location?" );
         return;
     }
 
@@ -710,9 +708,8 @@ sub cmd_upgrade {
         eval { use Digest::MD5; };
 
         if ($@) {
-            &notice( "Failed to load Digest::MD5." . 
-                     "  Try '/twirssi_upgrade nomd5' to skip MD5 verification"
-            );
+            &notice("Failed to load Digest::MD5."
+                  . "  Try '/twirssi_upgrade nomd5' to skip MD5 verification" );
             return;
         }
 
@@ -725,8 +722,8 @@ sub cmd_upgrade {
         }
 
         unless ( open( CUR, $loc ) ) {
-            &notice( "Failed to read $loc." .
-                     "  Check that /set twirssi_location is set to the correct location."
+            &notice("Failed to read $loc."
+                  . "  Check that /set twirssi_location is set to the correct location."
             );
             return;
         }
@@ -791,19 +788,27 @@ sub cmd_upgrade {
 }
 
 sub load_friends {
-    my $fh   = shift;
-    my $page = 1;
+    my $fh     = shift;
+    my $cursor = -1;
+    my $page   = 1;
     my %new_friends;
     eval {
-        while (1)
+        while ( $page < 11 and $cursor ne "0" )
         {
             print $fh "type:debug Loading friends page $page...\n"
               if ( $fh and &debug );
-            my $friends = $twit->friends( { page => $page } );
-            last unless $friends;
+            my $friends;
+            if ( ref $twit =~ /^Net::Twitter/ ) {
+                $friends = $twit->friends( { cursor => $cursor } );
+                last unless $friends;
+                $cursor  = $friends->{next_cursor};
+                $friends = $friends->{users};
+            } else {
+                $friends = $twit->friends( { page => $page } );
+                last unless $friends;
+            }
             $new_friends{ $_->{screen_name} } = time foreach @$friends;
             $page++;
-            last if @$friends == 0 or $page == 10;
         }
     };
 
@@ -876,7 +881,7 @@ sub get_updates {
                 $fix_replies_index{$_} = 0
                   if $fix_replies_index{$_} >= @frusers;
                 print $fh "id:$fix_replies_index{$_} ",
-                          "account:$_ type:fix_replies_index\n";
+                  "account:$_ type:fix_replies_index\n";
             }
         }
 
@@ -1122,16 +1127,14 @@ sub get_timeline {
     my $tweets;
     my $last_id = $id_map{__last_id}{$username}{$target};
 
-    print $fh "type:debug get_timeline(" .
-              "$fix_replies_index{$username}=$target > $last_id) started." .
-              "  username = $username\n";
+    print $fh "type:debug get_timeline("
+      . "$fix_replies_index{$username}=$target > $last_id) started."
+      . "  username = $username\n";
     eval {
         $tweets = $obj->user_timeline(
             {
                 id => $target,
-                (   
-                    $last_id ? (since_id => $last_id) : ()
-                ),
+                ( $last_id ? ( since_id => $last_id ) : () ),
             }
         );
     };
@@ -1192,7 +1195,7 @@ sub get_timeline {
         $last_id = $t->{id} if $last_id < $t->{id};
     }
     printf $fh "id:%s account:%s type:last_id_fixreplies %s\n",
-        $last_id, $username, $target;
+      $last_id, $username, $target;
 
     return 1;
 }
@@ -1403,6 +1406,9 @@ sub monitor_child {
             # make sure the pid is removed from the waitpid list
             Irssi::pidwait_remove($child_pid);
 
+            # and that we don't leave any zombies behind, somehow
+            wait();
+
             # save id_map hash
             if ( keys %id_map
                 and my $file =
@@ -1429,6 +1435,7 @@ sub monitor_child {
     } else {
         print "Giving up on polling $filename" if &debug;
         Irssi::pidwait_remove($child_pid);
+        wait();
         unlink $filename unless &debug;
 
         return unless Irssi::settings_get_bool("twirssi_notify_timeouts");
@@ -1550,7 +1557,9 @@ sub sig_complete {
           keys %{ $id_map{__indexes} };
     }
 
-    if ( $linestart =~ /^\/(twitter_unfriend|twitter_add_follow_extra|twitter_del_follow_extra)\s*$/ )
+    if ( $linestart =~
+/^\/(twitter_unfriend|twitter_add_follow_extra|twitter_del_follow_extra)\s*$/
+      )
     {    # /twitter_unfriend gets a nick
         $word =~ s/^@//;
         push @$complist, grep /^\Q$word/i,
@@ -1779,7 +1788,7 @@ if ($window) {
         "twirssi_version",
         sub {
             &notice(
-                "Twirssi v$VERSION (r$REV); "
+                "Twirssi v$VERSION; "
                   . (
                     $Net::Twitter::VERSION
                     ? "Net::Twitter v$Net::Twitter::VERSION. "
@@ -1838,7 +1847,7 @@ if ($window) {
     );
     Irssi::signal_add_last( 'complete word' => \&sig_complete );
 
-    &notice("  %Y<%C(%B^%C)%N                   TWIRSSI v%R$VERSION%N (r$REV)");
+    &notice("  %Y<%C(%B^%C)%N                   TWIRSSI v%R$VERSION%N");
     &notice("   %C(_(\\%N           http://twirssi.com/ for full docs");
     &notice(
         "    %Y||%C `%N Log in with /twitter_login, send updates with /tweet");