1.7.3 - r354 - Strip out newlines from incoming tweets

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

diff --git a/twirssi.pl b/twirssi.pl
index 76892c37d0ab8e07218afd16d254548b23136d5a..c3ce58ff86b77922834e74b5add39168246a79e5 100644 (file)
--- a/twirssi.pl
+++ b/twirssi.pl
@@ -1,17 +1,26 @@
 use strict;
 use Irssi;
 use Irssi::Irc;
 use strict;
 use Irssi;
 use Irssi::Irc;

-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;
+
+BEGIN {
+    $ENV{JSON_ANY_ORDER} = "JSON Syck DWIW";
+    require JSON::Any;
+    import JSON::Any;
+    require Net::Twitter;
+    import Net::Twitter;
+}

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

-use constant { DEBUG => 0 };

 
 

-$VERSION = "1.1";
-my ($REV) = '$Rev: 303 $' =~ /(\d+)/;
-%IRSSI   = (
+$VERSION = "1.7.3";
+my ($REV) = '$Rev: 354 $' =~ /(\d+)/;
+%IRSSI = (

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


@@ -19,24 +28,24 @@ my ($REV) = '$Rev: 303 $' =~ /(\d+)/;
       . 'Can optionally set your bitlbee /away message to same',
     license => 'GNU GPL v2',
     url     => 'http://tinyurl.com/twirssi',
       . 'Can optionally set your bitlbee /away message to same',
     license => 'GNU GPL v2',
     url     => 'http://tinyurl.com/twirssi',

-    changed => 'Mon Dec  1 15:36:01 PST 2008',
+    changed => '$Date: 2009-01-08 14:46:04 -0800 (Thu, 08 Jan 2009) $',

 );
 
 my $window;
 my $twit;
 );
 
 my $window;
 my $twit;

+my %twits;

 my $user;
 my $poll;
 my %nicks;
 my %friends;
 my $last_poll = time - 300;
 my $user;
 my $poll;
 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 ) = @_;
 

-    unless ($twit) {
-        &notice("Not logged in!  Use /twitter_login username pass!");
-        return;
-    }
+    return unless &logged_in($twit);

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


@@ -44,8 +53,33 @@ sub cmd_direct {
         return;
     }
 
         return;
     }
 

-    unless ( $twit->new_direct_message( { user => $target, text => $text } ) ) {
-        &notice("DM to $target failed");
+    &cmd_direct_as( "$user $data", $server, $win );
+}
+
+sub cmd_direct_as {
+    my ( $data, $server, $win ) = @_;
+
+    return unless &logged_in($twit);
+
+    my ( $username, $target, $text ) = split ' ', $data, 3;
+    unless ( $username and $target and $text ) {
+        &notice("Usage: /dm_as <username> <nick> <message>");
+        return;
+    }
+
+    return unless &valid_username($username);
+
+    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;
     }
 


@@ -56,10 +90,7 @@ sub cmd_direct {
 sub cmd_tweet {
     my ( $data, $server, $win ) = @_;
 
 sub cmd_tweet {
     my ( $data, $server, $win ) = @_;
 

-    unless ($twit) {
-        &notice("Not logged in!  Use /twitter_login username pass!");
-        return;
-    }
+    return unless &logged_in($twit);

 
     $data =~ s/^\s+|\s+$//;
     unless ($data) {
 
     $data =~ s/^\s+|\s+$//;
     unless ($data) {


@@ -67,12 +98,45 @@ sub cmd_tweet {
         return;
     }
 
         return;
     }
 

-    foreach my $url ( $data =~ /(https?:\/\/\S+[\w\/])/g ) {
-        eval { my $short = makeashorterlink($url); $data =~ s/\Q$url/$short/g; };
+    &cmd_tweet_as( "$user $data", $server, $win );
+}
+
+sub cmd_tweet_as {
+    my ( $data, $server, $win ) = @_;
+
+    return unless &logged_in($twit);
+
+    $data =~ s/^\s+|\s+$//;
+    my ( $username, $data ) = split ' ', $data, 2;
+
+    unless ( $username and $data ) {
+        &notice("Usage: /tweet_as <username> <update>");
+        return;

     }
 
     }
 

-    unless ( $twit->update($data) ) {
-        &notice("Update failed");
+    return unless &valid_username($username);
+
+    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;
+            };
+        }
+    }
+
+    return if &too_long($data);
+
+    eval {
+        unless ( $twits{$username}->update($data) )
+        {
+            &notice("Update failed");
+            return;
+        }
+    };
+
+    if ($@) {
+        &notice("Update caused an error.  Aborted.");

         return;
     }
 
         return;
     }
 


@@ -80,22 +144,109 @@ sub cmd_tweet {
         $nicks{$1} = time;
     }
 
         $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" );
+    my $away = &update_away($data);
+
+    &notice( "Update sent" . ( $away ? " (and away msg set)" : "" ) );
+}
+
+sub cmd_reply {
+    my ( $data, $server, $win ) = @_;
+
+    return unless &logged_in($twit);
+
+    $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;
+    }
+
+    return unless &logged_in($twit);
+
+    $data =~ s/^\s+|\s+$//;
+    my ( $username, $id, $data ) = split ' ', $data, 3;
+
+    unless ( $username and $data ) {
+        &notice("Usage: /reply_as <username> <nick[:num]> <update>");
+        return;
+    }
+
+    return unless &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 reply to!");
+        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 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;
+            };

         }
     }
 
         }
     }
 

+    return if &too_long($data);
+
+    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;
+    }
+
+    foreach ( $data =~ /@([-\w]+)/ ) {
+        $nicks{$1} = time;
+    }
+
+    my $away = &update_away($data);
+

     &notice( "Update sent" . ( $away ? " (and away msg set)" : "" ) );
 }
 
     &notice( "Update sent" . ( $away ? " (and away msg set)" : "" ) );
 }
 


@@ -105,10 +256,7 @@ sub gen_cmd {
     return sub {
         my ( $data, $server, $win ) = @_;
 
     return sub {
         my ( $data, $server, $win ) = @_;
 

-        unless ($twit) {
-            &notice("Not logged in!  Use /twitter_login username pass!");
-            return;
-        }
+        return unless &logged_in($twit);

 
         $data =~ s/^\s+|\s+$//;
         unless ($data) {
 
         $data =~ s/^\s+|\s+$//;
         unless ($data) {


@@ -116,8 +264,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;
         }
 


@@ -125,10 +281,70 @@ sub gen_cmd {
       }
 }
 
       }
 }
 

+sub cmd_switch {
+    my ( $data, $server, $win ) = @_;
+
+    $data =~ s/^\s+|\s+$//g;
+    if ( exists $twits{$data} ) {
+        &notice("Switching to $data");
+        $twit = $twits{$data};
+        $user = $data;
+    } else {
+        &notice("Unknown user $data");
+    }
+}
+
+sub cmd_logout {
+    my ( $data, $server, $win ) = @_;
+
+    $data =~ s/^\s+|\s+$//g;
+    return unless &valid_username($data);
+
+    if ($data) {
+        &notice("Logging out $data...");
+        $twits{$data}->end_session();
+        delete $twits{$data};
+    } else {
+        &notice("Logging out $user...");
+        $twit->end_session();
+        undef $twit;
+        delete $twits{$user};
+        if ( keys %twits ) {
+            &cmd_switch( ( keys %twits )[0], $server, $win );
+        } else {
+            Irssi::timeout_remove($poll) if $poll;
+            undef $poll;
+        }
+    }
+}
+

 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 = ();
 


@@ -139,17 +355,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...");
         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;


@@ -158,30 +394,143 @@ 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 "type:debug Loading friends page $page...\n"
+              if ( $fh and &debug );
+            my $friends = $twit->friends( { page => $page } );
+            last unless $friends;
+            $new_friends{ $_->{screen_name} } = time foreach @$friends;
+            $page++;
+            last if @$friends == 0 or $page == 10;
+        }
+    };
+
+    if ($@) {
+        print $fh "type:debug Error during friends list update.  Aborted.\n";
+        return;

     }
 
     }
 

-    foreach (keys %new_friends) {
-      next if exists $friends{$_};
-      $friends{$_} = time;
+    my ( $added, $removed ) = ( 0, 0 );
+    print $fh "type:debug Scanning for new friends...\n" if ( $fh and &debug );
+    foreach ( keys %new_friends ) {
+        next if exists $friends{$_};
+        $friends{$_} = time;
+        $added++;

     }
 
     }
 

-    foreach (keys %friends) {
-      delete $friends{$_} unless exists $new_friends{$_};
+    print $fh "type:debug Scanning for removed friends...\n"
+      if ( $fh and &debug );
+    foreach ( keys %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) {


@@ -190,16 +539,15 @@ sub get_updates {
               . Irssi::settings_get_str('twitter_window')
               . "'.  Create it or change the value of twitter_window" );
     }
               . Irssi::settings_get_str('twitter_window')
               . "'.  Create it or change the value of twitter_window" );
     }

-    unless ($twit) {
-        &notice("Not logged in!  Use /twitter_login username pass!");
-        return;
-    }
+
+    return unless &logged_in($twit);

 
     my ( $fh, $filename ) = File::Temp::tempfile();
     my $pid = fork();
 
     if ($pid) {    # parent
 
     my ( $fh, $filename ) = File::Temp::tempfile();
     my $pid = fork();
 
     if ($pid) {    # parent

-        Irssi::timeout_add_once( 5000, 'monitor_child', [$filename] );
+        Irssi::timeout_add_once( 5000, 'monitor_child', [ $filename, 0 ] );
+        Irssi::pidwait_add($pid);

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


@@ -207,146 +555,404 @@ sub get_updates {
 
         my $new_poll = time;
 
 
         my $new_poll = time;
 

-        print scalar localtime, " - Polling for updates" if DEBUG;
-        my $tweets = $twit->friends_timeline(
-            { since => HTTP::Date::time2str($last_poll) } )
-          || [];
-        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 = "";
-            if (    Irssi::settings_get_bool("show_reply_context")
-                and $t->{in_reply_to_screen_name} ne $user
-                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 = $twit->show_status( $t->{in_reply_to_status_id} );
-                if ($context) {
-                    my $ctext = decode_entities( $context->{text} );
-                    $ctext =~ s/%/%%/g;
-                    $ctext =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g;
-                    printf $fh "[%%B\@%s%%n] %s\n",
-                      $context->{user}{screen_name}, $ctext;
-                    $prefix = "\--> ";
-                }
-            }
-            next
-              if $t->{user}{screen_name} eq $user
-                  and not Irssi::settings_get_bool("show_own_tweets");
-            printf $fh "%s[%%B\@%s%%n] %s\n", $prefix, $t->{user}{screen_name},
-              $text;
+        my $error = 0;
+        $error += &do_updates( $fh, $user, $twit );
+        foreach ( keys %twits ) {
+            next if $_ eq $user;
+            $error += &do_updates( $fh, $_, $twits{$_} );

         }
 
         }
 

-        print scalar localtime, " - Polling for replies" if DEBUG;
-        $tweets =
-          $twit->replies( { since => HTTP::Date::time2str($last_poll) } )
-          || [];
-        foreach my $t ( reverse @$tweets ) {
-            next
-              if exists $friends{ $t->{user}{screen_name} };
-
-            my $text = decode_entities( $t->{text} );
-            $text =~ s/%/%%/g;
-            $text =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g;
-            printf $fh "[%%B\@%s%%n] %s\n", $t->{user}{screen_name}, $text;
+        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";

         }
         }

-
-        print scalar localtime, " - Polling for DMs" if DEBUG;
-        $tweets = $twit->direct_messages(
-            { since => HTTP::Date::time2str($last_poll) } )
-          || [];
-        foreach my $t ( reverse @$tweets ) {
-            my $text = decode_entities( $t->{text} );
-            $text =~ s/%/%%/g;
-            $text =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g;
-            printf $fh "[%%B\@%s%%n (%%WDM%%n)] %s\n", $t->{sender_screen_name},
-              $text;
-        }
-        print scalar localtime, " - Done" if DEBUG;

         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";
+        }
+
+        if ($error) {
+            print $fh "type:debug Update encountered errors.  Aborted\n";
+            print $fh $last_poll;
+        } else {
+            print $fh $new_poll;

         }
         }

-        print $fh $new_poll;

         close $fh;
         exit;
     }
         close $fh;
         exit;
     }

+    print scalar localtime, " - get_updates ends" if &debug;
+}
+
+sub do_updates {
+    my ( $fh, $username, $obj ) = @_;
+
+    print scalar localtime, " - Polling for updates for $username" if &debug;
+    my $tweets;
+    eval {
+        $tweets = $obj->friends_timeline(
+            { since => HTTP::Date::time2str($last_poll) } );
+    };
+
+    if ($@) {
+        print $fh "type:debug Error during friends_timeline call.  Aborted.\n";
+        return 1;
+    }
+
+    unless ( ref $tweets ) {
+        if ( $obj->can("get_error") ) {
+            print $fh "type:debug API Error during friends_timeline call: ",
+              JSON::Any->jsonToObj( $obj->get_error() ), "  Aborted.\n";
+        } else {
+            print $fh
+              "type:debug API Error during friends_timeline call. Aborted.\n";
+        }
+        return 1;
+    }
+
+    foreach my $t ( reverse @$tweets ) {
+        my $text = decode_entities( $t->{text} );
+        $text =~ s/%/%%/g;
+        $text =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g;
+        $text =~ s/[\n\r]/ /g;
+        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;
+            eval {
+                $context = $obj->show_status( $t->{in_reply_to_status_id} );
+            };
+
+            if ($context) {
+                my $ctext = decode_entities( $context->{text} );
+                $ctext =~ s/%/%%/g;
+                $ctext =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g;
+                $ctext =~ s/[\n\r]/ /g;
+                printf $fh "id:%d account:%s nick:%s type:tweet %s\n",
+                  $context->{id}, $username,
+                  $context->{user}{screen_name}, $ctext;
+                $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}"
+                  if &debug;
+            }
+        }
+        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",
+          $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 ($@) {
+        print $fh "type:debug Error during replies call.  Aborted.\n";
+        return 1;
+    }
+
+    foreach my $t ( reverse @$tweets ) {
+        next
+          if exists $friends{ $t->{user}{screen_name} };
+
+        my $text = decode_entities( $t->{text} );
+        $text =~ s/%/%%/g;
+        $text =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g;
+        $text =~ s/[\n\r]/ /g;
+        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;
+    eval {
+        $tweets =
+          $obj->direct_messages( { since => HTTP::Date::time2str($last_poll) } )
+          || [];
+    };
+
+    if ($@) {
+        print $fh "type:debug Error during direct_messages call.  Aborted.\n";
+        return 1;
+    }
+
+    foreach my $t ( reverse @$tweets ) {
+        my $text = decode_entities( $t->{text} );
+        $text =~ s/%/%%/g;
+        $text =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g;
+        $text =~ s/[\n\r]/ /g;
+        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;
+
+    return 0;

 }
 
 sub monitor_child {
 }
 
 sub monitor_child {

-    my $data     = shift;
+    my ($data)   = @_;

     my $filename = $data->[0];
     my $filename = $data->[0];

+    my $attempt  = $data->[1];

 
 

-    print scalar localtime, " - checking child log at $filename" if DEBUG;
+    print scalar localtime, " - checking child log at $filename ($attempt)"
+      if &debug;
+    my $new_last_poll;

     if ( open FILE, $filename ) {
         my @lines;
         while (<FILE>) {
     if ( open FILE, $filename ) {
         my @lines;
         while (<FILE>) {

-          chomp;
-          last if /^__friends__/;
-          push @lines, $_ unless /^__friends__/;
+            chomp;
+            last if /^__friends__/;
+            my %meta;
+            foreach my $key (qw/id account nick type/) {
+                if (s/^$key:(\S+)\s*//) {
+                    $meta{$key} = $1;
+                }
+            }
+
+            next if exists $meta{id} and 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, "ERROR: $_\n";
+            } elsif ( $meta{type} eq 'debug' ) {
+                print "$_" if &debug,;
+            } else {
+                print "Unknown line type $meta{type}: $_" if &debug,;
+            }

         }
 
         %friends = ();
         while (<FILE>) {
         }
 
         %friends = ();
         while (<FILE>) {

-          if (/^\d+$/) {
-            $last_poll = $_;
-            last;
-          }
-          my ($f, $t) = split ' ', $_;
-          $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 (/^\d+$/) {
+                $new_last_poll = $_;
+                last;

             }
             }

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

         }
 
         }
 

-        close FILE;
-        unlink $filename or warn "Failed to remove $filename: $!";
-        return;
+        if ($new_last_poll) {
+            print "new last_poll = $new_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: $!"
+              unless &debug;
+
+            # keep enough cached tweets, to make sure we don't show duplicates.
+            foreach ( keys %tweet_cache ) {
+                next if $tweet_cache{$_} >= $last_poll;
+                delete $tweet_cache{$_};
+            }
+            $last_poll = $new_last_poll;
+
+            # save id_map hash
+            if ( keys %id_map
+                and my $file =
+                Irssi::settings_get_str("twirssi_replies_store") )
+            {
+                if ( open JSON, ">$file" ) {
+                    print JSON JSON::Any->objToJson( \%id_map );
+                    close JSON;
+                } else {
+                    &notice("Failed to write replies to $file: $!");
+                }
+            }
+            return;
+        }
+    }
+
+    close FILE;
+
+    if ( $attempt < 12 ) {
+        Irssi::timeout_add_once( 5000, 'monitor_child',
+            [ $filename, $attempt + 1 ] );
+    } else {
+        &notice("Giving up on polling $filename");
+        unlink $filename unless &debug;

     }
     }

+}

 
 

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

+sub update_away {
+    my $data = shift;
+
+    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");
+            return 1;
+        } else {
+            &notice( "Can't find bitlbee server.",
+                "Update bitlbee_server or disable tweet_to_away" );
+            return 0;
+        }
+    }
+
+    return 0;
+}
+
+sub too_long {
+    my $data = shift;
+
+    if ( length $data > 140 ) {
+        &notice(
+            "Tweet too long (" . length($data) . " characters) - aborted" );
+        return 1;
+    }
+
+    return 0;
+}
+
+sub valid_username {
+    my $username = shift;
+
+    unless ( exists $twits{$username} ) {
+        &notice("Unknown username $username");
+        return 0;
+    }
+
+    return 1;
+}
+
+sub logged_in {
+    my $obj = shift;
+    unless ($obj) {
+        &notice("Not logged in!  Use /twitter_login username pass!");
+        return 0;
+    }
+
+    return 1;
+}
+

 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_str( "twirssi", "twirssi_replies_store",
+    ".irssi/scripts/twirssi.json" );
+Irssi::settings_add_bool( "twirssi", "tweet_to_away",             0 );
+Irssi::settings_add_bool( "twirssi", "show_reply_context",        0 );
+Irssi::settings_add_bool( "twirssi", "show_own_tweets",           1 );
+Irssi::settings_add_bool( "twirssi", "twirssi_debug",             0 );
+Irssi::settings_add_bool( "twirssi", "twirssi_first_run",         1 );
+Irssi::settings_add_bool( "twirssi", "twirssi_track_replies",     1 );
+Irssi::settings_add_bool( "twirssi", "twirssi_use_reply_aliases", 0 );

 $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( "twitter_login", "cmd_login" );
+    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(
+        "twirssi_dump",
+        sub {
+            print "twits: ", join ", ",
+              map { "u: $_->{username}" } values %twits;
+            print "friends: ", join ", ", sort keys %friends;
+            print "nicks: ",   join ", ", sort keys %nicks;
+            print "id_map: ", Dumper \%{ $id_map{__indexes} };
+            print "last poll: $last_poll";
+        }
+    );

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

-            &notice(
-                "Twirssi v$VERSION (r$REV).  See details at http://tinyurl.com/twirssi"
-            );
+            &notice("Twirssi v$VERSION (r$REV); "
+                  . "Net::Twitter v$Net::Twitter::VERSION. "
+                  . "JSON in use: "
+                  . JSON::Any::handler()
+                  . ".  See details at http://twirssi.com/" );

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


@@ -354,7 +960,7 @@ if ($window) {
         &gen_cmd(
             "/twitter_friend <username>",
             "create_friend",
         &gen_cmd(
             "/twitter_friend <username>",
             "create_friend",

-            sub { &notice("Following $_[0]"); $nicks{$_[0]} = time; }
+            sub { &notice("Following $_[0]"); $nicks{ $_[0] } = time; }

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


@@ -362,15 +968,34 @@ if ($window) {
         &gen_cmd(
             "/twitter_unfriend <username>",
             "destroy_friend",
         &gen_cmd(
             "/twitter_unfriend <username>",
             "destroy_friend",

-            sub { &notice("Stopped following $_[0]"); delete $nicks{$_[0]}; }
+            sub { &notice("Stopped following $_[0]"); delete $nicks{ $_[0] }; }

         )
     );
     Irssi::command_bind( "twitter_updates", "get_updates" );
     Irssi::signal_add_last( 'complete word' => \&sig_complete );
 
     &notice("  %Y<%C(%B^%C)%N                   TWIRSSI v%R$VERSION%N (r$REV)");
         )
     );
     Irssi::command_bind( "twitter_updates", "get_updates" );
     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( "    %Y||%C `%N Log in with /twitter_login, send updates with /tweet");
+    &notice("   %C(_(\\%N           http://twirssi.com/ for full docs");
+    &notice(
+        "    %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 ) {
+        if ( open( JSON, $file ) ) {
+            local $/;
+            my $json = <JSON>;
+            close JSON;
+            eval {
+                my $ref = JSON::Any->jsonToObj($json);
+                %id_map = %$ref;
+                my $num = keys %{ $id_map{__indexes} };
+                &notice( sprintf "Loaded old replies from %d contact%s.",
+                    $num, ( $num == 1 ? "" : "s" ) );
+            };
+        } else {
+            &notice("Failed to load old replies from $file: $!");
+        }
+    }

 
     if ( my $provider = Irssi::settings_get_str("short_url_provider") ) {
         eval "use WWW::Shorten::$provider;";
 
     if ( my $provider = Irssi::settings_get_str("short_url_provider") ) {
         eval "use WWW::Shorten::$provider;";


@@ -381,6 +1006,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 "