Make work with Net::Twitter::Lite

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

diff --git a/twirssi.pl b/twirssi.pl
index c5384cfccaaccd50c4edbd47f9bffaed170fdff1..45faf6fe4e3c2e38b7342e7f3e82c0bac5b4e504 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::Lite

 $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,70 +509,23 @@ 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") ) {
-        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 ( $twit ) {
-            if (open( OAUTH, Irssi::settings_get_str("twirssi_oauth_store") ) ) {
-                while (<OAUTH>) {
-                    chomp;
-                    next unless m/$user\@$service (\S+) (\S+)/i;
-                    print "Trying cached oauth creds for $user\@$service" if &debug;
-                    $twit->access_token($1);
-                    $twit->access_token_secret($2);
-                    last;
-                }
-                close OAUTH;
-            }
-
-            unless ( $twit->authorized ) {
-                &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);
-
-                $oauth{pending}{"$user\@$service"} = $twit;
-                return;
-            }
-        }
-    } else { 
-        $twit = "Net::$service"->new(
-            username => $user,
-            password => $pass,
-            source   => "twirssi",
-            ssl      => Irssi::settings_get_bool("twirssi_avoid_ssl") ? 0 : 1,
-        );
-    }
+    $twit = Net::Twitter::Lite->new(
+        username => $user,
+        password => $pass,
+    );

 
     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 +555,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 +581,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 +615,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;
     }


@@ -671,7 +626,7 @@ sub verify_twitter_object {
     $poll = Irssi::timeout_add( &get_poll_time * 1000, \&get_updates, "" );
     &notice("Logged in as $user\@$service, loading friends list...");
     &load_friends();
     $poll = Irssi::timeout_add( &get_poll_time * 1000, \&get_updates, "" );
     &notice("Logged in as $user\@$service, loading friends list...");
     &load_friends();

-    &notice( "loaded friends: ", scalar keys %friends );
+    &notice( "loaded friends: ". scalar keys %friends );

     if ( Irssi::settings_get_bool("twirssi_first_run") ) {
         Irssi::settings_set_bool( "twirssi_first_run", 0 );
     }
     if ( Irssi::settings_get_bool("twirssi_first_run") ) {
         Irssi::settings_set_bool( "twirssi_first_run", 0 );
     }


@@ -933,7 +888,8 @@ sub load_friends {
     };
 
     if ($@) {
     };
 
     if ($@) {

-        print $fh "type:debug Error during friends list update.  Aborted.\n";
+        print $fh "type:debug Error during friends list update.  Aborted.\n"
+          if $fh;

         return;
     }
 
         return;
     }
 


@@ -1043,11 +999,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;


@@ -1544,7 +1502,7 @@ sub monitor_child {
         }
 
         if ( not $failwhale and time - $last_poll > 60 * 60 ) {
         }
 
         if ( not $failwhale and time - $last_poll > 60 * 60 ) {

-            foreach my $whale (
+            &ccrap(

                 q{     v  v        v},
                 q{     |  |  v     |  v},
                 q{     | .-, |     |  |},
                 q{     v  v        v},
                 q{     |  |  v     |  v},
                 q{     | .-, |     |  |},


@@ -1553,10 +1511,7 @@ sub monitor_child {
                 q{      \\          a    |},
                 q{       ',.__.   ,__.-'/},
                 q{         '--/_.'----'`}
                 q{      \\          a    |},
                 q{       ',.__.   ,__.-'/},
                 q{         '--/_.'----'`}

-              )
-            {
-                &ccrap($whale);
-            }
+              );

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


@@ -1571,11 +1526,15 @@ sub debug {
 }
 
 sub notice {
 }
 
 sub notice {

-    $window->print( "%R***%n @_", MSGLEVEL_PUBLIC );
+    foreach my $msg (@_) {
+        $window->print( "%R***%n $msg", MSGLEVEL_PUBLIC );
+    }

 }
 
 sub ccrap {
 }
 
 sub ccrap {

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

 }
 
 sub update_away {
 }
 
 sub update_away {


@@ -1785,7 +1744,7 @@ sub get_text {
         if ( exists $tweet->{retweeted_status} ) {
             $text = "RT \@$tweet->{retweeted_status}{user}{screen_name}: "
               . "$tweet->{retweeted_status}{text}";
         if ( exists $tweet->{retweeted_status} ) {
             $text = "RT \@$tweet->{retweeted_status}{user}{screen_name}: "
               . "$tweet->{retweeted_status}{text}";

-        } elsif ( $object->isa('Net::Twitter') ) {
+        } elsif ( $object->isa('Net::Twitter::Lite') ) {

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


@@ -1821,11 +1780,11 @@ Irssi::settings_add_str( "twirssi", "twirssi_topic_color",     "%r" );
 Irssi::settings_add_str( "twirssi", "twirssi_retweet_format",
     'RT $n: "$t" ${-- $c$}' );
 Irssi::settings_add_str( "twirssi", "twirssi_location",
 Irssi::settings_add_str( "twirssi", "twirssi_retweet_format",
     'RT $n: "$t" ${-- $c$}' );
 Irssi::settings_add_str( "twirssi", "twirssi_location",

-    "$ENV{HOME}/.irssi/scripts/twirssi.pl" );
+    Irssi::get_irssi_dir . "/scripts/twirssi.pl" );

 Irssi::settings_add_str( "twirssi", "twirssi_replies_store",
 Irssi::settings_add_str( "twirssi", "twirssi_replies_store",

-    "$ENV{HOME}/.irssi/scripts/twirssi.json" );
+    Irssi::get_irssi_dir . "/scripts/twirssi.json" );

 Irssi::settings_add_str( "twirssi", "twirssi_oauth_store",
 Irssi::settings_add_str( "twirssi", "twirssi_oauth_store",

-    "$ENV{HOME}/.irssi/scripts/twirssi.oauth" );
+    Irssi::get_irssi_dir . "/scripts/twirssi.oauth" );

 
 Irssi::settings_add_int( "twirssi", "twitter_friends_poll", 600 );
 Irssi::settings_add_int( "twirssi", "twitter_timeout",      30 );
 
 Irssi::settings_add_int( "twirssi", "twitter_friends_poll", 600 );
 Irssi::settings_add_int( "twirssi", "twitter_timeout",      30 );


@@ -1908,8 +1867,8 @@ if ($window) {
             &notice(
                 "Twirssi v$VERSION; "
                   . (
             &notice(
                 "Twirssi v$VERSION; "
                   . (

-                    $Net::Twitter::VERSION
-                    ? "Net::Twitter v$Net::Twitter::VERSION. "
+                    $Net::Twitter::Lite::VERSION
+                    ? "Net::Twitter v$Net::Twitter::Lite::VERSION. "

                     : ""
                   )
                   . (
                     : ""
                   )
                   . (


@@ -1965,10 +1924,9 @@ if ($window) {
     );
     Irssi::signal_add_last( 'complete word' => \&sig_complete );
 
     );
     Irssi::signal_add_last( 'complete word' => \&sig_complete );
 

-    &notice("  %Y<%C(%B^%C)%N                   TWIRSSI v%R$VERSION%N");
-    &notice("   %C(_(\\%N           http://twirssi.com/ for full docs");
-    &notice(
-        "    %Y||%C `%N Log in with /twitter_login, send updates with /tweet");
+    &notice("  %Y<%C(%B^%C)%N                   TWIRSSI v%R$VERSION%N",
+            "   %C(_(\\%N           http://twirssi.com/ for full docs",
+            "    %Y||%C `%N Log in with /twitter_login, send updates with /tweet");

 
     my $file = Irssi::settings_get_str("twirssi_replies_store");
     if ( $file and -r $file ) {
 
     my $file = Irssi::settings_get_str("twirssi_replies_store");
     if ( $file and -r $file ) {


@@ -2002,9 +1960,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;
     }