r522 - Allow escaping commas in the twitter_password variables

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

diff --git a/twirssi.pl b/twirssi.pl
index 8d5b813bd2a1689a44d7610ea4c103c679cb0d0a..44fae63fbbab12e5f3c808a181596377a080d32a 100644 (file)
--- a/twirssi.pl
+++ b/twirssi.pl
@@ -12,7 +12,7 @@ $Data::Dumper::Indent = 1;
 use vars qw($VERSION %IRSSI);
 
 $VERSION = "2.1.2beta";
 use vars qw($VERSION %IRSSI);
 
 $VERSION = "2.1.2beta";

-my ($REV) = '$Rev: 519 $' =~ /(\d+)/;
+my ($REV) = '$Rev: 522 $' =~ /(\d+)/;

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


@@ -21,7 +21,7 @@ my ($REV) = '$Rev: 519 $' =~ /(\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-03-07 13:30:43 -0800 (Sat, 07 Mar 2009) $',
+    changed => '$Date: 2009-03-07 14:07:25 -0800 (Sat, 07 Mar 2009) $',

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


@@ -354,14 +354,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;


@@ -738,7 +750,7 @@ sub do_updates {
                   $context->{id}, $username,
                   $context->{user}{screen_name}, $ctext;
                 if ($context->{truncated}) {
                   $context->{id}, $username,
                   $context->{user}{screen_name}, $ctext;
                 if ($context->{truncated}) {

-                    printf $fh "id:%d account:%s nick:%s type:ellispis %s\n",
+                    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}";
                       $context->{id}."-url", $username,
                       $context->{user}{screen_name}, 
                       "http://twitter.com/$context->{user}{screen_name}/status/$context->{id}";


@@ -758,7 +770,7 @@ sub do_updates {
         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:%d account:%s nick:%s type:%s %s\n",
           $t->{id}, $username, $t->{user}{screen_name}, $reply, $text;
         if ($t->{truncated}) {

-            printf $fh "id:%d account:%s nick:%s type:ellispis %s\n",
+            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}";
               $t->{id}."-url", $username,
               $t->{user}{screen_name}, 
               "http://twitter.com/$t->{user}{screen_name}/status/$t->{id}";


@@ -785,7 +797,7 @@ sub do_updates {
         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:%d account:%s nick:%s type:tweet %s\n",
           $t->{id}, $username, $t->{user}{screen_name}, $text;
         if ($t->{truncated}) {

-            printf $fh "id:%d account:%s nick:%s type:ellispis %s\n",
+            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}";
               $t->{id}."-url", $username,
               $t->{user}{screen_name}, 
               "http://twitter.com/$t->{user}{screen_name}/status/$t->{id}";


@@ -929,6 +941,12 @@ 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,
                   [


@@ -1145,8 +1163,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