Make work with Net::Twitter::Lite

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

diff --git a/twirssi.pl b/twirssi.pl
index 0d4c1e5d58ba28d07cca6abe6be5ade757f824de..45faf6fe4e3c2e38b7342e7f3e82c0bac5b4e504 100644 (file)
--- a/twirssi.pl
+++ b/twirssi.pl
@@ -6,14 +6,15 @@ use HTML::Entities;
 use File::Temp;
 use LWP::Simple;
 use Data::Dumper;
 use File::Temp;
 use LWP::Simple;
 use Data::Dumper;

-use Net::Twitter;
+use Encode;
+use POSIX qw/:sys_wait_h/;
+use Net::Twitter::Lite

 $Data::Dumper::Indent = 1;
 
 use vars qw($VERSION %IRSSI);
 
 $Data::Dumper::Indent = 1;
 
 use vars qw($VERSION %IRSSI);
 

-$VERSION = "2.1.2beta";
-my ($REV) = '$Rev: 521 $' =~ /(\d+)/;
-%IRSSI = (
+$VERSION = "2.4.1beta";
+%IRSSI   = (

     authors     => 'Dan Boger',
     contact     => 'zigdon@gmail.com',
     name        => 'twirssi',
     authors     => 'Dan Boger',
     contact     => 'zigdon@gmail.com',
     name        => 'twirssi',


@@ -21,20 +22,27 @@ my ($REV) = '$Rev: 521 $' =~ /(\d+)/;
       . 'Can optionally set your bitlbee /away message to same',
     license => 'GNU GPL v2',
     url     => 'http://twirssi.com',
       . 'Can optionally set your bitlbee /away message to same',
     license => 'GNU GPL v2',
     url     => 'http://twirssi.com',

-    changed => '$Date: 2009-03-07 13:50:54 -0800 (Sat, 07 Mar 2009) $',
+    changed => 'Fri Jan 22 14:40:48 PST 2010',

 );
 
 my $window;
 my $twit;
 my %twits;
 );
 
 my $window;
 my $twit;
 my %twits;

+my %oauth;

 my $user;
 my $user;

+my $defservice;

 my $poll;
 my $last_poll;
 my $poll;
 my $last_poll;

+my $last_friends_poll = 0;

 my %nicks;
 my %friends;
 my %tweet_cache;
 my %id_map;
 my %nicks;
 my %friends;
 my %tweet_cache;
 my %id_map;

-my $failwhale            = 0;
+my $failwhale  = 0;
+my $first_call = 1;
+my $child_pid;
+my %fix_replies_index;
+

 my %irssi_to_mirc_colors = (
     '%k' => '01',
     '%r' => '05',
 my %irssi_to_mirc_colors = (
     '%k' => '01',
     '%r' => '05',


@@ -79,13 +87,13 @@ sub cmd_direct_as {
         return;
     }
 
         return;
     }
 

-    return unless &valid_username($username);
+    return unless $username = &valid_username($username);

 
     eval {
         if ( $twits{$username}
             ->new_direct_message( { user => $target, text => $text } ) )
         {
 
     eval {
         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;
             $nicks{$target} = time;
         } else {
             my $error;


@@ -104,6 +112,109 @@ sub cmd_direct_as {
     }
 }
 
     }
 }
 

+sub cmd_retweet {
+    my ( $data, $server, $win ) = @_;
+
+    return unless &logged_in($twit);
+
+    $data =~ s/^\s+|\s+$//;
+    unless ($data) {
+        &notice("Usage: /retweet <nick[:num]> [comment]");
+        return;
+    }
+
+    my ( $id, $data ) = split ' ', $data, 2;
+
+    &cmd_retweet_as( "$user $id $data", $server, $win );
+}
+
+sub cmd_retweet_as {
+    my ( $data, $server, $win ) = @_;
+
+    unless ( Irssi::settings_get_bool("twirssi_track_replies") ) {
+        &notice("twirssi_track_replies is required in order to reteet.");
+        return;
+    }
+
+    return unless &logged_in($twit);
+
+    $data =~ s/^\s+|\s+$//;
+    my ( $username, $id, $data ) = split ' ', $data, 3;
+
+    unless ($username) {
+        &notice("Usage: /retweet_as <username> <nick[:num]> [comment]");
+        return;
+    }
+
+    return unless $username = &valid_username($username);
+
+    my $nick;
+    $id =~ s/[^\w\d\-:]+//g;
+    ( $nick, $id ) = split /:/, $id;
+    unless ( exists $id_map{ lc $nick } ) {
+        &notice("Can't find a tweet from $nick to retweet!");
+        return;
+    }
+
+    $id = $id_map{__indexes}{$nick} unless $id;
+    unless ( $id_map{ lc $nick }[$id] ) {
+        &notice("Can't find a tweet numbered $id from $nick to retweet!");
+        return;
+    }
+
+    unless ( $id_map{__tweets}{ lc $nick }[$id] ) {
+        &notice("The text of this tweet isn't saved, sorry!");
+        return;
+    }
+
+# Irssi::settings_add_str( "twirssi", "twirssi_retweet_format", 'RT $n: $t ${-- $c$}' );
+    my $text = Irssi::settings_get_str("twirssi_retweet_format");
+    $text =~ s/\$n/\@$nick/g;
+    if ($data) {
+        $text =~ s/\${|\$}//g;
+        $text =~ s/\$c/$data/;
+    } else {
+        $text =~ s/\${.*?\$}//;
+    }
+    $text =~ s/\$t/$id_map{__tweets}{ lc $nick }[$id]/;
+
+    my $modified = $data;
+    $data = &shorten($text);
+
+    return if $modified and &too_long($data);
+
+    my $success = 1;
+    eval {
+        if ($modified)
+        {
+            $success = $twits{$username}->update(
+                {
+                    status => $data,
+
+                    # in_reply_to_status_id => $id_map{ lc $nick }[$id]
+                }
+            );
+        } else {
+            $success =
+              $twits{$username}->retweet( { id => $id_map{ lc $nick }[$id] } );
+            $success = $success->{id} if ref $success;
+        }
+        &notice("Update failed") unless $success;
+    };
+    return unless $success;
+
+    if ($@) {
+        &notice("Update caused an error: $@.  Aborted");
+        return;
+    }
+
+    foreach ( $data =~ /@([-\w]+)/ ) {
+        $nicks{$1} = time;
+    }
+
+    &notice("Retweet sent");
+}
+

 sub cmd_tweet {
     my ( $data, $server, $win ) = @_;
 
 sub cmd_tweet {
     my ( $data, $server, $win ) = @_;
 


@@ -115,7 +226,7 @@ sub cmd_tweet {
         return;
     }
 
         return;
     }
 

-    &cmd_tweet_as( "$user $data", $server, $win );
+    &cmd_tweet_as( "$user\@$defservice $data", $server, $win );

 }
 
 sub cmd_tweet_as {
 }
 
 sub cmd_tweet_as {


@@ -132,18 +243,9 @@ sub cmd_tweet_as {
         return;
     }
 
         return;
     }
 

-    return unless &valid_username($username);
+    return unless $username = &valid_username($username);

 
 

-    if ( &too_long( $data, 1 )
-        and Irssi::settings_get_str("short_url_provider") )
-    {
-        foreach my $url ( $data =~ /(https?:\/\/\S+[\w\/])/g ) {
-            eval {
-                my $short = makeashorterlink($url);
-                $data =~ s/\Q$url/$short/g;
-            };
-        }
-    }
+    $data = &shorten($data);

 
     return if &too_long($data);
 
 
     return if &too_long($data);
 


@@ -182,10 +284,9 @@ sub cmd_reply {
         return;
     }
 
         return;
     }
 

-    $data =~ s/^\s+|\s+$//;

     my ( $id, $data ) = split ' ', $data, 2;
     unless ( $id and $data ) {
     my ( $id, $data ) = split ' ', $data, 2;
     unless ( $id and $data ) {

-        &notice("Usage: /reply_as <nick[:num]> <update>");
+        &notice("Usage: /reply <nick[:num]> <update>");

         return;
     }
 
         return;
     }
 


@@ -212,7 +313,7 @@ sub cmd_reply_as {
         return;
     }
 
         return;
     }
 

-    return unless &valid_username($username);
+    return unless $username = &valid_username($username);

 
     my $nick;
     $id =~ s/[^\w\d\-:]+//g;
 
     my $nick;
     $id =~ s/[^\w\d\-:]+//g;


@@ -235,16 +336,7 @@ sub cmd_reply_as {
         $data = "\@$nick " . $data;
     }
 
         $data = "\@$nick " . $data;
     }
 

-    if ( &too_long( $data, 1 ) ) {
-        if ( Irssi::settings_get_str("short_url_provider") ) {
-            foreach my $url ( $data =~ /(https?:\/\/\S+[\w\/])/g ) {
-                eval {
-                    my $short = makeashorterlink($url);
-                    $data =~ s/\Q$url/$short/g;
-                };
-            }
-        }
-    }
+    $data = &shorten($data);

 
     return if &too_long($data);
 
 
     return if &too_long($data);
 


@@ -316,10 +408,16 @@ sub cmd_switch {
     my ( $data, $server, $win ) = @_;
 
     $data =~ s/^\s+|\s+$//g;
     my ( $data, $server, $win ) = @_;
 
     $data =~ s/^\s+|\s+$//g;

+    $data = &normalize_username($data);

     if ( exists $twits{$data} ) {
         &notice("Switching to $data");
         $twit = $twits{$data};
     if ( exists $twits{$data} ) {
         &notice("Switching to $data");
         $twit = $twits{$data};

-        $user = $data;
+        if ( $data =~ /(.*)\@(.*)/ ) {
+            $user       = $1;
+            $defservice = $2;
+        } else {
+            &notice("Couldn't figure out what service '$data' is on");
+        }

     } else {
         &notice("Unknown user $data");
     }
     } else {
         &notice("Unknown user $data");
     }


@@ -330,10 +428,10 @@ sub cmd_logout {
 
     $data =~ s/^\s+|\s+$//g;
     $data = $user unless $data;
 
     $data =~ s/^\s+|\s+$//g;
     $data = $user unless $data;

-    return unless &valid_username($data);
+    return unless $data = &valid_username($data);

 
     &notice("Logging out $data...");
 
     &notice("Logging out $data...");

-    $twits{$data}->end_session();
+    eval { $twits{$data}->end_session(); };

     delete $twits{$data};
     undef $twit;
     if ( keys %twits ) {
     delete $twits{$data};
     undef $twit;
     if ( keys %twits ) {


@@ -347,41 +445,166 @@ sub cmd_logout {
 sub cmd_login {
     my ( $data, $server, $win ) = @_;
     my $pass;
 sub cmd_login {
     my ( $data, $server, $win ) = @_;
     my $pass;

+    print "logging in: $data" if &debug;

     if ($data) {
     if ($data) {

+        print "manual data login" if &debug;

         ( $user, $pass ) = split ' ', $data, 2;
         ( $user, $pass ) = split ' ', $data, 2;

+        unless ( Irssi::settings_get_bool("twirssi_use_oauth") or $pass ) {
+            &notice("usage: /twitter_login <username>[\@<service>] <password>");
+            return;
+        }
+    } elsif ( Irssi::settings_get_bool("twirssi_use_oauth")
+        and my $autouser = Irssi::settings_get_str("twitter_usernames") )
+    {
+        print "oauth autouser login" if &debug;
+        foreach my $user ( split /,/, $autouser ) {
+            &cmd_login($user);
+        }
+        return;

     } elsif ( my $autouser = Irssi::settings_get_str("twitter_usernames")
         and my $autopass = Irssi::settings_get_str("twitter_passwords") )
     {
     } elsif ( my $autouser = Irssi::settings_get_str("twitter_usernames")
         and my $autopass = Irssi::settings_get_str("twitter_passwords") )
     {

+        print "autouser login" if &debug;

         my @user = split /\s*,\s*/, $autouser;
         my @pass = split /\s*,\s*/, $autopass;
         my @user = split /\s*,\s*/, $autouser;
         my @pass = split /\s*,\s*/, $autopass;

-        if ( @user != @pass ) {
+
+        # if a password ends with a '\', it was meant to escape the comma, and
+        # it should be concatinated with the next one
+        my @unescaped;
+        while (@pass) {
+            my $p = shift @pass;
+            while ( $p =~ /\\$/ and @pass ) {
+                $p .= "," . shift @pass;
+            }
+            push @unescaped, $p;
+        }
+
+        if ( @user != @unescaped ) {

             &notice("Number of usernames doesn't match "
                   . "the number of passwords - auto-login failed" );
         } else {
             my ( $u, $p );
             &notice("Number of usernames doesn't match "
                   . "the number of passwords - auto-login failed" );
         } else {
             my ( $u, $p );

-            while ( @user and @pass ) {
+            while ( @user and @unescaped ) {

                 $u = shift @user;
                 $u = shift @user;

-                $p = shift @pass;
+                $p = shift @unescaped;

                 &cmd_login("$u $p");
             }
             return;
         }
     } else {
                 &cmd_login("$u $p");
             }
             return;
         }
     } else {

-        &notice("/twitter_login requires either a username and password "
-              . "or twitter_usernames and twitter_passwords to be set." );
+        &notice("/twitter_login requires either a username/password "
+              . "or twitter_usernames and twitter_passwords to be set. "
+              . "Note that if twirssi_use_oauth is true, passwords are "
+              . "not required" );

         return;
     }
 
     %friends = %nicks = ();
 
         return;
     }
 
     %friends = %nicks = ();
 

-    $twit = Net::Twitter->new(
+    my $service;
+    if ( $user =~ /^(.*)@(twitter|identica)$/ ) {
+        ( $user, $service ) = ( $1, $2 );
+    } else {
+        $service = Irssi::settings_get_str("twirssi_default_service");
+    }
+    $defservice = $service = ucfirst lc $service;
+
+    $twit = Net::Twitter::Lite->new(

         username => $user,
         password => $pass,
         username => $user,
         password => $pass,

-        source   => "twirssi"

     );
 
     );
 

+    unless ($twit) {
+        &notice("Failed to create object!  Aborting.");
+        return;
+    }
+
+    return &verify_twitter_object( $server, $win, $user, $service, $twit );
+}
+
+sub cmd_oauth {
+    my ( $data, $server, $win ) = @_;
+    my ( $key, $pin ) = split ' ', $data;
+    my ( $user, $service );
+    $key = &normalize_username($key);
+    if ( $key =~ /^(.*)@(Twitter|Identica)$/ ) {
+        ( $user, $service ) = ( $1, $2 );
+    }
+    $pin =~ s/\D//g;
+    print "Applying pin to $key" if &debug;
+
+    unless ( exists $oauth{pending}{$key} ) {
+        &notice("There isn't a pending oauth request for $key. "
+              . "Try /twitter_login first" );
+        return;
+    }
+
+    my $twit = $oauth{pending}{$key};
+    my ( $access_token, $access_token_secret );
+    eval {
+        ( $access_token, $access_token_secret ) =
+          $twit->request_access_token( verifier => $pin );
+    };
+
+    if ($@) {
+        &notice("Invalid pin, try again.");
+        return;
+    }
+
+    delete $oauth{pending}{$key};
+
+    my $store_file = Irssi::settings_get_str("twirssi_oauth_store");
+    if ($store_file) {
+        my @store;
+        if ( open( OAUTH, $store_file ) ) {
+            while (<OAUTH>) {
+                chomp;
+                next if /$key/i;
+                push @store, $_;
+            }
+            close OAUTH;
+
+        }
+
+        push @store, "$key $access_token $access_token_secret";
+
+        if ( open( OAUTH, ">$store_file.new" ) ) {
+            print OAUTH "$_\n" foreach @store;
+            close OAUTH;
+            rename "$store_file.new", $store_file
+              or &notice("Failed to rename $store_file.new: $!");
+        } else {
+            &notice("Failed to write $store_file.new: $!");
+        }
+    } else {
+        &notice("No persistant storage set for OAuth.  "
+              . "Please /set twirssi_oauth_store to a writable filename." );
+    }
+
+    return &verify_twitter_object( $server, $win, $user, $service, $twit );
+}
+
+sub verify_twitter_object {
+    my ( $server, $win, $user, $service, $twit ) = @_;
+
+    if ( my $timeout = Irssi::settings_get_int("twitter_timeout")
+        and $twit->can('ua') )
+    {
+        $twit->ua->timeout($timeout);
+        &notice("Twitter timeout set to $timeout");
+    }
+

     unless ( $twit->verify_credentials() ) {
     unless ( $twit->verify_credentials() ) {

-        &notice("Login as $user failed");
+        &notice("Login as $user\@$service failed");
+
+        if ( not Irssi::settings_get_bool("twirssi_avoid_ssl") ) {
+            &notice(
+                "It's possible you're missing one of the modules required for "
+                  . "SSL logins.  Try setting twirssi_avoid_ssl to on.  See "
+                  . "http://cpansearch.perl.org/src/GAAS/libwww-perl-5.831/README.SSL "
+                  . "for the detailed requirements." );
+        }
+

         $twit = undef;
         if ( keys %twits ) {
             &cmd_switch( ( keys %twits )[0], $server, $win );
         $twit = undef;
         if ( keys %twits ) {
             &cmd_switch( ( keys %twits )[0], $server, $win );


@@ -389,36 +612,88 @@ sub cmd_login {
         return;
     }
 
         return;
     }
 

-    if ($twit) {
-        my $rate_limit = $twit->rate_limit_status();
-        if ( $rate_limit and $rate_limit->{remaining_hits} < 1 ) {
-            &notice(
-                "Rate limit exceeded, try again after $rate_limit->{reset_time}"
-            );
-            $twit = undef;
-            return;
-        }
+    my $rate_limit = $twit->rate_limit_status();
+    if ( $rate_limit and $rate_limit->{remaining_hits} < 1 ) {
+        &notice(
+            "Rate limit exceeded, try again after $rate_limit->{reset_time}");
+        $twit = undef;
+        return;
+    }

 
 

-        $twits{$user} = $twit;
-        Irssi::timeout_remove($poll) if $poll;
-        $poll = Irssi::timeout_add( &get_poll_time * 1000, \&get_updates, "" );
-        &notice("Logged in as $user, loading friends list...");
-        &load_friends();
-        &notice( "loaded friends: ", scalar keys %friends );
-        if ( Irssi::settings_get_bool("twirssi_first_run") ) {
-            Irssi::settings_set_bool( "twirssi_first_run", 0 );
-            unless ( exists $friends{twirssi} ) {
-                &notice("Welcome to twirssi!"
-                      . "  Perhaps you should add \@twirssi to your friends list,"
-                      . " so you can be notified when a new version is release?"
-                      . "  Just type /twitter_friend twirssi." );
-            }
+    print "saving object for $user\@$service" if &debug;
+    $twits{"$user\@$service"} = $twit;
+    Irssi::timeout_remove($poll) if $poll;
+    $poll = Irssi::timeout_add( &get_poll_time * 1000, \&get_updates, "" );
+    &notice("Logged in as $user\@$service, loading friends list...");
+    &load_friends();
+    &notice( "loaded friends: ". scalar keys %friends );
+    if ( Irssi::settings_get_bool("twirssi_first_run") ) {
+        Irssi::settings_set_bool( "twirssi_first_run", 0 );
+    }
+    %nicks = %friends;
+    $nicks{$user} = 0;
+    return 1;
+}
+
+sub cmd_add_follow {
+    my ( $data, $server, $win ) = @_;
+
+    unless ($data) {
+        &notice("Usage: /twitter_add_follow_extra <username>");
+        return;
+    }
+
+    $data =~ s/^\s+|\s+$//;
+    $data =~ s/^\@//;
+    $data = lc $data;
+
+    if ( exists $id_map{__fixreplies}{"$user\@$defservice"}{$data} ) {
+        &notice("Already following all replies by \@$data");
+        return;
+    }
+
+    $id_map{__fixreplies}{"$user\@$defservice"}{$data} = 1;
+    &notice("Will now follow all replies by \@$data");
+}
+
+sub cmd_del_follow {
+    my ( $data, $server, $win ) = @_;
+
+    unless ($data) {
+        &notice("Usage: /twitter_del_follow_extra <username>");
+        return;
+    }
+
+    $data =~ s/^\s+|\s+$//;
+    $data =~ s/^\@//;
+    $data = lc $data;
+
+    unless ( exists $id_map{__fixreplies}{"$user\@$defservice"}{$data} ) {
+        &notice("Wasn't following all replies by \@$data");
+        return;
+    }
+
+    delete $id_map{__fixreplies}{"$user\@$defservice"}{$data};
+    &notice("Will no longer follow all replies by \@$data");
+}
+
+sub cmd_list_follow {
+    my ( $data, $server, $win ) = @_;
+
+    my $found = 0;
+    foreach my $suser ( sort keys %{ $id_map{__fixreplies} } ) {
+        my $frusers;
+        foreach my $fruser ( sort keys %{ $id_map{__fixreplies}{$suser} } ) {
+            $frusers = $frusers ? "$frusers, $fruser" : $fruser;

         }
         }

-        %nicks = %friends;
-        $nicks{$user} = 0;
-        return 1;
-    } else {
-        &notice("Login failed");
+        if ($frusers) {
+            $found = 1;
+            &notice("Following all replies as \@$suser: $frusers");
+        }
+    }
+
+    unless ($found) {
+        &notice("Not following all replies by anyone");

     }
 }
 
     }
 }
 


@@ -439,12 +714,12 @@ sub cmd_add_search {
         return;
     }
 
         return;
     }
 

-    if ( exists $id_map{__searches}{$user}{$data} ) {
+    if ( exists $id_map{__searches}{"$user\@$defservice"}{$data} ) {

         &notice("Already had a subscription for '$data'");
         return;
     }
 
         &notice("Already had a subscription for '$data'");
         return;
     }
 

-    $id_map{__searches}{$user}{$data} = 1;
+    $id_map{__searches}{"$user\@$defservice"}{$data} = 1;

     &notice("Added subscription for '$data'");
 }
 
     &notice("Added subscription for '$data'");
 }
 


@@ -464,12 +739,12 @@ sub cmd_del_search {
         return;
     }
 
         return;
     }
 

-    unless ( exists $id_map{__searches}{$user}{$data} ) {
+    unless ( exists $id_map{__searches}{"$user\@$defservice"}{$data} ) {

         &notice("No subscription found for '$data'");
         return;
     }
 
         &notice("No subscription found for '$data'");
         return;
     }
 

-    delete $id_map{__searches}{$user}{$data};
+    delete $id_map{__searches}{"$user\@$defservice"}{$data};

     &notice("Removed subscription for '$data'");
 }
 
     &notice("Removed subscription for '$data'");
 }
 


@@ -498,9 +773,8 @@ sub cmd_upgrade {
 
     my $loc = Irssi::settings_get_str("twirssi_location");
     unless ( -w $loc ) {
 
     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;
     }
 
         return;
     }
 


@@ -509,9 +783,8 @@ sub cmd_upgrade {
         eval { use Digest::MD5; };
 
         if ($@) {
         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;
         }
 
             return;
         }
 


@@ -524,8 +797,8 @@ sub cmd_upgrade {
         }
 
         unless ( open( CUR, $loc ) ) {
         }
 
         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;
         }
             );
             return;
         }


@@ -546,10 +819,17 @@ sub cmd_upgrade {
     &notice("Downloading twirssi from $URL");
     LWP::Simple::getstore( $URL, "$loc.upgrade" );
 
     &notice("Downloading twirssi from $URL");
     LWP::Simple::getstore( $URL, "$loc.upgrade" );
 

+    unless ( -s "$loc.upgrade" ) {
+        &notice("Failed to save $loc.upgrade."
+              . "  Check that /set twirssi_location is set to the correct location."
+        );
+        return;
+    }
+

     unless ( $data or Irssi::settings_get_bool("twirssi_upgrade_beta") ) {
         unless ( open( NEW, "$loc.upgrade" ) ) {
     unless ( $data or Irssi::settings_get_bool("twirssi_upgrade_beta") ) {
         unless ( open( NEW, "$loc.upgrade" ) ) {

-            &notice(
-"Failed to read $loc.upgrade.  Check that /set twirssi_location is set to the correct location."
+            &notice("Failed to read $loc.upgrade."
+                  . "  Check that /set twirssi_location is set to the correct location."

             );
             return;
         }
             );
             return;
         }


@@ -583,24 +863,33 @@ sub cmd_upgrade {
 }
 
 sub load_friends {
 }
 
 sub load_friends {

-    my $fh   = shift;
-    my $page = 1;
+    my $fh     = shift;
+    my $cursor = -1;
+    my $page   = 1;

     my %new_friends;
     eval {
     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 );
         {
             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++;
             $new_friends{ $_->{screen_name} } = time foreach @$friends;
             $page++;

-            last if @$friends == 0 or $page == 10;

         }
     };
 
     if ($@) {
         }
     };
 
     if ($@) {

-        print $fh "type:debug Error during friends list update.  Aborted.\n";
+        print $fh "type:debug Error during friends list update.  Aborted.\n"
+          if $fh;

         return;
     }
 
         return;
     }
 


@@ -639,12 +928,13 @@ sub get_updates {
 
     my ( $fh, $filename ) = File::Temp::tempfile();
     binmode( $fh, ":utf8" );
 
     my ( $fh, $filename ) = File::Temp::tempfile();
     binmode( $fh, ":utf8" );

-    my $pid = fork();
+    $child_pid = fork();

 
 

-    if ($pid) {    # parent
-        Irssi::timeout_add_once( 5000, 'monitor_child', [ $filename, 0 ] );
-        Irssi::pidwait_add($pid);
-    } elsif ( defined $pid ) {    # child
+    if ($child_pid) {    # parent
+        Irssi::timeout_add_once( 5000, 'monitor_child',
+            [ "$filename.done", 0 ] );
+        Irssi::pidwait_add($child_pid);
+    } elsif ( defined $child_pid ) {    # child

         close STDIN;
         close STDOUT;
         close STDERR;
         close STDIN;
         close STDOUT;
         close STDERR;


@@ -652,73 +942,107 @@ sub get_updates {
         my $new_poll = time;
 
         my $error = 0;
         my $new_poll = time;
 
         my $error = 0;

-        $error += &do_updates( $fh, $user, $twit );
+        my %context_cache;

         foreach ( keys %twits ) {
         foreach ( keys %twits ) {

-            next if $_ eq $user;
-            $error += &do_updates( $fh, $_, $twits{$_} );
-        }
+            $error++ unless &do_updates( $fh, $_, $twits{$_}, \%context_cache );

 
 

-        my ( $added, $removed ) = &load_friends($fh);
-        if ( $added + $removed ) {
-            print $fh "type:debug %R***%n Friends list updated: ",
-              join( ", ",
-                sprintf( "%d added",   $added ),
-                sprintf( "%d removed", $removed ) ),
-              "\n";
+            if ( $id_map{__fixreplies}{$_} ) {
+                my @frusers = sort keys %{ $id_map{__fixreplies}{$_} };
+
+                $error++
+                  unless &get_timeline( $fh, $frusers[ $fix_replies_index{$_} ],
+                    $_, $twits{$_}, \%context_cache );
+
+                $fix_replies_index{$_}++;
+                $fix_replies_index{$_} = 0
+                  if $fix_replies_index{$_} >= @frusers;
+                print $fh "id:$fix_replies_index{$_} ",
+                  "account:$_ type:fix_replies_index\n";
+            }

         }
         }

+

         print $fh "__friends__\n";
         print $fh "__friends__\n";

+        if (
+            time - $last_friends_poll >
+            Irssi::settings_get_int('twitter_friends_poll') )
+        {
+            print $fh "__updated ", time, "\n";
+            my ( $added, $removed ) = &load_friends($fh);
+            if ( $added + $removed ) {
+                print $fh "type:debug %R***%n Friends list updated: ",
+                  join( ", ",
+                    sprintf( "%d added",   $added ),
+                    sprintf( "%d removed", $removed ) ),
+                  "\n";
+            }
+        }
+

         foreach ( sort keys %friends ) {
             print $fh "$_ $friends{$_}\n";
         }
 
         if ($error) {
             print $fh "type:debug Update encountered errors.  Aborted\n";
         foreach ( sort keys %friends ) {
             print $fh "$_ $friends{$_}\n";
         }
 
         if ($error) {
             print $fh "type:debug Update encountered errors.  Aborted\n";

-            print $fh $last_poll;
+            print $fh "-- $last_poll";

         } else {
         } else {

-            print $fh $new_poll;
+            print $fh "-- $new_poll";

         }
         close $fh;
         }
         close $fh;

+        rename $filename, "$filename.done";

         exit;
         exit;

+    } else {
+        &ccrap("Failed to fork for updating: $!");

     }
     print scalar localtime, " - get_updates ends" if &debug;
 }
 
 sub do_updates {
     }
     print scalar localtime, " - get_updates ends" if &debug;
 }
 
 sub do_updates {

-    my ( $fh, $username, $obj ) = @_;
+    my ( $fh, $username, $obj, $cache ) = @_;

 
 

-    my $rate_limit = $obj->rate_limit_status();
-    if ( $rate_limit and $rate_limit->{remaining_hits} < 1 ) {
-        &notice("Rate limit exceeded for $username");
-        return 1;
-    }
+    eval {
+        my $rate_limit = $obj->rate_limit_status();
+        if ( $rate_limit and $rate_limit->{remaining_hits} < 1 ) {
+            &notice("Rate limit exceeded for $username");
+            return undef;
+        }
+    };

 
     print scalar localtime, " - Polling for updates for $username" if &debug;
     my $tweets;
 
     print scalar localtime, " - Polling for updates for $username" if &debug;
     my $tweets;

-    eval { $tweets = $obj->friends_timeline(); };
+    my $new_poll_id = 0;
+    eval {
+        if ( $id_map{__last_id}{$username}{timeline} )
+        {
+            $tweets = $obj->home_timeline( { count => 100 } );
+        } else {
+            $tweets = $obj->home_timeline();
+        }
+    };

 
     if ($@) {
 
     if ($@) {

-        print $fh
-          "type:debug Error during friends_timeline call: $@.  Aborted.\n";
-        return 1;
+        print $fh "type:debug Error during home_timeline call: Aborted.\n";
+        print $fh "type:debug : $_\n" foreach split /\n/, Dumper($@);
+        return undef;

     }
 
     unless ( ref $tweets ) {
         if ( $obj->can("get_error") ) {
     }
 
     unless ( ref $tweets ) {
         if ( $obj->can("get_error") ) {

-            my $error;
+            my $error = "Unknown error";

             eval { $error = JSON::Any->jsonToObj( $obj->get_error() ) };
             eval { $error = JSON::Any->jsonToObj( $obj->get_error() ) };

-            if ($@) { $error = $obj->get_error() }
-            print $fh "type:debug API Error during friends_timeline call: ",
-              "$error  Aborted.\n";
+            unless ($@) { $error = $obj->get_error() }
+            print $fh
+              "type:debug API Error during home_timeline call: Aborted\n";
+            print $fh "type:debug : $_\n" foreach split /\n/, Dumper($error);
+

         } else {
             print $fh
         } else {
             print $fh

-              "type:debug API Error during friends_timeline call. Aborted.\n";
+              "type:debug API Error during home_timeline call. Aborted.\n";

         }
         }

-        return 1;
+        return undef;

     }
 
     foreach my $t ( reverse @$tweets ) {
     }
 
     foreach my $t ( reverse @$tweets ) {

-        my $text = decode_entities( $t->{text} );
-        $text = &hilight($text);
+        my $text = &get_text( $t, $obj );

         my $reply = "tweet";
         if (    Irssi::settings_get_bool("show_reply_context")
             and $t->{in_reply_to_screen_name} ne $username
         my $reply = "tweet";
         if (    Irssi::settings_get_bool("show_reply_context")
             and $t->{in_reply_to_screen_name} ne $username


@@ -727,89 +1051,90 @@ sub do_updates {
         {
             $nicks{ $t->{in_reply_to_screen_name} } = time;
             my $context;
         {
             $nicks{ $t->{in_reply_to_screen_name} } = time;
             my $context;

-            eval {
-                $context = $obj->show_status( $t->{in_reply_to_status_id} );
-            };
+            unless ( $cache->{ $t->{in_reply_to_status_id} } ) {
+                eval {
+                    $cache->{ $t->{in_reply_to_status_id} } =
+                      $obj->show_status( $t->{in_reply_to_status_id} );
+                };
+
+            }
+            $context = $cache->{ $t->{in_reply_to_status_id} };

 
             if ($context) {
 
             if ($context) {

-                my $ctext = decode_entities( $context->{text} );
-                $ctext = &hilight($ctext);
-                printf $fh "id:%d account:%s nick:%s type:tweet %s\n",
+                my $ctext = &get_text( $context, $obj );
+                printf $fh "id:%s account:%s nick:%s type:tweet %s\n",

                   $context->{id}, $username,
                   $context->{user}{screen_name}, $ctext;
                   $context->{id}, $username,
                   $context->{user}{screen_name}, $ctext;

-                if ($context->{truncated}) {
-                    printf $fh "id:%s account:%s nick:%s type:ellispis %s\n",
-                      $context->{id}."-url", $username,
-                      $context->{user}{screen_name}, 
-                      "http://twitter.com/$context->{user}{screen_name}/status/$context->{id}";
-                }

                 $reply = "reply";
                 $reply = "reply";

-            } elsif ($@) {
-                print $fh "type:debug request to get context failed: $@";
-            } else {
-                print $fh
-"type:debug Failed to get context from $t->{in_reply_to_screen_name}\n"
-                  if &debug;

             }
         }
         next
           if $t->{user}{screen_name} eq $username
               and not Irssi::settings_get_bool("show_own_tweets");
             }
         }
         next
           if $t->{user}{screen_name} eq $username
               and not Irssi::settings_get_bool("show_own_tweets");

-        printf $fh "id:%d account:%s nick:%s type:%s %s\n",
+        printf $fh "id:%s account:%s nick:%s type:%s %s\n",

           $t->{id}, $username, $t->{user}{screen_name}, $reply, $text;
           $t->{id}, $username, $t->{user}{screen_name}, $reply, $text;

-        if ($t->{truncated}) {
-            printf $fh "id:%s account:%s nick:%s type:ellispis %s\n",
-              $t->{id}."-url", $username,
-              $t->{user}{screen_name}, 
-              "http://twitter.com/$t->{user}{screen_name}/status/$t->{id}";
-        }
+        $new_poll_id = $t->{id} if $new_poll_id < $t->{id};

     }
     }

+    printf $fh "id:%s account:%s type:last_id timeline\n",
+      $new_poll_id, $username;

 
 

-    print scalar localtime, " - Polling for replies" if &debug;
+    print scalar localtime, " - Polling for replies since ",
+      $id_map{__last_id}{$username}{reply}
+      if &debug;
+    $new_poll_id = 0;

     eval {
     eval {

-        $tweets = $obj->replies( { since => HTTP::Date::time2str($last_poll) } )
-          || [];
+        if ( $id_map{__last_id}{$username}{reply} )
+        {
+            $tweets = $obj->replies(
+                { since_id => $id_map{__last_id}{$username}{reply} } )
+              || [];
+        } else {
+            $tweets = $obj->replies() || [];
+        }

     };
 
     if ($@) {
         print $fh "type:debug Error during replies call.  Aborted.\n";
     };
 
     if ($@) {
         print $fh "type:debug Error during replies call.  Aborted.\n";

-        return 1;
+        return undef;

     }
 
     foreach my $t ( reverse @$tweets ) {
         next
           if exists $friends{ $t->{user}{screen_name} };
 
     }
 
     foreach my $t ( reverse @$tweets ) {
         next
           if exists $friends{ $t->{user}{screen_name} };
 

-        my $text = decode_entities( $t->{text} );
-        $text = &hilight($text);
-        printf $fh "id:%d account:%s nick:%s type:tweet %s\n",
+        my $text = &get_text( $t, $obj );
+        printf $fh "id:%s account:%s nick:%s type:tweet %s\n",

           $t->{id}, $username, $t->{user}{screen_name}, $text;
           $t->{id}, $username, $t->{user}{screen_name}, $text;

-        if ($t->{truncated}) {
-            printf $fh "id:%s account:%s nick:%s type:ellispis %s\n",
-              $t->{id}."-url", $username,
-              $t->{user}{screen_name}, 
-              "http://twitter.com/$t->{user}{screen_name}/status/$t->{id}";
-        }
+        $new_poll_id = $t->{id} if $new_poll_id < $t->{id};

     }
     }

+    printf $fh "id:%s account:%s type:last_id reply\n", $new_poll_id, $username;

 
     print scalar localtime, " - Polling for DMs" if &debug;
 
     print scalar localtime, " - Polling for DMs" if &debug;

+    $new_poll_id = 0;

     eval {
     eval {

-        $tweets =
-          $obj->direct_messages( { since => HTTP::Date::time2str($last_poll) } )
-          || [];
+        if ( $id_map{__last_id}{$username}{dm} )
+        {
+            $tweets = $obj->direct_messages(
+                { since_id => $id_map{__last_id}{$username}{dm} } )
+              || [];
+        } else {
+            $tweets = $obj->direct_messages() || [];
+        }

     };
 
     if ($@) {
         print $fh "type:debug Error during direct_messages call.  Aborted.\n";
     };
 
     if ($@) {
         print $fh "type:debug Error during direct_messages call.  Aborted.\n";

-        return 1;
+        return undef;

     }
 
     foreach my $t ( reverse @$tweets ) {
         my $text = decode_entities( $t->{text} );
     }
 
     foreach my $t ( reverse @$tweets ) {
         my $text = decode_entities( $t->{text} );

-        $text = &hilight($text);
-        printf $fh "id:%d account:%s nick:%s type:dm %s\n",
+        $text =~ s/[\n\r]/ /g;
+        printf $fh "id:%s account:%s nick:%s type:dm %s\n",

           $t->{id}, $username, $t->{sender_screen_name}, $text;
           $t->{id}, $username, $t->{sender_screen_name}, $text;

+        $new_poll_id = $t->{id} if $new_poll_id < $t->{id};

     }
     }

+    printf $fh "id:%s account:%s type:last_id dm\n", $new_poll_id, $username;

 
     print scalar localtime, " - Polling for subscriptions" if &debug;
     if ( $obj->can('search') and $id_map{__searches}{$username} ) {
 
     print scalar localtime, " - Polling for subscriptions" if &debug;
     if ( $obj->can('search') and $id_map{__searches}{$username} ) {


@@ -829,32 +1154,100 @@ sub do_updates {
             if ($@) {
                 print $fh
                   "type:debug Error during search($topic) call.  Aborted.\n";
             if ($@) {
                 print $fh
                   "type:debug Error during search($topic) call.  Aborted.\n";

-                return 1;
+                return undef;

             }
 
             unless ( $search->{max_id} ) {
             }
 
             unless ( $search->{max_id} ) {

-                print $fh
-"type:debug Invalid search results when searching for $topic.",
-                  "  Aborted.\n";
-                return 1;
+                print $fh "type:debug Invalid search results when searching",
+                  " for $topic. Aborted.\n";
+                return undef;

             }
 
             $id_map{__searches}{$username}{$topic} = $search->{max_id};
             }
 
             $id_map{__searches}{$username}{$topic} = $search->{max_id};

-            printf $fh "id:%d account:%s type:searchid topic:%s\n",
+            printf $fh "id:%s account:%s type:searchid topic:%s\n",

               $search->{max_id}, $username, $topic;
 
             foreach my $t ( reverse @{ $search->{results} } ) {
               $search->{max_id}, $username, $topic;
 
             foreach my $t ( reverse @{ $search->{results} } ) {

-                my $text = decode_entities( $t->{text} );
-                $text = &hilight($text);
-                printf $fh "id:%d account:%s nick:%s type:search topic:%s %s\n",
+                my $text = &get_text( $t, $obj );
+                printf $fh "id:%s account:%s nick:%s type:search topic:%s %s\n",

                   $t->{id}, $username, $t->{from_user}, $topic, $text;
                   $t->{id}, $username, $t->{from_user}, $topic, $text;

+                $new_poll_id = $t->{id}
+                  if not $new_poll_id
+                      or $t->{id} < $new_poll_id;

             }
         }
     }
 
     print scalar localtime, " - Done" if &debug;
 
             }
         }
     }
 
     print scalar localtime, " - Done" if &debug;
 

-    return 0;
+    return 1;
+}
+
+sub get_timeline {
+    my ( $fh, $target, $username, $obj, $cache ) = @_;
+    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";
+    eval {
+        $tweets = $obj->user_timeline(
+            {
+                id => $target,
+                ( $last_id ? ( since_id => $last_id ) : () ),
+            }
+        );
+    };
+
+    if ($@) {
+        print $fh
+          "type:debug Error during user_timeline($target) call: Aborted.\n";
+        print $fh "type:debug : $_\n" foreach split /\n/, Dumper($@);
+        return undef;
+    }
+
+    unless ($tweets) {
+        print $fh
+          "type:debug user_timeline($target) call returned undef!  Aborted\n";
+        return 1;
+    }
+
+    foreach my $t ( reverse @$tweets ) {
+        my $text = &get_text( $t, $obj );
+        my $reply = "tweet";
+        if (    Irssi::settings_get_bool("show_reply_context")
+            and $t->{in_reply_to_screen_name} ne $username
+            and $t->{in_reply_to_screen_name}
+            and not exists $friends{ $t->{in_reply_to_screen_name} } )
+        {
+            $nicks{ $t->{in_reply_to_screen_name} } = time;
+            my $context;
+            unless ( $cache->{ $t->{in_reply_to_status_id} } ) {
+                eval {
+                    $cache->{ $t->{in_reply_to_status_id} } =
+                      $obj->show_status( $t->{in_reply_to_status_id} );
+                };
+
+            }
+            $context = $cache->{ $t->{in_reply_to_status_id} };
+
+            if ($context) {
+                my $ctext = &get_text( $context, $obj );
+                printf $fh "id:%s account:%s nick:%s type:tweet %s\n",
+                  $context->{id}, $username,
+                  $context->{user}{screen_name}, $ctext;
+                $reply = "reply";
+            }
+        }
+        printf $fh "id:%s account:%s nick:%s type:%s %s\n",
+          $t->{id}, $username, $t->{user}{screen_name}, $reply, $text;
+        $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;
+
+    return 1;

 }
 
 sub monitor_child {
 }
 
 sub monitor_child {


@@ -864,28 +1257,42 @@ sub monitor_child {
 
     print scalar localtime, " - checking child log at $filename ($attempt)"
       if &debug;
 
     print scalar localtime, " - checking child log at $filename ($attempt)"
       if &debug;

-    my $new_last_poll;
+    my ($new_last_poll);
+
+    # reap any random leftover processes - work around a bug in irssi on gentoo
+    waitpid( -1, WNOHANG );

 
     # first time we run we don't want to print out *everything*, so we just
     # pretend
 
     # first time we run we don't want to print out *everything*, so we just
     # pretend

-    my $suppress = 0;
-    $suppress = 1 unless keys %tweet_cache;

 
     if ( open FILE, $filename ) {
 
     if ( open FILE, $filename ) {

+        binmode FILE, ":utf8";

         my @lines;
         my %new_cache;
         while (<FILE>) {
         my @lines;
         my %new_cache;
         while (<FILE>) {

-            chomp;

             last if /^__friends__/;
             last if /^__friends__/;

+            unless (/\n$/) {    # skip partial lines
+                                # print "Skipping partial line: $_" if &debug;
+                next;
+            }
+            chomp;

             my $hilight = 0;
             my %meta;
             my $hilight = 0;
             my %meta;

+

             foreach my $key (qw/id account nick type topic/) {
                 if (s/^$key:(\S+)\s*//) {
                     $meta{$key} = $1;
                 }
             }
 
             foreach my $key (qw/id account nick type topic/) {
                 if (s/^$key:(\S+)\s*//) {
                     $meta{$key} = $1;
                 }
             }
 

-            if ( not $meta{type} or $meta{type} ne 'searchid' ) {
+            if ( $meta{type} and $meta{type} eq 'fix_replies_index' ) {
+                $fix_replies_index{ $meta{account} } = $meta{id};
+                print "fix_replies_index for $meta{account} set to $meta{id}"
+                  if &debug;
+                next;
+            }
+
+            if ( not $meta{type} or $meta{type} !~ /searchid|last_id/ ) {

                 if ( exists $meta{id} and exists $new_cache{ $meta{id} } ) {
                     next;
                 }
                 if ( exists $meta{id} and exists $new_cache{ $meta{id} } ) {
                     next;
                 }


@@ -898,8 +1305,17 @@ sub monitor_child {
             }
 
             my $account = "";
             }
 
             my $account = "";

-            if ( $meta{account} ne $user ) {
-                $account = "$meta{account}: ";
+            $meta{account} =~ s/\@(\w+)$//;
+            $meta{service} = $1;
+            if (
+                lc $meta{service} eq
+                lc Irssi::settings_get_str("twirssi_default_service") )
+            {
+                $account = "$meta{account}: "
+                  if lc "$meta{account}\@$meta{service}" ne lc
+                      "$user\@$defservice";
+            } else {
+                $account = "$meta{account}\@$meta{service}: ";

             }
 
             my $marker = "";
             }
 
             my $marker = "";


@@ -909,15 +1325,17 @@ sub monitor_child {
                 and $meta{id} )
             {
                 $marker = ( $id_map{__indexes}{ $meta{nick} } + 1 ) % 100;
                 and $meta{id} )
             {
                 $marker = ( $id_map{__indexes}{ $meta{nick} } + 1 ) % 100;

-                $id_map{ lc $meta{nick} }[$marker] = $meta{id};
-                $id_map{__indexes}{ $meta{nick} }  = $marker;
-                $marker                            = ":$marker";
+                $id_map{ lc $meta{nick} }[$marker]           = $meta{id};
+                $id_map{__indexes}{ $meta{nick} }            = $marker;
+                $id_map{__tweets}{ lc $meta{nick} }[$marker] = $_;
+                $marker                                      = ":$marker";

             }
 
             my $hilight_color =
               $irssi_to_mirc_colors{ Irssi::settings_get_str("hilight_color") };
             }
 
             my $hilight_color =
               $irssi_to_mirc_colors{ Irssi::settings_get_str("hilight_color") };

-            if ( ( $_ =~ /\@$meta{account}\W/i )
-                && Irssi::settings_get_bool("twirssi_hilights") )
+            my $nick = "\@$meta{account}";
+            if ( $_ =~ /\Q$nick\E(?:\W|$)/i
+                and Irssi::settings_get_bool("twirssi_hilights") )

             {
                 $meta{nick} = "\cC$hilight_color$meta{nick}\cO";
                 $hilight = MSGLEVEL_HILIGHT;
             {
                 $meta{nick} = "\cC$hilight_color$meta{nick}\cO";
                 $hilight = MSGLEVEL_HILIGHT;


@@ -929,12 +1347,6 @@ sub monitor_child {
                     ( MSGLEVEL_PUBLIC | $hilight ),
                     $meta{type}, $account, $meta{nick}, $marker, $_
                   ];
                     ( MSGLEVEL_PUBLIC | $hilight ),
                     $meta{type}, $account, $meta{nick}, $marker, $_
                   ];

-            } elsif ( $meta{type} eq 'ellispis' ) {
-                push @lines,
-                  [
-                    MSGLEVEL_PUBLIC,
-                    "tweet", $account, $meta{nick}, "", $_
-                  ];

             } elsif ( $meta{type} eq 'search' ) {
                 push @lines,
                   [
             } elsif ( $meta{type} eq 'search' ) {
                 push @lines,
                   [


@@ -959,8 +1371,9 @@ sub monitor_child {
             } elsif ( $meta{type} eq 'searchid' ) {
                 print "Search '$meta{topic}' returned id $meta{id}" if &debug;
                 if (
             } elsif ( $meta{type} eq 'searchid' ) {
                 print "Search '$meta{topic}' returned id $meta{id}" if &debug;
                 if (

+                    not

                     exists $id_map{__searches}{ $meta{account} }{ $meta{topic} }
                     exists $id_map{__searches}{ $meta{account} }{ $meta{topic} }

-                    and $meta{id} >=
+                    or $meta{id} >=

                     $id_map{__searches}{ $meta{account} }{ $meta{topic} } )
                 {
                     $id_map{__searches}{ $meta{account} }{ $meta{topic} } =
                     $id_map{__searches}{ $meta{account} }{ $meta{topic} } )
                 {
                     $id_map{__searches}{ $meta{account} }{ $meta{topic} } =


@@ -968,6 +1381,16 @@ sub monitor_child {
                 } elsif (&debug) {
                     print "Search '$meta{topic}' returned invalid id $meta{id}";
                 }
                 } elsif (&debug) {
                     print "Search '$meta{topic}' returned invalid id $meta{id}";
                 }

+            } elsif ( $meta{type} eq 'last_id' ) {
+                $id_map{__last_id}{"$meta{account}\@$meta{service}"}{$_} =
+                  $meta{id}
+                  if $id_map{__last_id}{"$meta{account}\@$meta{service}"}{$_} <
+                      $meta{id};
+            } elsif ( $meta{type} eq 'last_id_fixreplies' ) {
+                $id_map{__last_id}{"$meta{account}\@$meta{service}"}{$_} =
+                  $meta{id}
+                  if $id_map{__last_id}{"$meta{account}\@$meta{service}"}{$_} <
+                      $meta{id};

             } elsif ( $meta{type} eq 'error' ) {
                 push @lines, [ MSGLEVEL_MSGS, $_ ];
             } elsif ( $meta{type} eq 'debug' ) {
             } elsif ( $meta{type} eq 'error' ) {
                 push @lines, [ MSGLEVEL_MSGS, $_ ];
             } elsif ( $meta{type} eq 'debug' ) {


@@ -979,24 +1402,40 @@ sub monitor_child {
 
         %friends = ();
         while (<FILE>) {
 
         %friends = ();
         while (<FILE>) {

-            if (/^\d+$/) {
-                $new_last_poll = $_;
-                last;
+            if (/^__updated (\d+)$/) {
+                $last_friends_poll = $1;
+                print "Friend list updated" if &debug;
+                next;
+            }
+
+            if (/^-- (\d+)$/) {
+                $new_last_poll = $1;
+                if ( $new_last_poll >= $last_poll ) {
+                    last;
+                } else {
+                    print "Impossible!  ",
+                      "new_last_poll=$new_last_poll < last_poll=$last_poll!"
+                      if &debug;
+                    undef $new_last_poll;
+                    next;
+                }

             }
             my ( $f, $t ) = split ' ', $_;
             $nicks{$f} = $friends{$f} = $t;
         }
 
         if ($new_last_poll) {
             }
             my ( $f, $t ) = split ' ', $_;
             $nicks{$f} = $friends{$f} = $t;
         }
 
         if ($new_last_poll) {

-            print "new last_poll = $new_last_poll" if &debug;
-            if ($suppress) {
+            print "new last_poll    = $new_last_poll" if &debug;
+            print "new last_poll_id = ", Dumper( $id_map{__last_id} ) if &debug;
+            if ($first_call) {

                 print "First call, not printing updates" if &debug;
             } else {
                 foreach my $line (@lines) {
                     $window->printformat(
                         $line->[0],
                         "twirssi_" . $line->[1],
                 print "First call, not printing updates" if &debug;
             } else {
                 foreach my $line (@lines) {
                     $window->printformat(
                         $line->[0],
                         "twirssi_" . $line->[1],

-                        @$line[ 2 .. $#$line ]
+                        @$line[ 2 .. $#$line - 1 ],
+                        &hilight( $line->[-1] )

                     );
                 }
             }
                     );
                 }
             }


@@ -1017,6 +1456,12 @@ sub monitor_child {
             }
             $last_poll = $new_last_poll;
 
             }
             $last_poll = $new_last_poll;
 

+            # 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 =
             # save id_map hash
             if ( keys %id_map
                 and my $file =


@@ -1029,7 +1474,8 @@ sub monitor_child {
                     &ccrap("Failed to write replies to $file: $!");
                 }
             }
                     &ccrap("Failed to write replies to $file: $!");
                 }
             }

-            $failwhale = 0;
+            $failwhale  = 0;
+            $first_call = 0;

             return;
         }
     }
             return;
         }
     }


@@ -1041,6 +1487,8 @@ sub monitor_child {
             [ $filename, $attempt + 1 ] );
     } else {
         print "Giving up on polling $filename" if &debug;
             [ $filename, $attempt + 1 ] );
     } 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");
         unlink $filename unless &debug;
 
         return unless Irssi::settings_get_bool("twirssi_notify_timeouts");


@@ -1054,7 +1502,7 @@ sub monitor_child {
         }
 
         if ( not $failwhale and time - $last_poll > 60 * 60 ) {
         }
 
         if ( not $failwhale and time - $last_poll > 60 * 60 ) {

-            foreach my $whale (
+            &ccrap(

                 q{     v  v        v},
                 q{     |  |  v     |  v},
                 q{     | .-, |     |  |},
                 q{     v  v        v},
                 q{     |  |  v     |  v},
                 q{     | .-, |     |  |},


@@ -1063,13 +1511,13 @@ sub monitor_child {
                 q{      \\          a    |},
                 q{       ',.__.   ,__.-'/},
                 q{         '--/_.'----'`}
                 q{      \\          a    |},
                 q{       ',.__.   ,__.-'/},
                 q{         '--/_.'----'`}

-              )
-            {
-                &ccrap($whale);
-            }
+              );

             $failwhale = 1;
         }
             $failwhale = 1;
         }

-        &ccrap("Haven't been able to get updated tweets since $since");
+
+        if ( time - $last_poll < 600 ) {
+            &ccrap("Haven't been able to get updated tweets since $since");
+        }

     }
 }
 
     }
 }
 


@@ -1078,11 +1526,15 @@ sub debug {
 }
 
 sub notice {
 }
 
 sub notice {

-    $window->print( "%R***%n @_", MSGLEVEL_PUBLIC );
+    foreach my $msg (@_) {
+        $window->print( "%R***%n $msg", MSGLEVEL_PUBLIC );
+    }

 }
 
 sub ccrap {
 }
 
 sub ccrap {

-    $window->print( "%R***%n @_", MSGLEVEL_CLIENTCRAP );
+    foreach my $msg (@_) {
+        $window->print( "%R***%n $msg", MSGLEVEL_CLIENTCRAP );
+    }

 }
 
 sub update_away {
 }
 
 sub update_away {


@@ -1123,12 +1575,14 @@ sub too_long {
 sub valid_username {
     my $username = shift;
 
 sub valid_username {
     my $username = shift;
 

+    $username = &normalize_username($username);
+

     unless ( exists $twits{$username} ) {
         &notice("Unknown username $username");
     unless ( exists $twits{$username} ) {
         &notice("Unknown username $username");

-        return 0;
+        return undef;

     }
 
     }
 

-    return 1;
+    return $username;

 }
 
 sub logged_in {
 }
 
 sub logged_in {


@@ -1145,18 +1599,27 @@ sub sig_complete {
     my ( $complist, $window, $word, $linestart, $want_space ) = @_;
 
     if (
     my ( $complist, $window, $word, $linestart, $want_space ) = @_;
 
     if (

-        $linestart =~ /^\/twitter_reply(?:_as)?\s*$/
+        $linestart =~ /^\/(?:retweet|twitter_reply)(?:_as)?\s*$/

         or ( Irssi::settings_get_bool("twirssi_use_reply_aliases")
             and $linestart =~ /^\/reply(?:_as)?\s*$/ )
       )
     {    # /twitter_reply gets a nick:num
         $word =~ s/^@//;
         or ( Irssi::settings_get_bool("twirssi_use_reply_aliases")
             and $linestart =~ /^\/reply(?:_as)?\s*$/ )
       )
     {    # /twitter_reply gets a nick:num
         $word =~ s/^@//;

-        @$complist = map { "$_:$id_map{__indexes}{$_}" } 
-          sort {$nicks{$b} <=> $nicks{$a}}
+        @$complist = map { "$_:$id_map{__indexes}{$_}" }
+          sort { $nicks{$b} <=> $nicks{$a} }

           grep /^\Q$word/i,
           keys %{ $id_map{__indexes} };
     }
 
           grep /^\Q$word/i,
           keys %{ $id_map{__indexes} };
     }
 

+    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,
+          sort { $nicks{$b} <=> $nicks{$a} } keys %nicks;
+    }
+

     # /tweet, /tweet_as, /dm, /dm_as - complete @nicks (and nicks as the first
     # arg to dm)
     if ( $linestart =~ /^\/(?:tweet|dm)/ ) {
     # /tweet, /tweet_as, /dm, /dm_as - complete @nicks (and nicks as the first
     # arg to dm)
     if ( $linestart =~ /^\/(?:tweet|dm)/ ) {


@@ -1193,18 +1656,105 @@ sub hilight {
     if ( Irssi::settings_get_str("twirssi_nick_color") ) {
         my $c = Irssi::settings_get_str("twirssi_nick_color");
         $c = $irssi_to_mirc_colors{$c};
     if ( Irssi::settings_get_str("twirssi_nick_color") ) {
         my $c = Irssi::settings_get_str("twirssi_nick_color");
         $c = $irssi_to_mirc_colors{$c};

-        $text =~ s/(^|\W)\@([-\w]+)/$1\cC$c\@$2\cO/g if $c;
+        $text =~ s/(^|\W)\@(\w+)/$1\cC$c\@$2\cO/g if $c;

     }
     if ( Irssi::settings_get_str("twirssi_topic_color") ) {
         my $c = Irssi::settings_get_str("twirssi_topic_color");
         $c = $irssi_to_mirc_colors{$c};
     }
     if ( Irssi::settings_get_str("twirssi_topic_color") ) {
         my $c = Irssi::settings_get_str("twirssi_topic_color");
         $c = $irssi_to_mirc_colors{$c};

-        $text =~ s/(^|\W)\#([-\w]+)/$1\cC$c\#$2\cO/g if $c;
+        $text =~ s/(^|\W)(\#|\!)([-\w]+)/$1\cC$c$2$3\cO/g if $c;

     }
     $text =~ s/[\n\r]/ /g;
 
     return $text;
 }
 
     }
     $text =~ s/[\n\r]/ /g;
 
     return $text;
 }
 

+sub shorten {
+    my $data = shift;
+
+    my $provider = Irssi::settings_get_str("short_url_provider");
+    if (
+        (
+            Irssi::settings_get_bool("twirssi_always_shorten")
+            or &too_long( $data, 1 )
+        )
+        and $provider
+      )
+    {
+        my @args;
+        if ( $provider eq 'Bitly' ) {
+            @args[ 1, 2 ] = split ',',
+              Irssi::settings_get_str("short_url_args"), 2;
+            unless ( @args == 3 ) {
+                &ccrap(
+                    "WWW::Shorten::Bitly requires a username and API key.",
+                    "Set short_url_args to username,API_key or change your",
+                    "short_url_provider."
+                );
+                return decode "utf8", $data;
+            }
+        }
+
+        foreach my $url ( $data =~ /(https?:\/\/\S+[\w\/])/g ) {
+            eval {
+                $args[0] = $url;
+                my $short = makeashorterlink(@args);
+                if ($short) {
+                    $data =~ s/\Q$url/$short/g;
+                } else {
+                    &notice("Failed to shorten $url!");
+                }
+            };
+        }
+    }
+
+    return decode "utf8", $data;
+}
+
+sub normalize_username {
+    my $user = shift;
+
+    my ( $username, $service ) = split /\@/, $user, 2;
+    if ($service) {
+        $service = ucfirst lc $service;
+    } else {
+        $service =
+          ucfirst lc Irssi::settings_get_str("twirssi_default_service");
+        unless ( exists $twits{"$username\@$service"} ) {
+            $service = undef;
+            foreach my $t ( sort keys %twits ) {
+                next unless $t =~ /^\Q$username\E\@(Twitter|Identica)/;
+                $service = $1;
+                last;
+            }
+
+            unless ($service) {
+                &notice("Can't find a logged in user '$user'");
+            }
+        }
+    }
+
+    return "$username\@$service";
+}
+
+sub get_text {
+    my $tweet  = shift;
+    my $object = shift;
+    my $text   = decode_entities( $tweet->{text} );
+    if ( $tweet->{truncated} ) {
+        if ( exists $tweet->{retweeted_status} ) {
+            $text = "RT \@$tweet->{retweeted_status}{user}{screen_name}: "
+              . "$tweet->{retweeted_status}{text}";
+        } elsif ( $object->isa('Net::Twitter::Lite') ) {
+            $text .= " -- http://twitter.com/$tweet->{user}{screen_name}"
+              . "/status/$tweet->{id}";
+        }
+    }
+
+    $text =~ s/[\n\r]/ /g;
+
+    return $text;
+}
+

 Irssi::signal_add( "send text", "event_send_text" );
 
 Irssi::theme_register(
 Irssi::signal_add( "send text", "event_send_text" );
 
 Irssi::theme_register(


@@ -1218,17 +1768,27 @@ Irssi::theme_register(
 );
 
 Irssi::settings_add_int( "twirssi", "twitter_poll_interval", 300 );
 );
 
 Irssi::settings_add_int( "twirssi", "twitter_poll_interval", 300 );

-Irssi::settings_add_str( "twirssi", "twitter_window",     "twitter" );
-Irssi::settings_add_str( "twirssi", "bitlbee_server",     "bitlbee" );
-Irssi::settings_add_str( "twirssi", "short_url_provider", "TinyURL" );
+Irssi::settings_add_str( "twirssi", "twitter_window",          "twitter" );
+Irssi::settings_add_str( "twirssi", "bitlbee_server",          "bitlbee" );
+Irssi::settings_add_str( "twirssi", "short_url_provider",      "TinyURL" );
+Irssi::settings_add_str( "twirssi", "short_url_args",          undef );
+Irssi::settings_add_str( "twirssi", "twitter_usernames",       undef );
+Irssi::settings_add_str( "twirssi", "twitter_passwords",       undef );
+Irssi::settings_add_str( "twirssi", "twirssi_default_service", "Twitter" );
+Irssi::settings_add_str( "twirssi", "twirssi_nick_color",      "%B" );
+Irssi::settings_add_str( "twirssi", "twirssi_topic_color",     "%r" );
+Irssi::settings_add_str( "twirssi", "twirssi_retweet_format",
+    'RT $n: "$t" ${-- $c$}' );

 Irssi::settings_add_str( "twirssi", "twirssi_location",
 Irssi::settings_add_str( "twirssi", "twirssi_location",

-    ".irssi/scripts/twirssi.pl" );
-Irssi::settings_add_str( "twirssi", "twitter_usernames", undef );
-Irssi::settings_add_str( "twirssi", "twitter_passwords", undef );
+    Irssi::get_irssi_dir . "/scripts/twirssi.pl" );

 Irssi::settings_add_str( "twirssi", "twirssi_replies_store",
 Irssi::settings_add_str( "twirssi", "twirssi_replies_store",

-    ".irssi/scripts/twirssi.json" );
-Irssi::settings_add_str( "twirssi", "twirssi_nick_color",  "%B" );
-Irssi::settings_add_str( "twirssi", "twirssi_topic_color", "%r" );
+    Irssi::get_irssi_dir . "/scripts/twirssi.json" );
+Irssi::settings_add_str( "twirssi", "twirssi_oauth_store",
+    Irssi::get_irssi_dir . "/scripts/twirssi.oauth" );
+
+Irssi::settings_add_int( "twirssi", "twitter_friends_poll", 600 );
+Irssi::settings_add_int( "twirssi", "twitter_timeout",      30 );
+

 Irssi::settings_add_bool( "twirssi", "twirssi_upgrade_beta",      0 );
 Irssi::settings_add_bool( "twirssi", "tweet_to_away",             0 );
 Irssi::settings_add_bool( "twirssi", "show_reply_context",        0 );
 Irssi::settings_add_bool( "twirssi", "twirssi_upgrade_beta",      0 );
 Irssi::settings_add_bool( "twirssi", "tweet_to_away",             0 );
 Irssi::settings_add_bool( "twirssi", "show_reply_context",        0 );


@@ -1240,7 +1800,10 @@ Irssi::settings_add_bool( "twirssi", "twirssi_replies_autonick",  1 );
 Irssi::settings_add_bool( "twirssi", "twirssi_use_reply_aliases", 0 );
 Irssi::settings_add_bool( "twirssi", "twirssi_notify_timeouts",   1 );
 Irssi::settings_add_bool( "twirssi", "twirssi_hilights",          1 );
 Irssi::settings_add_bool( "twirssi", "twirssi_use_reply_aliases", 0 );
 Irssi::settings_add_bool( "twirssi", "twirssi_notify_timeouts",   1 );
 Irssi::settings_add_bool( "twirssi", "twirssi_hilights",          1 );

+Irssi::settings_add_bool( "twirssi", "twirssi_always_shorten",    0 );

 Irssi::settings_add_bool( "twirssi", "tweet_window_input",        0 );
 Irssi::settings_add_bool( "twirssi", "tweet_window_input",        0 );

+Irssi::settings_add_bool( "twirssi", "twirssi_avoid_ssl",         0 );
+Irssi::settings_add_bool( "twirssi", "twirssi_use_oauth",         1 );

 
 $last_poll = time - &get_poll_time;
 $window = Irssi::window_find_name( Irssi::settings_get_str('twitter_window') );
 
 $last_poll = time - &get_poll_time;
 $window = Irssi::window_find_name( Irssi::settings_get_str('twitter_window') );


@@ -1260,6 +1823,8 @@ if ($window) {
     Irssi::command_bind( "dm_as",                      "cmd_direct_as" );
     Irssi::command_bind( "tweet",                      "cmd_tweet" );
     Irssi::command_bind( "tweet_as",                   "cmd_tweet_as" );
     Irssi::command_bind( "dm_as",                      "cmd_direct_as" );
     Irssi::command_bind( "tweet",                      "cmd_tweet" );
     Irssi::command_bind( "tweet_as",                   "cmd_tweet_as" );

+    Irssi::command_bind( "retweet",                    "cmd_retweet" );
+    Irssi::command_bind( "retweet_as",                 "cmd_retweet_as" );

     Irssi::command_bind( "twitter_reply",              "cmd_reply" );
     Irssi::command_bind( "twitter_reply_as",           "cmd_reply_as" );
     Irssi::command_bind( "twitter_login",              "cmd_login" );
     Irssi::command_bind( "twitter_reply",              "cmd_reply" );
     Irssi::command_bind( "twitter_reply_as",           "cmd_reply_as" );
     Irssi::command_bind( "twitter_login",              "cmd_login" );


@@ -1269,6 +1834,12 @@ if ($window) {
     Irssi::command_bind( "twitter_unsubscribe",        "cmd_del_search" );
     Irssi::command_bind( "twitter_list_subscriptions", "cmd_list_search" );
     Irssi::command_bind( "twirssi_upgrade",            "cmd_upgrade" );
     Irssi::command_bind( "twitter_unsubscribe",        "cmd_del_search" );
     Irssi::command_bind( "twitter_list_subscriptions", "cmd_list_search" );
     Irssi::command_bind( "twirssi_upgrade",            "cmd_upgrade" );

+    Irssi::command_bind( "twirssi_oauth",              "cmd_oauth" );
+    Irssi::command_bind( "twitter_updates",            "get_updates" );
+    Irssi::command_bind( "twitter_add_follow_extra",   "cmd_add_follow" );
+    Irssi::command_bind( "twitter_del_follow_extra",   "cmd_del_follow" );
+    Irssi::command_bind( "twitter_list_follow_extra",  "cmd_list_follow" );
+    Irssi::command_bind( "bitlbee_away",               "update_away" );

     if ( Irssi::settings_get_bool("twirssi_use_reply_aliases") ) {
         Irssi::command_bind( "reply",    "cmd_reply" );
         Irssi::command_bind( "reply_as", "cmd_reply_as" );
     if ( Irssi::settings_get_bool("twirssi_use_reply_aliases") ) {
         Irssi::command_bind( "reply",    "cmd_reply" );
         Irssi::command_bind( "reply_as", "cmd_reply_as" );


@@ -1277,7 +1848,8 @@ if ($window) {
         "twirssi_dump",
         sub {
             print "twits: ", join ", ",
         "twirssi_dump",
         sub {
             print "twits: ", join ", ",

-              map { "u: $_->{username}" } values %twits;
+              map { "u: $_->{username}\@" . ref($_) } values %twits;
+            print "selected: $user\@$defservice";

             print "friends: ", join ", ", sort keys %friends;
             print "nicks: ",   join ", ", sort keys %nicks;
             print "searches: ", Dumper \%{ $id_map{__searches} };
             print "friends: ", join ", ", sort keys %friends;
             print "nicks: ",   join ", ", sort keys %nicks;
             print "searches: ", Dumper \%{ $id_map{__searches} };


@@ -1292,36 +1864,69 @@ if ($window) {
     Irssi::command_bind(
         "twirssi_version",
         sub {
     Irssi::command_bind(
         "twirssi_version",
         sub {

-            &notice("Twirssi v$VERSION (r$REV); "
-                  . "Net::Twitter v$Net::Twitter::VERSION. "
+            &notice(
+                "Twirssi v$VERSION; "
+                  . (
+                    $Net::Twitter::Lite::VERSION
+                    ? "Net::Twitter v$Net::Twitter::Lite::VERSION. "
+                    : ""
+                  )
+                  . (
+                    $Net::Identica::VERSION
+                    ? "Net::Identica v$Net::Identica::VERSION. "
+                    : ""
+                  )

                   . "JSON in use: "
                   . JSON::Any::handler()
                   . "JSON in use: "
                   . JSON::Any::handler()

-                  . ".  See details at http://twirssi.com/" );
+                  . ".  See details at http://twirssi.com/"
+            );

         }
     );
     Irssi::command_bind(
         }
     );
     Irssi::command_bind(

-        "twitter_friend",
+        "twitter_follow",

         &gen_cmd(
         &gen_cmd(

-            "/twitter_friend <username>",
+            "/twitter_follow <username>",

             "create_friend",
             sub { &notice("Following $_[0]"); $nicks{ $_[0] } = time; }
         )
     );
     Irssi::command_bind(
             "create_friend",
             sub { &notice("Following $_[0]"); $nicks{ $_[0] } = time; }
         )
     );
     Irssi::command_bind(

-        "twitter_unfriend",
+        "twitter_unfollow",

         &gen_cmd(
             "/twitter_unfriend <username>",
             "destroy_friend",
             sub { &notice("Stopped following $_[0]"); delete $nicks{ $_[0] }; }
         )
     );
         &gen_cmd(
             "/twitter_unfriend <username>",
             "destroy_friend",
             sub { &notice("Stopped following $_[0]"); delete $nicks{ $_[0] }; }
         )
     );

-    Irssi::command_bind( "twitter_updates", "get_updates" );
+    Irssi::command_bind(
+        "twitter_device_updates",
+        &gen_cmd(
+            "/twitter_device_updates none|im|sms",
+            "update_delivery_device",
+            sub { &notice("Device updated to $_[0]"); }
+        )
+    );
+    Irssi::command_bind(
+        "twitter_block",
+        &gen_cmd(
+            "/twitter_block <username>",
+            "create_block",
+            sub { &notice("Blocked $_[0]"); }
+        )
+    );
+    Irssi::command_bind(
+        "twitter_unblock",
+        &gen_cmd(
+            "/twitter_unblock <username>",
+            "destroy_block",
+            sub { &notice("Unblock $_[0]"); }
+        )
+    );

     Irssi::signal_add_last( 'complete word' => \&sig_complete );
 
     Irssi::signal_add_last( 'complete word' => \&sig_complete );
 

-    &notice("  %Y<%C(%B^%C)%N                   TWIRSSI v%R$VERSION%N (r$REV)");
-    &notice("   %C(_(\\%N           http://twirssi.com/ for full docs");
-    &notice(
-        "    %Y||%C `%N Log in with /twitter_login, send updates with /tweet");
+    &notice("  %Y<%C(%B^%C)%N                   TWIRSSI v%R$VERSION%N",
+            "   %C(_(\\%N           http://twirssi.com/ for full docs",
+            "    %Y||%C `%N Log in with /twitter_login, send updates with /tweet");

 
     my $file = Irssi::settings_get_str("twirssi_replies_store");
     if ( $file and -r $file ) {
 
     my $file = Irssi::settings_get_str("twirssi_replies_store");
     if ( $file and -r $file ) {


@@ -1336,6 +1941,7 @@ if ($window) {
                 &notice( sprintf "Loaded old replies from %d contact%s.",
                     $num, ( $num == 1 ? "" : "s" ) );
                 &cmd_list_search;
                 &notice( sprintf "Loaded old replies from %d contact%s.",
                     $num, ( $num == 1 ? "" : "s" ) );
                 &cmd_list_search;

+                &cmd_list_follow;

             };
         } else {
             &notice("Failed to load old replies from $file: $!");
             };
         } else {
             &notice("Failed to load old replies from $file: $!");


@@ -1343,18 +1949,18 @@ if ($window) {
     }
 
     if ( my $provider = Irssi::settings_get_str("short_url_provider") ) {
     }
 
     if ( my $provider = Irssi::settings_get_str("short_url_provider") ) {

+        &notice("Loading WWW::Shorten::$provider...");

         eval "use WWW::Shorten::$provider;";
 
         if ($@) {
             &notice(
         eval "use WWW::Shorten::$provider;";
 
         if ($@) {
             &notice(

-"Failed to load WWW::Shorten::$provider - either clear short_url_provider or install the CPAN module"
+                "Failed to load WWW::Shorten::$provider - either clear",
+                "short_url_provider or install the CPAN module"

             );
         }
     }
 
             );
         }
     }
 

-    if (    my $autouser = Irssi::settings_get_str("twitter_usernames")
-        and my $autopass = Irssi::settings_get_str("twitter_passwords") )
-    {
+    if ( my $autouser = Irssi::settings_get_str("twitter_usernames") ) {

         &cmd_login();
         &get_updates;
     }
         &cmd_login();
         &get_updates;
     }