From: Brett Parker <iDunno@sommitrealweird.co.uk>
Date: Fri, 14 May 2010 15:16:55 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/zigdon/twirssi
X-Git-Url: https://git.sommitrealweird.co.uk/twirssi-net-twitter-lite.git/commitdiff_plain/refs/heads/master?hp=76607217eddfafc97688f74f8b686ae59e13f4a0

Merge branch 'master' of git://github.com/zigdon/twirssi

Conflicts:
	twirssi.pl
---

diff --git a/twirssi.pl b/twirssi.pl
index 0e372c7..7099013 100644
--- a/twirssi.pl
+++ b/twirssi.pl
@@ -8,7 +8,7 @@ use LWP::Simple;
 use Data::Dumper;
 use Encode;
 use POSIX qw/:sys_wait_h/;
-use Net::Twitter qw/3.05/;
+use Net::Twitter::Lite
 $Data::Dumper::Indent = 1;
 
 use vars qw($VERSION %IRSSI);
@@ -497,76 +497,10 @@ sub cmd_login {
     }
     $defservice = $service = ucfirst lc $service;
 
-    if ( $service eq 'Twitter'
-        and Irssi::settings_get_bool("twirssi_use_oauth") )
-    {
-        print "Attempting OAuth for $user\@$service" if &debug;
-        eval {
-            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") ) )
-            {
-                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 ) {
-                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.",
-                    "Please authorize at the following url, then enter the pin",
-                    "supplied with /twirssi_oauth $user\@$service <pin>",
-                    $url
-                );
-
-                $oauth{pending}{"$user\@$service"} = $twit;
-                return;
-            }
-        }
-    } else {
-        $twit = Net::Twitter->new(
-            $service eq 'Identica' ? ( identica => 1 ) : (),
-            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) {
         &notice("Failed to create object!  Aborting.");
         return;
@@ -1823,7 +1757,7 @@ sub get_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}";
         }
@@ -1948,8 +1882,8 @@ if ($window) {
             &notice(
                 "Twirssi v$VERSION; "
                   . (
-                    $Net::Twitter::VERSION
-                    ? "Net::Twitter v$Net::Twitter::VERSION. "
+                    $Net::Twitter::Lite::VERSION
+                    ? "Net::Twitter v$Net::Twitter::Lite::VERSION. "
                     : ""
                   )
                   . (