1.5.2 - r326 - Add pidwait for the fork, to help fight zombies. Not sure if it's...

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

diff --git a/twirssi.pl b/twirssi.pl
index 374f13943a85de194c22e7d9d54066def323bcac..e1c46acb93d063223ba07f2946a0abaebec87d48 100644 (file)
--- a/twirssi.pl
+++ b/twirssi.pl
@@ -11,8 +11,8 @@ $Data::Dumper::Indent = 1;
 
 use vars qw($VERSION %IRSSI);
 
-$VERSION = "1.3";
-my ($REV) = '$Rev: 312 $' =~ /(\d+)/;
+$VERSION = "1.5.2";
+my ($REV) = '$Rev: 326 $' =~ /(\d+)/;
 %IRSSI = (
     authors     => 'Dan Boger',
     contact     => 'zigdon@gmail.com',
@@ -32,6 +32,7 @@ my $poll;
 my %nicks;
 my %friends;
 my $last_poll = time - 300;
+my %tweet_cache;
 
 sub cmd_direct {
     my ( $data, $server, $win ) = @_;
@@ -127,6 +128,12 @@ sub cmd_tweet_as {
         }
     }
 
+    if ( length $data > 140 ) {
+        &notice(
+            "Tweet too long (" . length($data) . " characters) - aborted" );
+        return;
+    }
+
     unless ( $twits{$username}->update($data) ) {
         &notice("Update failed");
         return;
@@ -221,7 +228,30 @@ sub cmd_logout {
 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 = ();
 
@@ -232,8 +262,11 @@ sub cmd_login {
     );
 
     unless ( $twit->verify_credentials() ) {
-        &notice("Login failed");
+        &notice("Login as $user failed");
         $twit = undef;
+        if ( keys %twits ) {
+            &cmd_switch( ( keys %twits )[0], $server, $win );
+        }
         return;
     }
 
@@ -251,6 +284,15 @@ sub cmd_login {
         &notice("Logged in as $user, loading friends list...");
         &load_friends;
         &notice( "loaded friends: ", scalar keys %friends );
+        if ( Irssi::settings_get_bool("twirssi_first_run") ) {
+            Irssi::settings_set_bool( "twirssi_first_run", 0 );
+            unless ( exists $friends{twirssi} ) {
+                &notice("Welcome to twirssi!"
+                      . "  Perhaps you should add \@twirssi to your friends list,"
+                      . " so you can be notified when a new version is release?"
+                      . "  Just type /twitter_friend twirssi." );
+            }
+        }
         %nicks = %friends;
         $nicks{$user} = 0;
         &get_updates;
@@ -395,6 +437,7 @@ sub get_updates {
 
     if ($pid) {    # parent
         Irssi::timeout_add_once( 5000, 'monitor_child', [$filename] );
+        Irssi::pidwait_add($pid);
     } elsif ( defined $pid ) {    # child
         close STDIN;
         close STDOUT;
@@ -443,7 +486,8 @@ sub do_updates {
                 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",
+                printf $fh "id:%d [%s%%B\@%s%%n] %s\n",
+                  $context->{id},
                   ( $username ne $user ? "$username: " : "" ),
                   $context->{user}{screen_name}, $ctext;
                 $prefix = "\--> ";
@@ -455,7 +499,8 @@ sub do_updates {
         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",
+        printf $fh "id:%d %s[%s%%B\@%s%%n] %s\n",
+          $t->{id},
           $prefix,
           ( $username ne $user ? "$username: " : "" ),
           $t->{user}{screen_name},
@@ -472,7 +517,8 @@ sub do_updates {
         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",
+        printf $fh "id:%d [%s%%B\@%s%%n] %s\n",
+          $t->{id},
           ( $username ne $user ? "$username: " : "" ),
           $t->{user}{screen_name},
           $text;
@@ -486,7 +532,8 @@ sub do_updates {
         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",
+        printf $fh "id:%d [%s%%B\@%s%%n (%%WDM%%n)] %s\n",
+          $t->{id},
           ( $username ne $user ? "$username: " : "" ),
           $t->{sender_screen_name},
           $text;
@@ -505,6 +552,10 @@ sub monitor_child {
         while (<FILE>) {
             chomp;
             last if /^__friends__/;
+            if (s/^id:(\d+) //) {
+                next if exists $tweet_cache{$1};
+                $tweet_cache{$1} = time;
+            }
             push @lines, $_ unless /^__friends__/;
         }
 
@@ -532,6 +583,12 @@ sub monitor_child {
             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;
         }
     }
@@ -563,10 +620,13 @@ 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", "twirssi_debug",      0 );
+Irssi::settings_add_bool( "twirssi", "twirssi_first_run",  1 );
 $window = Irssi::window_find_name( Irssi::settings_get_str('twitter_window') );
 
 if ($window) {
@@ -628,6 +688,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 "