X-Git-Url: https://git.sommitrealweird.co.uk/twirssi-net-twitter-lite.git/blobdiff_plain/1acdbe928017001985960d17ff477f9e9f16d3d0..62ffee79c45cc75e65d88a23cc281623973007fa:/twirssi.pl

diff --git a/twirssi.pl b/twirssi.pl
index 2e73470..a61ed0b 100644
--- a/twirssi.pl
+++ b/twirssi.pl
@@ -11,8 +11,8 @@ $Data::Dumper::Indent = 1;
 
 use vars qw($VERSION %IRSSI);
 
-$VERSION = "2.1.2beta";
-my ($REV) = '$Rev: 499 $' =~ /(\d+)/;
+$VERSION = "2.1.3beta";
+my ($REV) = '$Rev: 546 $' =~ /(\d+)/;
 %IRSSI = (
     authors     => 'Dan Boger',
     contact     => 'zigdon@gmail.com',
@@ -21,7 +21,7 @@ my ($REV) = '$Rev: 499 $' =~ /(\d+)/;
       . 'Can optionally set your bitlbee /away message to same',
     license => 'GNU GPL v2',
     url     => 'http://twirssi.com',
-    changed => '$Date: 2009-03-02 12:51:50 -0800 (Mon, 02 Mar 2009) $',
+    changed => '$Date: 2009-03-13 10:37:30 -0700 (Fri, 13 Mar 2009) $',
 );
 
 my $window;
@@ -134,16 +134,7 @@ sub cmd_tweet_as {
 
     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);
 
@@ -235,16 +226,7 @@ sub cmd_reply_as {
         $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);
 
@@ -354,14 +336,26 @@ sub cmd_login {
     {
         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 );
-            while ( @user and @pass ) {
+            while ( @user and @unescaped ) {
                 $u = shift @user;
-                $p = shift @pass;
+                $p = shift @unescaped;
                 &cmd_login("$u $p");
             }
             return;
@@ -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;
+                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: $@";
@@ -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;
+        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;
@@ -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;
+        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;
@@ -911,6 +923,12 @@ sub monitor_child {
                     ( 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,
                   [
@@ -1127,8 +1145,10 @@ sub sig_complete {
       )
     {    # /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
@@ -1179,6 +1199,39 @@ sub hilight {
     return $text;
 }
 
+sub shorten {
+    my $data = shift;
+
+    my $provider = Irssi::settings_get_str("short_url_provider");
+    if ( &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(
@@ -1195,14 +1248,15 @@ 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", "twirssi_location",
-    ".irssi/scripts/twirssi.pl" );
+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_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_str( "twirssi", "twirssi_location",
+    ".irssi/scripts/twirssi.pl" );
+Irssi::settings_add_str( "twirssi", "twirssi_replies_store",
+    ".irssi/scripts/twirssi.json" );
 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 );
@@ -1317,12 +1371,12 @@ if ($window) {
     }
 
     if ( my $provider = Irssi::settings_get_str("short_url_provider") ) {
+        &notice("Loading WWW::Shorten::$provider...");
         eval "use WWW::Shorten::$provider;";
 
         if ($@) {
-            &notice(
-"Failed to load WWW::Shorten::$provider - either clear short_url_provider or install the CPAN module"
-            );
+            &notice( "Failed to load WWW::Shorten::$provider - either clear",
+                     "short_url_provider or install the CPAN module");
         }
     }