1.5.3 - r333 - Update to final URL, pass data from child in a machine readable format

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

diff --git a/twirssi.pl b/twirssi.pl
index ccba42575b0790724ddbb2e9de6bf78ad07a9e56..94ed5541e2a22fc43b7d138fec7980f9691f8656 100644 (file)
--- a/twirssi.pl
+++ b/twirssi.pl
@@ -5,13 +5,15 @@ 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: 302 $' =~ /(\d+)/;
-%IRSSI   = (
+$VERSION = "1.5.3";
+my ($REV) = '$Rev: 333 $' =~ /(\d+)/;
+%IRSSI = (

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


@@ -24,11 +26,14 @@ my ($REV) = '$Rev: 302 $' =~ /(\d+)/;
 
 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 ) = @_;


@@ -44,7 +49,31 @@ sub cmd_direct {
         return;
     }
 
         return;
     }
 

-    unless ( $twit->new_direct_message( { user => $target, text => $text } ) ) {
+    &cmd_direct_as( "$user $data", $server, $win );
+}
+
+sub cmd_direct_as {
+    my ( $data, $server, $win ) = @_;
+
+    unless ($twit) {
+        &notice("Not logged in!  Use /twitter_login username pass!");
+        return;
+    }
+
+    my ( $username, $target, $text ) = split ' ', $data, 3;
+    unless ( $username and $target and $text ) {
+        &notice("Usage: /dm_as <username> <nick> <message>");
+        return;
+    }
+
+    unless ( exists $twits{$username} ) {
+        &notice("Unknown username $username");
+        return;
+    }
+
+    unless ( $twits{$username}
+        ->new_direct_message( { user => $target, text => $text } ) )
+    {

         &notice("DM to $target failed");
         return;
     }
         &notice("DM to $target failed");
         return;
     }


@@ -67,11 +96,46 @@ 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 ) = @_;
+
+    unless ($twit) {
+        &notice("Not logged in!  Use /twitter_login username pass!");
+        return;
+    }
+
+    $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) ) {
+    unless ( exists $twits{$username} ) {
+        &notice("Unknown username $username");
+        return;
+    }
+
+    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;
+    }
+
+    unless ( $twits{$username}->update($data) ) {

         &notice("Update failed");
         return;
     }
         &notice("Update failed");
         return;
     }


@@ -125,10 +189,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;
+    if ( $data and exists $twits{$data} ) {
+        &notice("Logging out $data...");
+        $twits{$data}->end_session();
+        delete $twits{$data};
+    } elsif ($data) {
+        &notice("Unknown username '$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 +263,38 @@ 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;
     } else {
         $nicks{$user} = 0;
         &get_updates;
     } else {


@@ -157,30 +302,133 @@ 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;
     while (1) {
     my $page = 1;
     my %new_friends;
     while (1) {

+        print $fh "Loading friends page $page...\n" if ($fh and &debug);

         my $friends = $twit->friends( { page => $page } );
         last unless $friends;
         my $friends = $twit->friends( { page => $page } );
         last unless $friends;

-        $new_friends{ $_->{screen_name} } = $nicks{ $_->{screen_name} } = time
-          foreach @$friends;
+        $new_friends{ $_->{screen_name} } = time foreach @$friends;

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

-        $friends = $twit->friends( page => $page );

     }
 
     }
 

-    foreach (keys %new_friends) {
-      next if exists $friends{$_};
-      $friends{$_} = time;
+    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;
+        $added++;

     }
 
     }
 

-    foreach (keys %friends) {
-      delete $friends{$_} unless exists $new_friends{$_};
+    print $fh "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) {


@@ -199,6 +447,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;


@@ -206,115 +455,172 @@ 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;
+        &do_updates( $fh, $user, $twit );
+        foreach ( keys %twits ) {
+            next if $_ eq $user;
+            &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 "%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";

         }
         print $fh $new_poll;
         close $fh;
         exit;
     }
         }
         print $fh $new_poll;
         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 =
+      $obj->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 $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 = $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;
+                printf $fh "id:%d account:%s nick:%s type:tweet %s\n",
+                  $context->{id}, $username,
+                  $context->{user}{screen_name}, $ctext;
+                $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");
+        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;
+    $tweets = $obj->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 "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;
+    $tweets =
+      $obj->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 "id:%d account:%s nick:%s type:dm %s\n",
+          $t->{id}, $username, $t->{sender_screen_name}, $text;
+    }
+    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>) {
     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/) {
+              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}: ";
+            }
+            if ($meta{type} eq 'tweet') {
+              push @lines, "[$account%B\@$meta{nick}%n] $_\n",
+            } elsif ($meta{type} eq 'reply') {
+              push @lines, "[$account\\--> %B\@$meta{nick}%n] $_\n",
+            } elsif ($meta{type} eq 'dm') {
+              push @lines, "[$account%B\@$meta{nick}%n (%%WDM%%n)] $_\n",
+            } elsif ($meta{type} eq 'debug') {
+              push @lines, "debug: $_\n" if &debug,
+            }

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

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


@@ -323,29 +629,51 @@ sub sig_complete {
     my ( $complist, $window, $word, $linestart, $want_space ) = @_;
 
     return unless $linestart =~ /^\/(?:tweet|dm)/;
     my ( $complist, $window, $word, $linestart, $want_space ) = @_;
 
     return unless $linestart =~ /^\/(?:tweet|dm)/;

-    return if $linestart eq '/tweet' and $word !~ s/^@//;
+    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;
     push @$complist, grep /^\Q$word/i,
       sort { $nicks{$b} <=> $nicks{$a} } keys %nicks;

-    @$complist = map { "\@$_" } @$complist if $linestart eq '/tweet';
+    @$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_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", "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 );

 $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( "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( "twirssi_upgrade", "cmd_upgrade" );
+    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(


@@ -353,7 +681,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(


@@ -361,15 +689,16 @@ 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");

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


@@ -380,6 +709,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 "