Better separation of arguments to Twitter and Identica

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

diff --git a/twirssi.pl b/twirssi.pl
index c5384cfccaaccd50c4edbd47f9bffaed170fdff1..b0e31068fd04a20f3b94ed057cf33068c71f81b1 100644 (file)
--- a/twirssi.pl
+++ b/twirssi.pl
@@ -8,11 +8,12 @@ use LWP::Simple;
 use Data::Dumper;
 use Encode;
 use POSIX qw/:sys_wait_h/;
 use Data::Dumper;
 use Encode;
 use POSIX qw/:sys_wait_h/;

+use Net::Twitter qw/3.05/;

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

-$VERSION = "2.4.0beta";
+$VERSION = "2.4.1beta";

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


@@ -21,7 +22,7 @@ $VERSION = "2.4.0beta";
       . '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-08-07 01:24:53 -0700 (Fri, 07 Aug 2009) $',
+    changed => 'Fri Jan 22 14:40:48 PST 2010',

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


@@ -430,7 +431,7 @@ sub cmd_logout {
     return unless $data = &valid_username($data);
 
     &notice("Logging out $data...");
     return unless $data = &valid_username($data);
 
     &notice("Logging out $data...");

-    $twits{$data}->end_session();
+    eval { $twits{$data}->end_session(); };

     delete $twits{$data};
     undef $twit;
     if ( keys %twits ) {
     delete $twits{$data};
     undef $twit;
     if ( keys %twits ) {


@@ -448,14 +449,15 @@ sub cmd_login {
     if ($data) {
         print "manual data login" if &debug;
         ( $user, $pass ) = split ' ', $data, 2;
     if ($data) {
         print "manual data login" if &debug;
         ( $user, $pass ) = split ' ', $data, 2;

-        unless (Irssi::settings_get_bool("twirssi_use_oauth") or $pass) {
+        unless ( Irssi::settings_get_bool("twirssi_use_oauth") or $pass ) {

             &notice("usage: /twitter_login <username>[\@<service>] <password>");
             return;
         }
             &notice("usage: /twitter_login <username>[\@<service>] <password>");
             return;
         }

-    } elsif ( Irssi::settings_get_bool("twirssi_use_oauth") and
-              my $autouser = Irssi::settings_get_str("twitter_usernames") ) {
+    } elsif ( Irssi::settings_get_bool("twirssi_use_oauth")
+        and my $autouser = Irssi::settings_get_str("twitter_usernames") )
+    {

         print "oauth autouser login" if &debug;
         print "oauth autouser login" if &debug;

-        foreach my $user (split /,/, $autouser) {
+        foreach my $user ( split /,/, $autouser ) {

             &cmd_login($user);
         }
         return;
             &cmd_login($user);
         }
         return;


@@ -493,7 +495,7 @@ sub cmd_login {
         &notice("/twitter_login requires either a username/password "
               . "or twitter_usernames and twitter_passwords to be set. "
               . "Note that if twirssi_use_oauth is true, passwords are "
         &notice("/twitter_login requires either a username/password "
               . "or twitter_usernames and twitter_passwords to be set. "
               . "Note that if twirssi_use_oauth is true, passwords are "

-              . "not required");
+              . "not required" );

         return;
     }
 
         return;
     }
 


@@ -507,32 +509,39 @@ sub cmd_login {
     }
     $defservice = $service = ucfirst lc $service;
 
     }
     $defservice = $service = ucfirst lc $service;
 

-    print "Loading Net::$service" if &debug;
-    eval "use Net::$service 3.05";
-    if ($@) {
-        &notice(
-            "Failed to load Net::$service when trying to log in as $user: $@");
-        return;
-    }
-
-    if ( Irssi::settings_get_bool("twirssi_use_oauth") ) {
+    if ( $service eq 'Twitter'
+        and Irssi::settings_get_bool("twirssi_use_oauth") )
+    {

         print "Attempting OAuth for $user\@$service" if &debug;
         eval {
         print "Attempting OAuth for $user\@$service" if &debug;
         eval {

-            $twit = "Net::$service"->new(
-                traits       => [ 'API::REST', 'OAuth' ],
-                consumer_key => 'BZVAvBma4GxdiRwXIvbnw',
-                consumer_secret => '0T5kahwLyb34vciGZsgkA9lsjtGCQ05vxVE2APXM',
-                source          => "twirssi",
-                ssl => Irssi::settings_get_bool("twirssi_avoid_ssl") ? 0 : 1,
-            );
+            if ( $service eq 'Identica' )
+            {
+                $twit = Net::Twitter->new(
+                    identica => 1,
+                    traits   => [ 'API::REST' ],
+                    source   => "twirssi",
+                    ssl      => !Irssi::settings_get_bool("twirssi_avoid_ssl"),
+                );
+            } else {
+                $twit = Net::Twitter->new(
+                    traits       => [ 'API::REST', 'OAuth' ],
+                    consumer_key => 'BZVAvBma4GxdiRwXIvbnw',
+                    consumer_secret =>
+                      '0T5kahwLyb34vciGZsgkA9lsjtGCQ05vxVE2APXM',
+                    source => "twirssi",
+                    ssl    => !Irssi::settings_get_bool("twirssi_avoid_ssl"),
+                );
+            }

         };
 
         };
 

-        if ( $twit ) {
-            if (open( OAUTH, Irssi::settings_get_str("twirssi_oauth_store") ) ) {
+        if ($twit) {
+            if ( open( OAUTH, Irssi::settings_get_str("twirssi_oauth_store") ) )
+            {

                 while (<OAUTH>) {
                     chomp;
                     next unless m/$user\@$service (\S+) (\S+)/i;
                 while (<OAUTH>) {
                     chomp;
                     next unless m/$user\@$service (\S+) (\S+)/i;

-                    print "Trying cached oauth creds for $user\@$service" if &debug;
+                    print "Trying cached oauth creds for $user\@$service"
+                      if &debug;

                     $twit->access_token($1);
                     $twit->access_token_secret($2);
                     last;
                     $twit->access_token($1);
                     $twit->access_token_secret($2);
                     last;


@@ -541,17 +550,30 @@ sub cmd_login {
             }
 
             unless ( $twit->authorized ) {
             }
 
             unless ( $twit->authorized ) {

+                my $url;
+                eval { $url = $twit->get_authorization_url; };
+
+                if ($@) {
+                    &notice(
+"ERROR: Failed to get OAuth authorization_url.  Try again later."
+                    );
+                    return;
+                }
+

                 &notice("Twirssi not autorized to access $service for $user.");
                 &notice("Twirssi not autorized to access $service for $user.");

-                &notice("Please authorize at the following url, then enter the pin ");
-                &notice("supplied with /twirssi_oath $user\@$service <pin>");
-                &notice($twit->get_authorization_url);
+                &notice(
+                    "Please authorize at the following url, then enter the pin "
+                );
+                &notice("supplied with /twirssi_oauth $user\@$service <pin>");
+                &notice($url);

 
                 $oauth{pending}{"$user\@$service"} = $twit;
                 return;
             }
         }
 
                 $oauth{pending}{"$user\@$service"} = $twit;
                 return;
             }
         }

-    } else { 
-        $twit = "Net::$service"->new(
+    } else {
+        $twit = Net::Twitter->new(
+            $service eq 'Identica' ? ( identica => 1 ) : (),

             username => $user,
             password => $pass,
             source   => "twirssi",
             username => $user,
             password => $pass,
             source   => "twirssi",


@@ -560,17 +582,17 @@ sub cmd_login {
     }
 
     unless ($twit) {
     }
 
     unless ($twit) {

-        &notice("Failed to create Net::$service object!  Aborting.");
+        &notice("Failed to create object!  Aborting.");

         return;
     }
 
         return;
     }
 

-    return &verify_twitter_object($server, $win, $user, $service, $twit);
+    return &verify_twitter_object( $server, $win, $user, $service, $twit );

 }
 
 sub cmd_oauth {
 }
 
 sub cmd_oauth {

-    my ($data, $server, $win) = @_;
+    my ( $data, $server, $win ) = @_;

     my ( $key, $pin ) = split ' ', $data;
     my ( $key, $pin ) = split ' ', $data;

-    my ($user, $service);
+    my ( $user, $service );

     $key = &normalize_username($key);
     if ( $key =~ /^(.*)@(Twitter|Identica)$/ ) {
         ( $user, $service ) = ( $1, $2 );
     $key = &normalize_username($key);
     if ( $key =~ /^(.*)@(Twitter|Identica)$/ ) {
         ( $user, $service ) = ( $1, $2 );


@@ -600,21 +622,21 @@ sub cmd_oauth {
 
     my $store_file = Irssi::settings_get_str("twirssi_oauth_store");
     if ($store_file) {
 
     my $store_file = Irssi::settings_get_str("twirssi_oauth_store");
     if ($store_file) {

-        my %store;
+        my @store;

         if ( open( OAUTH, $store_file ) ) {
             while (<OAUTH>) {
                 chomp;
         if ( open( OAUTH, $store_file ) ) {
             while (<OAUTH>) {
                 chomp;

-                my ( $k, $v ) = split ' ', 2;
-                $store{$k} = $v;
+                next if /$key/i;
+                push @store, $_;

             }
             close OAUTH;
 
         }
 
             }
             close OAUTH;
 
         }
 

-        $store{$key} = "$access_token $access_token_secret";
+        push @store, "$key $access_token $access_token_secret";

 
         if ( open( OAUTH, ">$store_file.new" ) ) {
 
         if ( open( OAUTH, ">$store_file.new" ) ) {

-            print OAUTH "$_ $store{$_}\n" foreach keys %store;
+            print OAUTH "$_\n" foreach @store;

             close OAUTH;
             rename "$store_file.new", $store_file
               or &notice("Failed to rename $store_file.new: $!");
             close OAUTH;
             rename "$store_file.new", $store_file
               or &notice("Failed to rename $store_file.new: $!");


@@ -626,11 +648,11 @@ sub cmd_oauth {
               . "Please /set twirssi_oauth_store to a writable filename." );
     }
 
               . "Please /set twirssi_oauth_store to a writable filename." );
     }
 

-    return &verify_twitter_object($server, $win, $user, $service, $twit);
+    return &verify_twitter_object( $server, $win, $user, $service, $twit );

 }
 
 sub verify_twitter_object {
 }
 
 sub verify_twitter_object {

-    my ($server, $win, $user, $service, $twit) = @_;
+    my ( $server, $win, $user, $service, $twit ) = @_;

 
     if ( my $timeout = Irssi::settings_get_int("twitter_timeout")
         and $twit->can('ua') )
 
     if ( my $timeout = Irssi::settings_get_int("twitter_timeout")
         and $twit->can('ua') )


@@ -660,7 +682,7 @@ sub verify_twitter_object {
     my $rate_limit = $twit->rate_limit_status();
     if ( $rate_limit and $rate_limit->{remaining_hits} < 1 ) {
         &notice(
     my $rate_limit = $twit->rate_limit_status();
     if ( $rate_limit and $rate_limit->{remaining_hits} < 1 ) {
         &notice(

-            "Rate limit exceeded, try again after $rate_limit->{reset_time}" );
+            "Rate limit exceeded, try again after $rate_limit->{reset_time}");

         $twit = undef;
         return;
     }
         $twit = undef;
         return;
     }


@@ -1043,11 +1065,13 @@ sub get_updates {
 sub do_updates {
     my ( $fh, $username, $obj, $cache ) = @_;
 
 sub do_updates {
     my ( $fh, $username, $obj, $cache ) = @_;
 

-    my $rate_limit = $obj->rate_limit_status();
-    if ( $rate_limit and $rate_limit->{remaining_hits} < 1 ) {
-        &notice("Rate limit exceeded for $username");
-        return undef;
-    }
+    eval {
+        my $rate_limit = $obj->rate_limit_status();
+        if ( $rate_limit and $rate_limit->{remaining_hits} < 1 ) {
+            &notice("Rate limit exceeded for $username");
+            return undef;
+        }
+    };

 
     print scalar localtime, " - Polling for updates for $username" if &debug;
     my $tweets;
 
     print scalar localtime, " - Polling for updates for $username" if &debug;
     my $tweets;


@@ -2002,9 +2026,7 @@ if ($window) {
         }
     }
 
         }
     }
 

-    if (    my $autouser = Irssi::settings_get_str("twitter_usernames")
-        and my $autopass = Irssi::settings_get_str("twitter_passwords") )
-    {
+    if ( my $autouser = Irssi::settings_get_str("twitter_usernames") ) {

         &cmd_login();
         &get_updates;
     }
         &cmd_login();
         &get_updates;
     }