r548 - Add new setting twirssi_always_shorten to force all URLs to be shortened

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

diff --git a/twirssi.pl b/twirssi.pl
index 0ee8ab107f96a7384b6a6e25f54447685434fb0d..ced5f956938c6afc737599577e1e00d559c11412 100644 (file)
--- a/twirssi.pl
+++ b/twirssi.pl
@@ -11,8 +11,8 @@ $Data::Dumper::Indent = 1;
 
 use vars qw($VERSION %IRSSI);
 
 
 use vars qw($VERSION %IRSSI);
 

-$VERSION = "2.1.1beta";
-my ($REV) = '$Rev: 491 $' =~ /(\d+)/;
+$VERSION = "2.1.3beta";
+my ($REV) = '$Rev: 548 $' =~ /(\d+)/;

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


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

-    changed => '$Date: 2009-02-25 10:44:26 -0800 (Wed, 25 Feb 2009) $',
+    changed => '$Date: 2009-03-13 10:45:47 -0700 (Fri, 13 Mar 2009) $',

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


@@ -134,16 +134,7 @@ sub cmd_tweet_as {
 
     return unless &valid_username($username);
 
 
     return unless &valid_username($username);
 

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

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


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

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

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


@@ -354,14 +336,26 @@ sub cmd_login {
     {
         my @user = split /\s*,\s*/, $autouser;
         my @pass = split /\s*,\s*/, $autopass;
     {
         my @user = split /\s*,\s*/, $autouser;
         my @pass = split /\s*,\s*/, $autopass;

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

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

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

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

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

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


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

-    unless ($data) {
+    unless ( $data or Irssi::settings_get_bool("twirssi_upgrade_beta") ) {

         unless ( open( NEW, "$loc.upgrade" ) ) {
             &notice(
 "Failed to read $loc.upgrade.  Check that /set twirssi_location is set to the correct location."
         unless ( open( NEW, "$loc.upgrade" ) ) {
             &notice(
 "Failed to read $loc.upgrade.  Check that /set twirssi_location is set to the correct location."


@@ -737,6 +731,12 @@ sub do_updates {
                 printf $fh "id:%d account:%s nick:%s type:tweet %s\n",
                   $context->{id}, $username,
                   $context->{user}{screen_name}, $ctext;
                 printf $fh "id:%d account:%s nick:%s type:tweet %s\n",
                   $context->{id}, $username,
                   $context->{user}{screen_name}, $ctext;

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

                 $reply = "reply";
             } elsif ($@) {
                 print $fh "type:debug request to get context failed: $@";
                 $reply = "reply";
             } elsif ($@) {
                 print $fh "type:debug request to get context failed: $@";


@@ -751,6 +751,12 @@ sub do_updates {
               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;
               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;

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

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


@@ -772,6 +778,12 @@ sub do_updates {
         $text = &hilight($text);
         printf $fh "id:%d account:%s nick:%s type:tweet %s\n",
           $t->{id}, $username, $t->{user}{screen_name}, $text;
         $text = &hilight($text);
         printf $fh "id:%d account:%s nick:%s type:tweet %s\n",
           $t->{id}, $username, $t->{user}{screen_name}, $text;

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

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


@@ -868,6 +880,10 @@ sub monitor_child {
             }
 
             if ( not $meta{type} or $meta{type} ne 'searchid' ) {
             }
 
             if ( not $meta{type} or $meta{type} ne 'searchid' ) {

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

                 $new_cache{ $meta{id} } = time;
 
                 if ( exists $meta{id} and exists $tweet_cache{ $meta{id} } ) {
                 $new_cache{ $meta{id} } = time;
 
                 if ( exists $meta{id} and exists $tweet_cache{ $meta{id} } ) {


@@ -907,6 +923,9 @@ sub monitor_child {
                     ( MSGLEVEL_PUBLIC | $hilight ),
                     $meta{type}, $account, $meta{nick}, $marker, $_
                   ];
                     ( MSGLEVEL_PUBLIC | $hilight ),
                     $meta{type}, $account, $meta{nick}, $marker, $_
                   ];

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

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


@@ -998,7 +1017,7 @@ sub monitor_child {
                     print JSON JSON::Any->objToJson( \%id_map );
                     close JSON;
                 } else {
                     print JSON JSON::Any->objToJson( \%id_map );
                     close JSON;
                 } else {

-                    &notice("Failed to write replies to $file: $!");
+                    &ccrap("Failed to write replies to $file: $!");

                 }
             }
             $failwhale = 0;
                 }
             }
             $failwhale = 0;


@@ -1037,11 +1056,11 @@ sub monitor_child {
                 q{         '--/_.'----'`}
               )
             {
                 q{         '--/_.'----'`}
               )
             {

-                &notice($whale);
+                &ccrap($whale);

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

-        &notice("Haven't been able to get updated tweets since $since");
+        &ccrap("Haven't been able to get updated tweets since $since");

     }
 }
 
     }
 }
 


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

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

 sub update_away {
     my $data = shift;
 
 sub update_away {
     my $data = shift;
 


@@ -1066,7 +1089,7 @@ sub update_away {
             $server->send_raw("away :$data");
             return 1;
         } else {
             $server->send_raw("away :$data");
             return 1;
         } else {

-            &notice( "Can't find bitlbee server.",
+            &ccrap( "Can't find bitlbee server.",

                 "Update bitlbee_server or disable tweet_to_away" );
             return 0;
         }
                 "Update bitlbee_server or disable tweet_to_away" );
             return 0;
         }


@@ -1119,8 +1142,10 @@ sub sig_complete {
       )
     {    # /twitter_reply gets a nick:num
         $word =~ s/^@//;
       )
     {    # /twitter_reply gets a nick:num
         $word =~ s/^@//;

-        @$complist = map { "$_:$id_map{__indexes}{$_}" } grep /^\Q$word/i,
-          sort keys %{ $id_map{__indexes} };
+        @$complist = map { "$_:$id_map{__indexes}{$_}" }
+          sort { $nicks{$b} <=> $nicks{$a} }
+          grep /^\Q$word/i,
+          keys %{ $id_map{__indexes} };

     }
 
     # /tweet, /tweet_as, /dm, /dm_as - complete @nicks (and nicks as the first
     }
 
     # /tweet, /tweet_as, /dm, /dm_as - complete @nicks (and nicks as the first


@@ -1171,6 +1196,48 @@ sub hilight {
     return $text;
 }
 
     return $text;
 }
 

+sub shorten {
+    my $data = shift;
+
+    my $provider = Irssi::settings_get_str("short_url_provider");
+    if (
+        (
+            Irssi::settings_get_bool("twirssi_always_shorten")
+            or &too_long( $data, 1 )
+        )
+        and $provider
+      )
+    {
+        my @args;
+        if ( $provider eq 'Bitly' ) {
+            @args[ 1, 2 ] = split ',',
+              Irssi::settings_get_str("short_url_args"), 2;
+            unless ( @args == 3 ) {
+                &ccrap(
+                    "WWW::Shorten::Bitly requires a username and API key.",
+                    "Set short_url_args to username,API_key or change your",
+                    "short_url_provider."
+                );
+                return $data;
+            }
+        }
+
+        foreach my $url ( $data =~ /(https?:\/\/\S+[\w\/])/g ) {
+            eval {
+                $args[0] = $url;
+                my $short = makeashorterlink(@args);
+                if ($short) {
+                    $data =~ s/\Q$url/$short/g;
+                } else {
+                    &notice("Failed to shorten $url!");
+                }
+            };
+        }
+    }
+
+    return $data;
+}
+

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


@@ -1184,17 +1251,18 @@ Irssi::theme_register(
 );
 
 Irssi::settings_add_int( "twirssi", "twitter_poll_interval", 300 );
 );
 
 Irssi::settings_add_int( "twirssi", "twitter_poll_interval", 300 );

-Irssi::settings_add_str( "twirssi", "twitter_window",     "twitter" );
-Irssi::settings_add_str( "twirssi", "bitlbee_server",     "bitlbee" );
-Irssi::settings_add_str( "twirssi", "short_url_provider", "TinyURL" );
+Irssi::settings_add_str( "twirssi", "twitter_window",      "twitter" );
+Irssi::settings_add_str( "twirssi", "bitlbee_server",      "bitlbee" );
+Irssi::settings_add_str( "twirssi", "short_url_provider",  "TinyURL" );
+Irssi::settings_add_str( "twirssi", "short_url_args",      undef );
+Irssi::settings_add_str( "twirssi", "twitter_usernames",   undef );
+Irssi::settings_add_str( "twirssi", "twitter_passwords",   undef );
+Irssi::settings_add_str( "twirssi", "twirssi_nick_color",  "%B" );
+Irssi::settings_add_str( "twirssi", "twirssi_topic_color", "%r" );

 Irssi::settings_add_str( "twirssi", "twirssi_location",
     ".irssi/scripts/twirssi.pl" );
 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_str( "twirssi", "twirssi_replies_store",
     ".irssi/scripts/twirssi.json" );

-Irssi::settings_add_str( "twirssi", "twirssi_nick_color",  "%B" );
-Irssi::settings_add_str( "twirssi", "twirssi_topic_color", "%r" );

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


@@ -1206,11 +1274,16 @@ Irssi::settings_add_bool( "twirssi", "twirssi_replies_autonick",  1 );
 Irssi::settings_add_bool( "twirssi", "twirssi_use_reply_aliases", 0 );
 Irssi::settings_add_bool( "twirssi", "twirssi_notify_timeouts",   1 );
 Irssi::settings_add_bool( "twirssi", "twirssi_hilights",          1 );
 Irssi::settings_add_bool( "twirssi", "twirssi_use_reply_aliases", 0 );
 Irssi::settings_add_bool( "twirssi", "twirssi_notify_timeouts",   1 );
 Irssi::settings_add_bool( "twirssi", "twirssi_hilights",          1 );

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

 Irssi::settings_add_bool( "twirssi", "tweet_window_input",        0 );
 
 $last_poll = time - &get_poll_time;
 $window = Irssi::window_find_name( Irssi::settings_get_str('twitter_window') );
 if ( !$window ) {
 Irssi::settings_add_bool( "twirssi", "tweet_window_input",        0 );
 
 $last_poll = time - &get_poll_time;
 $window = Irssi::window_find_name( Irssi::settings_get_str('twitter_window') );
 if ( !$window ) {

+    Irssi::active_win()
+      ->print( "Couldn't find a window named '"
+          . Irssi::settings_get_str('twitter_window')
+          . "', trying to create it." );

     $window =
       Irssi::Windowitem::window_create(
         Irssi::settings_get_str('twitter_window'), 1 );
     $window =
       Irssi::Windowitem::window_create(
         Irssi::settings_get_str('twitter_window'), 1 );


@@ -1305,11 +1378,13 @@ if ($window) {
     }
 
     if ( my $provider = Irssi::settings_get_str("short_url_provider") ) {
     }
 
     if ( my $provider = Irssi::settings_get_str("short_url_provider") ) {

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

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

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

             );
         }
     }
             );
         }
     }