1.6.1 - r336 - Add evals around Net::Twitter calls

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

diff --git a/twirssi.pl b/twirssi.pl
index 83f1fe0e4af05b2568645e89a1152f08bcd97863..8f7f966cd42fa7326cd4b5e4a664b092900208c9 100644 (file)
--- a/twirssi.pl
+++ b/twirssi.pl
@@ -5,12 +5,14 @@ use Net::Twitter;
 use HTTP::Date;
 use HTML::Entities;
 use File::Temp;
 use HTTP::Date;
 use HTML::Entities;
 use File::Temp;

+use LWP::Simple;
+use Data::Dumper;
+$Data::Dumper::Indent = 1;

 
 use vars qw($VERSION %IRSSI);
 
 use vars qw($VERSION %IRSSI);

-use constant { DEBUG => 0 };

 
 

-$VERSION = "1.1";
-my ($REV) = '$Rev: 309 $' =~ /(\d+)/;
+$VERSION = "1.6.1";
+my ($REV) = '$Rev: 336 $' =~ /(\d+)/;

 %IRSSI = (
     authors     => 'Dan Boger',
     contact     => 'zigdon@gmail.com',
 %IRSSI = (
     authors     => 'Dan Boger',
     contact     => 'zigdon@gmail.com',


@@ -30,6 +32,8 @@ my $poll;
 my %nicks;
 my %friends;
 my $last_poll = time - 300;
 my %nicks;
 my %friends;
 my $last_poll = time - 300;

+my %tweet_cache;
+my %id_map;

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


@@ -67,10 +71,17 @@ sub cmd_direct_as {
         return;
     }
 
         return;
     }
 

-    unless ( $twits{$username}
-        ->new_direct_message( { user => $target, text => $text } ) )
-    {
-        &notice("DM to $target failed");
+    eval {
+        unless ( $twits{$username}
+            ->new_direct_message( { user => $target, text => $text } ) )
+        {
+            &notice("DM to $target failed");
+            return;
+        }
+    };
+
+    if ($@) {
+        &notice("DM caused an error.  Aborted");

         return;
     }
 
         return;
     }
 


@@ -116,12 +127,159 @@ sub cmd_tweet_as {
         return;
     }
 
         return;
     }
 

-    foreach my $url ( $data =~ /(https?:\/\/\S+[\w\/])/g ) {
-        eval { my $short = makeashorterlink($url); $data =~ s/\Q$url/$short/g; };
+    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;
+            };
+        }
+    }
+
+    if ( length $data > 140 ) {
+        &notice(
+            "Tweet too long (" . length($data) . " characters) - aborted" );
+        return;
+    }
+
+    eval {
+        unless ( $twits{$username}->update($data) )
+        {
+            &notice("Update failed");
+            return;
+        }
+    };
+
+    if ($@) {
+        &notice("Update caused an error.  Aborted.");
+        return;
+    }
+
+    foreach ( $data =~ /@([-\w]+)/ ) {
+        $nicks{$1} = time;
+    }
+
+    my $away = 0;
+    if (    Irssi::settings_get_bool("tweet_to_away")
+        and $data !~ /\@\w/
+        and $data !~ /^[dD] / )
+    {
+        my $server =
+          Irssi::server_find_tag( Irssi::settings_get_str("bitlbee_server") );
+        if ($server) {
+            $server->send_raw("away :$data");
+            $away = 1;
+        } else {
+            &notice( "Can't find bitlbee server.",
+                "Update bitlbee_server or disalbe tweet_to_away" );
+        }
+    }
+
+    &notice( "Update sent" . ( $away ? " (and away msg set)" : "" ) );
+}
+
+sub cmd_reply {
+    my ( $data, $server, $win ) = @_;
+
+    unless ($twit) {
+        &notice("Not logged in!  Use /twitter_login username pass!");
+        return;
+    }
+
+    $data =~ s/^\s+|\s+$//;
+    unless ($data) {
+        &notice("Usage: /reply <nick[:num]> <update>");
+        return;
+    }
+
+    $data =~ s/^\s+|\s+$//;
+    my ( $id, $data ) = split ' ', $data, 2;
+    unless ( $id and $data ) {
+        &notice("Usage: /reply_as <nick[:num]> <update>");
+        return;
+    }
+
+    &cmd_reply_as( "$user $id $data", $server, $win );
+}
+
+sub cmd_reply_as {
+    my ( $data, $server, $win ) = @_;
+
+    unless ( Irssi::settings_get_bool("twirssi_track_replies") ) {
+        &notice("twirssi_track_replies is required in order to reply to "
+              . "specific tweets.  Either enable it, or just use /tweet "
+              . "\@username <text>." );
+        return;
+    }
+
+    unless ($twit) {
+        &notice("Not logged in!  Use /twitter_login username pass!");
+        return;
+    }
+
+    $data =~ s/^\s+|\s+$//;
+    my ( $username, $id, $data ) = split ' ', $data, 3;
+
+    unless ( $username and $data ) {
+        &notice("Usage: /reply_as <username> <nick[:num]> <update>");
+        return;
+    }
+
+    unless ( exists $twits{$username} ) {
+        &notice("Unknown username $username");
+        return;
+    }
+
+    my $nick;
+    $id =~ s/[^\w\d\-:]+//g;
+    ( $nick, $id ) = split /:/, $id;
+    unless ( exists $id_map{$nick} ) {
+        &notice("Can't find a tweet from $nick to reply to!");
+        return;

     }
 
     }
 

-    unless ( $twits{$username}->update($data) ) {
-        &notice("Update failed");
+    $id = $id_map{__indexes}{$nick} unless $id;
+    unless ( $id_map{ lc $nick }[$id] ) {
+        &notice("Can't find a tweet numbered $id from $nick to reply to!");
+        return;
+    }
+
+    # remove any @nick at the beginning of the reply, as we'll add it anyway
+    $data =~ s/^\s*\@?$nick\s*//;
+    $data = "\@$nick " . $data;
+
+    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;
+            };
+        }
+    }
+
+    if ( length $data > 140 ) {
+        &notice(
+            "Tweet too long (" . length($data) . " characters) - aborted" );
+        return;
+    }
+
+    eval {
+        unless (
+            $twits{$username}->update(
+                {
+                    status                => $data,
+                    in_reply_to_status_id => $id_map{ lc $nick }[$id]
+                }
+            )
+          )
+        {
+            &notice("Update failed");
+            return;
+        }
+    };
+
+    if ($@) {
+        &notice("Update caused an error.  Aborted");

         return;
     }
 
         return;
     }
 


@@ -165,8 +323,16 @@ sub gen_cmd {
             return;
         }
 
             return;
         }
 

-        unless ( $twit->$api_name($data) ) {
-            &notice("$api_name failed");
+        eval {
+            unless ( $twit->$api_name($data) )
+            {
+                &notice("$api_name failed");
+                return;
+            }
+        };
+
+        if ($@) {
+            &notice("$api_name caused an error.  Aborted.");

             return;
         }
 
             return;
         }
 


@@ -214,7 +380,30 @@ sub cmd_logout {
 sub cmd_login {
     my ( $data, $server, $win ) = @_;
     my $pass;
 sub cmd_login {
     my ( $data, $server, $win ) = @_;
     my $pass;

-    ( $user, $pass ) = split ' ', $data, 2;
+    if ($data) {
+        ( $user, $pass ) = split ' ', $data, 2;
+    } elsif ( my $autouser = Irssi::settings_get_str("twitter_usernames")
+        and my $autopass = Irssi::settings_get_str("twitter_passwords") )
+    {
+        my @user = split /\s*,\s*/, $autouser;
+        my @pass = split /\s*,\s*/, $autopass;
+        if ( @user != @pass ) {
+            &notice("Number of usernames doesn't match "
+                  . "the number of passwords - auto-login failed" );
+        } else {
+            my ( $u, $p );
+            while ( @user and @pass ) {
+                $u = shift @user;
+                $p = shift @pass;
+                &cmd_login("$u $p");
+            }
+            return;
+        }
+    } else {
+        &notice("/twitter_login requires either a username and password "
+              . "or twitter_usernames and twitter_passwords to be set." );
+        return;
+    }

 
     %friends = %nicks = ();
 
 
     %friends = %nicks = ();
 


@@ -225,18 +414,37 @@ sub cmd_login {
     );
 
     unless ( $twit->verify_credentials() ) {
     );
 
     unless ( $twit->verify_credentials() ) {

-        &notice("Login failed");
+        &notice("Login as $user failed");

         $twit = undef;
         $twit = undef;

+        if ( keys %twits ) {
+            &cmd_switch( ( keys %twits )[0], $server, $win );
+        }

         return;
     }
 
     if ($twit) {
         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 later");
+            $twit = undef;
+            return;
+        }
+

         $twits{$user} = $twit;
         Irssi::timeout_remove($poll) if $poll;
         $poll = Irssi::timeout_add( 300 * 1000, \&get_updates, "" );
         &notice("Logged in as $user, loading friends list...");
         $twits{$user} = $twit;
         Irssi::timeout_remove($poll) if $poll;
         $poll = Irssi::timeout_add( 300 * 1000, \&get_updates, "" );
         &notice("Logged in as $user, loading friends list...");

-        &load_friends;
-        &notice( "loaded friends: ", scalar keys %nicks );
+        &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." );
+            }
+        }

         %nicks = %friends;
         $nicks{$user} = 0;
         &get_updates;
         %nicks = %friends;
         $nicks{$user} = 0;
         &get_updates;


@@ -245,29 +453,141 @@ sub cmd_login {
     }
 }
 
     }
 }
 

+sub cmd_upgrade {
+    my ( $data, $server, $win ) = @_;
+
+    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?"
+        );
+        return;
+    }
+
+    if ( not -x "/usr/bin/md5sum" and not $data ) {
+        &notice(
+"/usr/bin/md5sum can't be found - try '/twirssi_upgrade nomd5' to skip MD5 verification"
+        );
+        return;
+    }
+
+    my $md5;
+    unless ($data) {
+        eval { use Digest::MD5; };
+
+        if ($@) {
+            &notice(
+"Failed to load Digest::MD5.  Try '/twirssi_upgrade nomd5' to skip MD5 verification"
+            );
+            return;
+        }
+
+        $md5 = get("http://twirssi.com/md5sum");
+        chomp $md5;
+        $md5 =~ s/ .*//;
+        unless ($md5) {
+            &notice("Failed to download md5sum from peeron!  Aborting.");
+            return;
+        }
+
+        unless ( open( CUR, $loc ) ) {
+            &notice(
+"Failed to read $loc.  Check that /set twirssi_location is set to the correct location."
+            );
+            return;
+        }
+
+        my $cur_md5 = Digest::MD5::md5_hex(<CUR>);
+        close CUR;
+
+        if ( $cur_md5 eq $md5 ) {
+            &notice("Current twirssi seems to be up to date.");
+            return;
+        }
+    }
+
+    my $URL = "http://twirssi.com/twirssi.pl";
+    &notice("Downloading twirssi from $URL");
+    LWP::Simple::getstore( $URL, "$loc.upgrade" );
+
+    unless ($data) {
+        unless ( open( NEW, "$loc.upgrade" ) ) {
+            &notice(
+"Failed to read $loc.upgrade.  Check that /set twirssi_location is set to the correct location."
+            );
+            return;
+        }
+
+        my $new_md5 = Digest::MD5::md5_hex(<NEW>);
+        close NEW;
+
+        if ( $new_md5 ne $md5 ) {
+            &notice("MD5 verification failed. expected $md5, got $new_md5");
+            return;
+        }
+    }
+
+    rename $loc, "$loc.backup"
+      or &notice("Failed to back up $loc: $!.  Aborting")
+      and return;
+    rename "$loc.upgrade", $loc
+      or &notice("Failed to rename $loc.upgrade: $!.  Aborting")
+      and return;
+
+    my ( $dir, $file ) = ( $loc =~ m{(.*)/([^/]+)$} );
+    if ( -e "$dir/autorun/$file" ) {
+        &notice("Updating $dir/autorun/$file");
+        unlink "$dir/autorun/$file"
+          or &notice("Failed to remove old $file from autorun: $!");
+        symlink "../$file", "$dir/autorun/$file"
+          or &notice("Failed to create symlink in autorun directory: $!");
+    }
+
+    &notice("Download complete.  Reload twirssi with /script load $file");
+}
+

 sub load_friends {
 sub load_friends {

+    my $fh   = shift;

     my $page = 1;
     my %new_friends;
     my $page = 1;
     my %new_friends;

-    while (1) {
-        my $friends = $twit->friends( { page => $page } );
-        last unless $friends;
-        $new_friends{ $_->{screen_name} } = time foreach @$friends;
-        $page++;
-        last if @$friends == 0 or $page == 10;
-        $friends = $twit->friends( page => $page );
+    eval {
+        while (1)
+        {
+            print $fh "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;
+            $page++;
+            last if @$friends == 0 or $page == 10;
+        }
+    };
+
+    if ($@) {
+        &notice("Error during friends list update.  Aborted.");
+        return;

     }
 
     }
 

+    my ( $added, $removed ) = ( 0, 0 );
+    print $fh "Scanning for new friends...\n" if ( $fh and &debug );

     foreach ( keys %new_friends ) {
         next if exists $friends{$_};
         $friends{$_} = time;
     foreach ( keys %new_friends ) {
         next if exists $friends{$_};
         $friends{$_} = time;

+        $added++;

     }
 
     }
 

+    print $fh "Scanning for removed friends...\n" if ( $fh and &debug );

     foreach ( keys %friends ) {
     foreach ( keys %friends ) {

-        delete $friends{$_} unless exists $new_friends{$_};
+        next if exists $new_friends{$_};
+        delete $friends{$_};
+        $removed++;

     }
     }

+
+    return ( $added, $removed );

 }
 
 sub get_updates {
 }
 
 sub get_updates {

+    print scalar localtime, " - get_updates starting" if &debug;
+

     $window =
       Irssi::window_find_name( Irssi::settings_get_str('twitter_window') );
     unless ($window) {
     $window =
       Irssi::window_find_name( Irssi::settings_get_str('twitter_window') );
     unless ($window) {


@@ -286,6 +606,7 @@ sub get_updates {
 
     if ($pid) {    # parent
         Irssi::timeout_add_once( 5000, 'monitor_child', [$filename] );
 
     if ($pid) {    # parent
         Irssi::timeout_add_once( 5000, 'monitor_child', [$filename] );

+        Irssi::pidwait_add($pid);

     } elsif ( defined $pid ) {    # child
         close STDIN;
         close STDOUT;
     } elsif ( defined $pid ) {    # child
         close STDIN;
         close STDOUT;


@@ -299,8 +620,15 @@ sub get_updates {
             &do_updates( $fh, $_, $twits{$_} );
         }
 
             &do_updates( $fh, $_, $twits{$_} );
         }
 

+        my ( $added, $removed ) = &load_friends($fh);
+        if ( $added + $removed ) {
+            print $fh "%R***%n Friends list updated: ",
+              join( ", ",
+                sprintf( "%d added",   $added ),
+                sprintf( "%d removed", $removed ) ),
+              "\n";
+        }

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

-        &load_friends;

         foreach ( sort keys %friends ) {
             print $fh "$_ $friends{$_}\n";
         }
         foreach ( sort keys %friends ) {
             print $fh "$_ $friends{$_}\n";
         }


@@ -308,20 +636,30 @@ sub get_updates {
         close $fh;
         exit;
     }
         close $fh;
         exit;
     }

+    print scalar localtime, " - get_updates ends" if &debug;

 }
 
 sub do_updates {
     my ( $fh, $username, $obj ) = @_;
 
 }
 
 sub do_updates {
     my ( $fh, $username, $obj ) = @_;
 

-    print scalar localtime, " - Polling for updates for $username" if DEBUG;
-    my $tweets =
-      $obj->friends_timeline( { since => HTTP::Date::time2str($last_poll) } )
-      || [];
+    print scalar localtime, " - Polling for updates for $username" if &debug;
+    my $tweets;
+    eval {
+        $tweets = $obj->friends_timeline(
+            { since => HTTP::Date::time2str($last_poll) } )
+          || [];
+    };
+
+    if ($@) {
+        printf $fh "type:error Error during friends_timeline call.  Aborted.\n"
+          return;
+    }
+

     foreach my $t ( reverse @$tweets ) {
         my $text = decode_entities( $t->{text} );
         $text =~ s/%/%%/g;
         $text =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g;
     foreach my $t ( reverse @$tweets ) {
         my $text = decode_entities( $t->{text} );
         $text =~ s/%/%%/g;
         $text =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g;

-        my $prefix = "";
+        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}
         if (    Irssi::settings_get_bool("show_reply_context")
             and $t->{in_reply_to_screen_name} ne $username
             and $t->{in_reply_to_screen_name}


@@ -333,25 +671,32 @@ sub do_updates {
                 my $ctext = decode_entities( $context->{text} );
                 $ctext =~ s/%/%%/g;
                 $ctext =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g;
                 my $ctext = decode_entities( $context->{text} );
                 $ctext =~ s/%/%%/g;
                 $ctext =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g;

-                printf $fh "[%s%%B\@%s%%n] %s\n",
-                  ( $username ne $user ? "$username: " : "" ),
+                printf $fh "id:%d account:%s nick:%s type:tweet %s\n",
+                  $context->{id}, $username,

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

-                $prefix = "\--> ";
+                $reply = "reply";
+            } else {
+                print "Failed to get context from $t->{in_reply_to_screen_name}"
+                  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 "%s[%s%%B\@%s%%n] %s\n",
-          $prefix,
-          ( $username ne $user ? "$username: " : "" ),
-          $t->{user}{screen_name},
-          $text;
+        printf $fh "id:%d account:%s nick:%s type:%s %s\n",
+          $t->{id}, $username, $t->{user}{screen_name}, $reply, $text;
+    }
+
+    print scalar localtime, " - Polling for replies" if &debug;
+    eval {
+        $tweets = $obj->replies( { since => HTTP::Date::time2str($last_poll) } )
+          || [];
+      }
+
+      if ($@) {
+        printf $fh "type:error Error during replies call.  Aborted.\n" return;

     }
 
     }
 

-    print scalar localtime, " - Polling for replies" if DEBUG;
-    $tweets = $obj->replies( { since => HTTP::Date::time2str($last_poll) } )
-      || [];

     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} };


@@ -359,13 +704,11 @@ sub do_updates {
         my $text = decode_entities( $t->{text} );
         $text =~ s/%/%%/g;
         $text =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g;
         my $text = decode_entities( $t->{text} );
         $text =~ s/%/%%/g;
         $text =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g;

-        printf $fh "[%s%%B\@%s%%n] %s\n",
-          ( $username ne $user ? "$username: " : "" ),
-          $t->{user}{screen_name},
-          $text;
+        printf $fh "id:%d account:%s nick:%s type:tweet %s\n",
+          $t->{id}, $username, $t->{user}{screen_name}, $text;

     }
 
     }
 

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

     $tweets =
       $obj->direct_messages( { since => HTTP::Date::time2str($last_poll) } )
       || [];
     $tweets =
       $obj->direct_messages( { since => HTTP::Date::time2str($last_poll) } )
       || [];


@@ -373,25 +716,59 @@ sub do_updates {
         my $text = decode_entities( $t->{text} );
         $text =~ s/%/%%/g;
         $text =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g;
         my $text = decode_entities( $t->{text} );
         $text =~ s/%/%%/g;
         $text =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g;

-        printf $fh "[%s%%B\@%s%%n (%%WDM%%n)] %s\n",
-          ( $username ne $user ? "$username: " : "" ),
-          $t->{sender_screen_name},
-          $text;
+        printf $fh "id:%d account:%s nick:%s type:dm %s\n",
+          $t->{id}, $username, $t->{sender_screen_name}, $text;

     }
     }

-    print scalar localtime, " - Done" if DEBUG;
+    print scalar localtime, " - Done" if &debug;

 }
 
 sub monitor_child {
     my $data     = shift;
     my $filename = $data->[0];
 
 }
 
 sub monitor_child {
     my $data     = shift;
     my $filename = $data->[0];
 

-    print scalar localtime, " - checking child log at $filename" if DEBUG;
+    print scalar localtime, " - checking child log at $filename" if &debug;
+    my $old_last_poll = $last_poll;

     if ( open FILE, $filename ) {
         my @lines;
         while (<FILE>) {
             chomp;
             last if /^__friends__/;
     if ( open FILE, $filename ) {
         my @lines;
         while (<FILE>) {
             chomp;
             last if /^__friends__/;

-            push @lines, $_ unless /^__friends__/;
+            my %meta;
+            foreach my $key (qw/id account nick type/) {
+                s/^$key:(\S+)\s*//;
+                $meta{$key} = $1;
+            }
+
+            next if exists $tweet_cache{ $meta{id} };
+            $tweet_cache{ $meta{id} } = time;
+            my $account = "";
+            if ( $meta{account} ne $user ) {
+                $account = "$meta{account}: ";
+            }
+
+            my $marker = "";
+            if (    $meta{type} ne 'dm'
+                and Irssi::settings_get_bool("twirssi_track_replies")
+                and $meta{nick}
+                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";
+            }
+
+            if ( $meta{type} eq 'tweet' ) {
+                push @lines, "[$account%B\@$meta{nick}%n$marker] $_\n",;
+            } elsif ( $meta{type} eq 'reply' ) {
+                push @lines, "[$account\\--> %B\@$meta{nick}%n$marker] $_\n",;
+            } 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,;
+            } elsif ( $meta{type} eq 'debug' ) {
+                push @lines, "debug: $_\n" if &debug,;
+            }

         }
 
         %friends = ();
         }
 
         %friends = ();


@@ -404,23 +781,38 @@ sub monitor_child {
             $nicks{$f} = $friends{$f} = $t;
         }
 
             $nicks{$f} = $friends{$f} = $t;
         }
 

-        print "new last_poll = $last_poll" if DEBUG;
-        foreach my $line (@lines) {
-            chomp $line;
-            $window->print( $line, MSGLEVEL_PUBLIC );
-            foreach ( $line =~ /\@([-\w]+)/ ) {
-                $nicks{$1} = time;
+        if ( $last_poll != $old_last_poll ) {
+            print "new last_poll = $last_poll" if &debug;
+            foreach my $line (@lines) {
+                chomp $line;
+                $window->print( $line, MSGLEVEL_PUBLIC );
+                foreach ( $line =~ /\@([-\w]+)/ ) {
+                    $nicks{$1} = time;
+                }

             }
             }

-        }

 
 

-        close FILE;
-        unlink $filename or warn "Failed to remove $filename: $!";
-        return;
+            close FILE;
+            unlink $filename
+              or warn "Failed to remove $filename: $!"
+              unless &debug;
+
+      # keep 10 minutes of cached tweets, to make sure we don't show duplicates.
+            foreach ( keys %tweet_cache ) {
+                next if $tweet_cache{$_} > time - 600;
+                delete $tweet_cache{$_};
+            }
+            return;
+        }

     }
 
     }
 

+    close FILE;

     Irssi::timeout_add_once( 5000, 'monitor_child', [$filename] );
 }
 
     Irssi::timeout_add_once( 5000, 'monitor_child', [$filename] );
 }
 

+sub debug {
+    return Irssi::settings_get_bool("twirssi_debug");
+}
+

 sub notice {
     $window->print( "%R***%n @_", MSGLEVEL_PUBLIC );
 }
 sub notice {
     $window->print( "%R***%n @_", MSGLEVEL_PUBLIC );
 }


@@ -428,34 +820,72 @@ sub notice {
 sub sig_complete {
     my ( $complist, $window, $word, $linestart, $want_space ) = @_;
 
 sub sig_complete {
     my ( $complist, $window, $word, $linestart, $want_space ) = @_;
 

-    return unless $linestart =~ /^\/(?:tweet|dm)/;
-    return if $linestart eq '/tweet' and $word !~ s/^@//;
-    push @$complist, grep /^\Q$word/i,
-      sort { $nicks{$b} <=> $nicks{$a} } keys %nicks;
-    @$complist = map { "\@$_" } @$complist if $linestart eq '/tweet';
+    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
+        @$complist = grep /^\Q$word/i, sort keys %{ $id_map{__indexes} };
+    }
+
+    # /tweet, /tweet_as, /dm, /dm_as - complete @nicks (and nicks as the first
+    # arg to dm)
+    if ( $linestart =~ /^\/(?:tweet|dm)/ ) {
+        my $prefix = $word =~ s/^@//;
+        $prefix = 0 if $linestart eq '/dm' or $linestart eq '/dm_as';
+        push @$complist, grep /^\Q$word/i,
+          sort { $nicks{$b} <=> $nicks{$a} } keys %nicks;
+        @$complist = map { "\@$_" } @$complist if $prefix;
+    }

 }
 
 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_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_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::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 );

 $window = Irssi::window_find_name( Irssi::settings_get_str('twitter_window') );
 $window = Irssi::window_find_name( Irssi::settings_get_str('twitter_window') );

+

 if ($window) {
 if ($window) {

-    Irssi::command_bind( "dm",             "cmd_direct" );
-    Irssi::command_bind( "tweet",          "cmd_tweet" );
-    Irssi::command_bind( "dm_as",          "cmd_direct_as" );
-    Irssi::command_bind( "tweet_as",       "cmd_tweet_as" );
-    Irssi::command_bind( "twitter_login",  "cmd_login" );
-    Irssi::command_bind( "twitter_logout", "cmd_logout" );
-    Irssi::command_bind( "twitter_switch", "cmd_switch" );
+    Irssi::command_bind( "dm",               "cmd_direct" );
+    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( "twitter_reply",    "cmd_reply" );
+    Irssi::command_bind( "twitter_reply_as", "cmd_reply_as" );
+    Irssi::command_bind( "twitter_login",    "cmd_login" );
+    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(
+        "twitter_dump",
+        sub {
+            print "twits: ",   Dumper \%twits;
+            print "friends: ", join ", ", sort keys %friends;
+            print "nicks: ",   join ", ", sort keys %nicks;
+            print "last poll: $last_poll";
+        }
+    );

     Irssi::command_bind(
         "twirssi_version",
         sub {
             &notice(
     Irssi::command_bind(
         "twirssi_version",
         sub {
             &notice(

-"Twirssi v$VERSION (r$REV).  See details at http://tinyurl.com/twirssi"
-            );
+"Twirssi v$VERSION (r$REV);  Net::Twitter v$Net::Twitter::VERSION. "
+                  . "See details at http://tinyurl.com/twirssi" );

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


@@ -478,7 +908,7 @@ if ($window) {
     Irssi::signal_add_last( 'complete word' => \&sig_complete );
 
     &notice("  %Y<%C(%B^%C)%N                   TWIRSSI v%R$VERSION%N (r$REV)");
     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://tinyurl.com/twirssi for full docs");
+    &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 `%N Log in with /twitter_login, send updates with /tweet");
 


@@ -491,6 +921,13 @@ if ($window) {
             );
         }
     }
             );
         }
     }

+
+    if (    my $autouser = Irssi::settings_get_str("twitter_usernames")
+        and my $autopass = Irssi::settings_get_str("twitter_passwords") )
+    {
+        &cmd_login();
+    }
+

 } else {
     Irssi::active_win()
       ->print( "Create a window named "
 } else {
     Irssi::active_win()
       ->print( "Create a window named "