Use Irssi::get_irssi_dir instead of $ENV{HOME}

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

diff --git a/twirssi.pl b/twirssi.pl
index 5295231f8c07ede5bb0be5239227ab779679b4b2..e4822c0570e1be734b3c87016e17fed8542d0f79 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 Net::Twitter qw/3.05/;
 $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',
@@ -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',
-    changed => '$Date: 2009-08-07 01:24:53 -0700 (Fri, 07 Aug 2009) $',
+    changed => 'Fri Jan 22 14:40:48 PST 2010',
 );
 
 my $window;
@@ -430,9 +431,7 @@ sub cmd_logout {
     return unless $data = &valid_username($data);
 
     &notice("Logging out $data...");
-    eval {
-        $twits{$data}->end_session();
-    };
+    eval { $twits{$data}->end_session(); };
     delete $twits{$data};
     undef $twit;
     if ( keys %twits ) {
@@ -450,14 +449,15 @@ sub cmd_login {
     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;
         }
-    } 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;
-        foreach my $user (split /,/, $autouser) {
+        foreach my $user ( split /,/, $autouser ) {
             &cmd_login($user);
         }
         return;
@@ -495,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 "
-              . "not required");
+              . "not required" );
         return;
     }
 
@@ -509,32 +509,39 @@ sub cmd_login {
     }
     $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 {
-            $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', 'API::Search' ],
+                    source   => "twirssi",
+                    ssl      => !Irssi::settings_get_bool("twirssi_avoid_ssl"),
+                );
+            } else {
+                $twit = Net::Twitter->new(
+                    traits => [ 'API::REST', 'OAuth', 'API::Search' ],
+                    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;
-                    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;
@@ -543,17 +550,20 @@ sub cmd_login {
             }
 
             unless ( $twit->authorized ) {
-                eval {
-                    my $url = $twit->get_authorization_url;
-                };
+                my $url;
+                eval { $url = $twit->get_authorization_url; };
 
                 if ($@) {
-                    &notice("ERROR: Failed to get OAuth authorization_url.  Try again later.");
+                    &notice(
+"ERROR: Failed to get OAuth authorization_url.  Try again later."
+                    );
                     return;
                 }
 
                 &notice("Twirssi not autorized to access $service for $user.");
-                &notice("Please authorize at the following url, then enter the pin ");
+                &notice(
+                    "Please authorize at the following url, then enter the pin "
+                );
                 &notice("supplied with /twirssi_oauth $user\@$service <pin>");
                 &notice($url);
 
@@ -561,8 +571,9 @@ sub cmd_login {
                 return;
             }
         }
-    } else { 
-        $twit = "Net::$service"->new(
+    } else {
+        $twit = Net::Twitter->new(
+            $service eq 'Identica' ? ( identica => 1 ) : (),
             username => $user,
             password => $pass,
             source   => "twirssi",
@@ -571,17 +582,17 @@ sub cmd_login {
     }
 
     unless ($twit) {
-        &notice("Failed to create Net::$service object!  Aborting.");
+        &notice("Failed to create object!  Aborting.");
         return;
     }
 
-    return &verify_twitter_object($server, $win, $user, $service, $twit);
+    return &verify_twitter_object( $server, $win, $user, $service, $twit );
 }
 
 sub cmd_oauth {
-    my ($data, $server, $win) = @_;
+    my ( $data, $server, $win ) = @_;
     my ( $key, $pin ) = split ' ', $data;
-    my ($user, $service);
+    my ( $user, $service );
     $key = &normalize_username($key);
     if ( $key =~ /^(.*)@(Twitter|Identica)$/ ) {
         ( $user, $service ) = ( $1, $2 );
@@ -637,11 +648,11 @@ sub cmd_oauth {
               . "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 {
-    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') )
@@ -671,7 +682,7 @@ sub verify_twitter_object {
     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;
     }
@@ -944,7 +955,8 @@ sub load_friends {
     };
 
     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;
     }
 
@@ -1834,11 +1846,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",
-    "$ENV{HOME}/.irssi/scripts/twirssi.pl" );
+    Irssi::get_irssi_dir . "/.irssi/scripts/twirssi.pl" );
 Irssi::settings_add_str( "twirssi", "twirssi_replies_store",
-    "$ENV{HOME}/.irssi/scripts/twirssi.json" );
+    Irssi::get_irssi_dir . "/.irssi/scripts/twirssi.json" );
 Irssi::settings_add_str( "twirssi", "twirssi_oauth_store",
-    "$ENV{HOME}/.irssi/scripts/twirssi.oauth" );
+    Irssi::get_irssi_dir . "/.irssi/scripts/twirssi.oauth" );
 
 Irssi::settings_add_int( "twirssi", "twitter_friends_poll", 600 );
 Irssi::settings_add_int( "twirssi", "twitter_timeout",      30 );