r555 - Fix hilighting given @service, again

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

diff --git a/twirssi.pl b/twirssi.pl
index a61ed0bd21d9d06869820200f53a6a7489b99d96..4bb7078ec646f0fcf2f20e6b0d3fffc5064714b5 100644 (file)
--- a/twirssi.pl
+++ b/twirssi.pl
@@ -6,13 +6,12 @@ use HTML::Entities;
 use File::Temp;
 use LWP::Simple;
 use Data::Dumper;
 use File::Temp;
 use LWP::Simple;
 use Data::Dumper;

-use Net::Twitter;

 $Data::Dumper::Indent = 1;
 
 use vars qw($VERSION %IRSSI);
 
 $VERSION = "2.1.3beta";
 $Data::Dumper::Indent = 1;
 
 use vars qw($VERSION %IRSSI);
 
 $VERSION = "2.1.3beta";

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

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


@@ -21,13 +20,14 @@ my ($REV) = '$Rev: 546 $' =~ /(\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-13 10:37:30 -0700 (Fri, 13 Mar 2009) $',
+    changed => '$Date: 2009-03-15 23:15:33 -0700 (Sun, 15 Mar 2009) $',

 );
 
 my $window;
 my $twit;
 my %twits;
 my $user;
 );
 
 my $window;
 my $twit;
 my %twits;
 my $user;

+my $defservice;

 my $poll;
 my $last_poll;
 my %nicks;
 my $poll;
 my $last_poll;
 my %nicks;


@@ -79,7 +79,7 @@ sub cmd_direct_as {
         return;
     }
 
         return;
     }
 

-    return unless &valid_username($username);
+    return unless $username = &valid_username($username);

 
     eval {
         if ( $twits{$username}
 
     eval {
         if ( $twits{$username}


@@ -115,7 +115,7 @@ sub cmd_tweet {
         return;
     }
 
         return;
     }
 

-    &cmd_tweet_as( "$user $data", $server, $win );
+    &cmd_tweet_as( "$user\@$defservice $data", $server, $win );

 }
 
 sub cmd_tweet_as {
 }
 
 sub cmd_tweet_as {


@@ -132,7 +132,7 @@ sub cmd_tweet_as {
         return;
     }
 
         return;
     }
 

-    return unless &valid_username($username);
+    return unless $username = &valid_username($username);

 
     $data = &shorten($data);
 
 
     $data = &shorten($data);
 


@@ -203,7 +203,7 @@ sub cmd_reply_as {
         return;
     }
 
         return;
     }
 

-    return unless &valid_username($username);
+    return unless $username = &valid_username($username);

 
     my $nick;
     $id =~ s/[^\w\d\-:]+//g;
 
     my $nick;
     $id =~ s/[^\w\d\-:]+//g;


@@ -298,10 +298,16 @@ sub cmd_switch {
     my ( $data, $server, $win ) = @_;
 
     $data =~ s/^\s+|\s+$//g;
     my ( $data, $server, $win ) = @_;
 
     $data =~ s/^\s+|\s+$//g;

+    $data = &normalize_username($data);

     if ( exists $twits{$data} ) {
         &notice("Switching to $data");
         $twit = $twits{$data};
     if ( exists $twits{$data} ) {
         &notice("Switching to $data");
         $twit = $twits{$data};

-        $user = $data;
+        if ( $data =~ /(.*)\@(.*)/ ) {
+            $user       = $1;
+            $defservice = $2;
+        } else {
+            &notice("Couldn't figure out what service '$data' is on");
+        }

     } else {
         &notice("Unknown user $data");
     }
     } else {
         &notice("Unknown user $data");
     }


@@ -312,7 +318,7 @@ sub cmd_logout {
 
     $data =~ s/^\s+|\s+$//g;
     $data = $user unless $data;
 
     $data =~ s/^\s+|\s+$//g;
     $data = $user unless $data;

-    return unless &valid_username($data);
+    return unless $data = &valid_username($data);

 
     &notice("Logging out $data...");
     $twits{$data}->end_session();
 
     &notice("Logging out $data...");
     $twits{$data}->end_session();


@@ -336,14 +342,14 @@ 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 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;
         # 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;
+            while ( $p =~ /\\$/ and @pass ) {
+                $p .= "," . shift @pass;

             }
             push @unescaped, $p;
         }
             }
             push @unescaped, $p;
         }


@@ -368,14 +374,29 @@ sub cmd_login {
 
     %friends = %nicks = ();
 
 
     %friends = %nicks = ();
 

-    $twit = Net::Twitter->new(
+    my $service;
+    if ( $user =~ /^(.*)@(twitter|identica)$/ ) {
+        ( $user, $service ) = ( $1, $2 );
+    } else {
+        $service = Irssi::settings_get_str("twirssi_default_service");
+    }
+    $defservice = $service = ucfirst lc $service;
+
+    eval "use Net::$service";
+    if ($@) {
+        &notice(
+            "Failed to load Net::$service when trying to log in as $user: $@");
+        return;
+    }
+
+    $twit = "Net::$service"->new(

         username => $user,
         password => $pass,
         source   => "twirssi"
     );
 
     unless ( $twit->verify_credentials() ) {
         username => $user,
         password => $pass,
         source   => "twirssi"
     );
 
     unless ( $twit->verify_credentials() ) {

-        &notice("Login as $user failed");
+        &notice("Login as $user\@$service failed");

         $twit = undef;
         if ( keys %twits ) {
             &cmd_switch( ( keys %twits )[0], $server, $win );
         $twit = undef;
         if ( keys %twits ) {
             &cmd_switch( ( keys %twits )[0], $server, $win );


@@ -393,10 +414,10 @@ sub cmd_login {
             return;
         }
 
             return;
         }
 

-        $twits{$user} = $twit;
+        $twits{"$user\@$service"} = $twit;

         Irssi::timeout_remove($poll) if $poll;
         $poll = Irssi::timeout_add( &get_poll_time * 1000, \&get_updates, "" );
         Irssi::timeout_remove($poll) if $poll;
         $poll = Irssi::timeout_add( &get_poll_time * 1000, \&get_updates, "" );

-        &notice("Logged in as $user, loading friends list...");
+        &notice("Logged in as $user\@$service, loading friends list...");

         &load_friends();
         &notice( "loaded friends: ", scalar keys %friends );
         if ( Irssi::settings_get_bool("twirssi_first_run") ) {
         &load_friends();
         &notice( "loaded friends: ", scalar keys %friends );
         if ( Irssi::settings_get_bool("twirssi_first_run") ) {


@@ -646,9 +667,7 @@ sub get_updates {
         my $new_poll = time;
 
         my $error = 0;
         my $new_poll = time;
 
         my $error = 0;

-        $error += &do_updates( $fh, $user, $twit );

         foreach ( keys %twits ) {
         foreach ( keys %twits ) {

-            next if $_ eq $user;

             $error += &do_updates( $fh, $_, $twits{$_} );
         }
 
             $error += &do_updates( $fh, $_, $twits{$_} );
         }
 


@@ -731,11 +750,11 @@ 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}) {
+                if ( $context->{truncated} and ref($obj) ne 'Net::Identica' ) {

                     printf $fh "id:%s 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}";

                 }
                 $reply = "reply";
             } elsif ($@) {
                 }
                 $reply = "reply";
             } elsif ($@) {


@@ -751,10 +770,10 @@ 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}) {
+        if ( $t->{truncated} and ref($obj) ne 'Net::Identica' ) {

             printf $fh "id:%s 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}, 
+              $t->{id} . "-url", $username,
+              $t->{user}{screen_name},

               "http://twitter.com/$t->{user}{screen_name}/status/$t->{id}";
         }
     }
               "http://twitter.com/$t->{user}{screen_name}/status/$t->{id}";
         }
     }


@@ -778,10 +797,10 @@ 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}) {
+        if ( $t->{truncated} ) {

             printf $fh "id:%s 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}, 
+              $t->{id} . "-url", $username,
+              $t->{user}{screen_name},

               "http://twitter.com/$t->{user}{screen_name}/status/$t->{id}";
         }
     }
               "http://twitter.com/$t->{user}{screen_name}/status/$t->{id}";
         }
     }


@@ -892,8 +911,17 @@ sub monitor_child {
             }
 
             my $account = "";
             }
 
             my $account = "";

-            if ( $meta{account} ne $user ) {
-                $account = "$meta{account}: ";
+            if ( lc $meta{account} ne lc "$user\@$defservice" ) {
+                $meta{account} =~ s/\@(\w+)$//;
+                my $service = $1;
+                if (
+                    lc $service eq
+                    lc Irssi::settings_get_str("twirssi_default_service") )
+                {
+                    $account = "$meta{account}: ";
+                } else {
+                    $account = "$meta{account}\@$service: ";
+                }

             }
 
             my $marker = "";
             }
 
             my $marker = "";


@@ -910,8 +938,10 @@ sub monitor_child {
 
             my $hilight_color =
               $irssi_to_mirc_colors{ Irssi::settings_get_str("hilight_color") };
 
             my $hilight_color =
               $irssi_to_mirc_colors{ Irssi::settings_get_str("hilight_color") };

-            if ( ( $_ =~ /\@$meta{account}\W/i )
-                && Irssi::settings_get_bool("twirssi_hilights") )
+            my $nick =
+              '@' . substr( $meta{account}, 0, index( $meta{account}, "@" ) );
+            if ( $_ =~ /\Q$nick\E(?:\W|$)/i
+                and Irssi::settings_get_bool("twirssi_hilights") )

             {
                 $meta{nick} = "\cC$hilight_color$meta{nick}\cO";
                 $hilight = MSGLEVEL_HILIGHT;
             {
                 $meta{nick} = "\cC$hilight_color$meta{nick}\cO";
                 $hilight = MSGLEVEL_HILIGHT;


@@ -925,10 +955,7 @@ sub monitor_child {
                   ];
             } elsif ( $meta{type} eq 'ellispis' ) {
                 push @lines,
                   ];
             } elsif ( $meta{type} eq 'ellispis' ) {
                 push @lines,

-                  [
-                    MSGLEVEL_PUBLIC,
-                    "tweet", $account, $meta{nick}, "", $_
-                  ];
+                  [ MSGLEVEL_PUBLIC, "tweet", $account, $meta{nick}, "", $_ ];

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


@@ -1117,12 +1144,14 @@ sub too_long {
 sub valid_username {
     my $username = shift;
 
 sub valid_username {
     my $username = shift;
 

+    $username = &normalize_username($username);
+

     unless ( exists $twits{$username} ) {
         &notice("Unknown username $username");
     unless ( exists $twits{$username} ) {
         &notice("Unknown username $username");

-        return 0;
+        return undef;

     }
 
     }
 

-    return 1;
+    return $username;

 }
 
 sub logged_in {
 }
 
 sub logged_in {


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

-        @$complist = map { "$_:$id_map{__indexes}{$_}" } 
-          sort {$nicks{$b} <=> $nicks{$a}}
+        @$complist = map { "$_:$id_map{__indexes}{$_}" }
+          sort { $nicks{$b} <=> $nicks{$a} }

           grep /^\Q$word/i,
           keys %{ $id_map{__indexes} };
     }
           grep /^\Q$word/i,
           keys %{ $id_map{__indexes} };
     }


@@ -1203,15 +1232,24 @@ sub shorten {
     my $data = shift;
 
     my $provider = Irssi::settings_get_str("short_url_provider");
     my $data = shift;
 
     my $provider = Irssi::settings_get_str("short_url_provider");

-    if ( &too_long( $data, 1 ) and $provider )
+    if (
+        (
+            Irssi::settings_get_bool("twirssi_always_shorten")
+            or &too_long( $data, 1 )
+        )
+        and $provider
+      )

     {
         my @args;
     {
         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.");
+        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;
             }
         }
                 return $data;
             }
         }


@@ -1232,6 +1270,32 @@ sub shorten {
     return $data;
 }
 
     return $data;
 }
 

+sub normalize_username {
+    my $user = shift;
+
+    my ( $username, $service ) = split /\@/, $user, 2;
+    if ($service) {
+        $service = ucfirst lc $service;
+    } else {
+        $service =
+          ucfirst lc Irssi::settings_get_str("twirssi_default_service");
+        unless ( exists $twits{"$username\@$service"} ) {
+            $service = undef;
+            foreach my $t ( sort keys %twits ) {
+                next unless $t =~ /^\Q$username\E\@(Twitter|Identica)/;
+                $service = $1;
+                last;
+            }
+
+            unless ($service) {
+                &notice("Can't find a logged in user '$user'");
+            }
+        }
+    }
+
+    return "$username\@$service";
+}
+

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


@@ -1245,14 +1309,15 @@ 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", "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", "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_default_service", "Twitter" );
+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::settings_add_str( "twirssi", "twirssi_location",
     ".irssi/scripts/twirssi.pl" );
 Irssi::settings_add_str( "twirssi", "twirssi_replies_store",


@@ -1268,6 +1333,7 @@ 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;
 Irssi::settings_add_bool( "twirssi", "tweet_window_input",        0 );
 
 $last_poll = time - &get_poll_time;


@@ -1297,6 +1363,7 @@ if ($window) {
     Irssi::command_bind( "twitter_unsubscribe",        "cmd_del_search" );
     Irssi::command_bind( "twitter_list_subscriptions", "cmd_list_search" );
     Irssi::command_bind( "twirssi_upgrade",            "cmd_upgrade" );
     Irssi::command_bind( "twitter_unsubscribe",        "cmd_del_search" );
     Irssi::command_bind( "twitter_list_subscriptions", "cmd_list_search" );
     Irssi::command_bind( "twirssi_upgrade",            "cmd_upgrade" );

+    Irssi::command_bind( "twitter_updates",            "get_updates" );

     if ( Irssi::settings_get_bool("twirssi_use_reply_aliases") ) {
         Irssi::command_bind( "reply",    "cmd_reply" );
         Irssi::command_bind( "reply_as", "cmd_reply_as" );
     if ( Irssi::settings_get_bool("twirssi_use_reply_aliases") ) {
         Irssi::command_bind( "reply",    "cmd_reply" );
         Irssi::command_bind( "reply_as", "cmd_reply_as" );


@@ -1305,7 +1372,8 @@ if ($window) {
         "twirssi_dump",
         sub {
             print "twits: ", join ", ",
         "twirssi_dump",
         sub {
             print "twits: ", join ", ",

-              map { "u: $_->{username}" } values %twits;
+              map { "u: $_->{username}\@" . ref($_) } values %twits;
+            print "selected: $user\@$defservice";

             print "friends: ", join ", ", sort keys %friends;
             print "nicks: ",   join ", ", sort keys %nicks;
             print "searches: ", Dumper \%{ $id_map{__searches} };
             print "friends: ", join ", ", sort keys %friends;
             print "nicks: ",   join ", ", sort keys %nicks;
             print "searches: ", Dumper \%{ $id_map{__searches} };


@@ -1343,7 +1411,14 @@ if ($window) {
             sub { &notice("Stopped following $_[0]"); delete $nicks{ $_[0] }; }
         )
     );
             sub { &notice("Stopped following $_[0]"); delete $nicks{ $_[0] }; }
         )
     );

-    Irssi::command_bind( "twitter_updates", "get_updates" );
+    Irssi::command_bind(
+        "twitter_device_updates",
+        &gen_cmd(
+            "/twitter_device_updates none|im|sms",
+            "update_delivery_device",
+            sub { &notice("Device updated to $_[0]"); }
+        )
+    );

     Irssi::signal_add_last( 'complete word' => \&sig_complete );
 
     &notice("  %Y<%C(%B^%C)%N                   TWIRSSI v%R$VERSION%N (r$REV)");
     Irssi::signal_add_last( 'complete word' => \&sig_complete );
 
     &notice("  %Y<%C(%B^%C)%N                   TWIRSSI v%R$VERSION%N (r$REV)");


@@ -1375,8 +1450,10 @@ if ($window) {
         eval "use WWW::Shorten::$provider;";
 
         if ($@) {
         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"
+            );

         }
     }
 
         }
     }