X-Git-Url: https://git.sommitrealweird.co.uk/twirssi-net-twitter-lite.git/blobdiff_plain/c69f1cef391929878470a3841232efb34a876ba8..4c7ce5a9949947f41be83098abea4bf5f5d71862:/twirssi.pl diff --git a/twirssi.pl b/twirssi.pl index 3d292f4..45faf6f 100644 --- a/twirssi.pl +++ b/twirssi.pl @@ -7,11 +7,13 @@ use File::Temp; use LWP::Simple; use Data::Dumper; use Encode; +use POSIX qw/:sys_wait_h/; +use Net::Twitter::Lite $Data::Dumper::Indent = 1; use vars qw($VERSION %IRSSI); -$VERSION = "2.3.4beta"; +$VERSION = "2.4.1beta"; %IRSSI = ( authors => 'Dan Boger', contact => 'zigdon@gmail.com', @@ -20,12 +22,13 @@ $VERSION = "2.3.4beta"; . '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 $twit; my %twits; +my %oauth; my $user; my $defservice; my $poll; @@ -428,7 +431,7 @@ sub cmd_logout { return unless $data = &valid_username($data); ¬ice("Logging out $data..."); - $twits{$data}->end_session(); + eval { $twits{$data}->end_session(); }; delete $twits{$data}; undef $twit; if ( keys %twits ) { @@ -442,15 +445,26 @@ sub cmd_logout { sub cmd_login { my ( $data, $server, $win ) = @_; my $pass; + print "logging in: $data" if &debug; if ($data) { + print "manual data login" if &debug; ( $user, $pass ) = split ' ', $data, 2; - unless ($pass) { + unless ( Irssi::settings_get_bool("twirssi_use_oauth") or $pass ) { ¬ice("usage: /twitter_login [\@] "); return; } + } 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 ) { + &cmd_login($user); + } + return; } elsif ( my $autouser = Irssi::settings_get_str("twitter_usernames") and my $autopass = Irssi::settings_get_str("twitter_passwords") ) { + print "autouser login" if &debug; my @user = split /\s*,\s*/, $autouser; my @pass = split /\s*,\s*/, $autopass; @@ -478,8 +492,10 @@ sub cmd_login { return; } } else { - ¬ice("/twitter_login requires either a username and password " - . "or twitter_usernames and twitter_passwords to be set." ); + ¬ice("/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" ); return; } @@ -493,25 +509,84 @@ sub cmd_login { } $defservice = $service = ucfirst lc $service; - eval "use Net::$service 3.05"; - if ($@) { - ¬ice( - "Failed to load Net::$service when trying to log in as $user: $@"); - return; - } - - $twit = "Net::$service"->new( + $twit = Net::Twitter::Lite->new( username => $user, password => $pass, - source => "twirssi", - ssl => Irssi::settings_get_bool("twirssi_avoid_ssl") ? 0 : 1, ); unless ($twit) { - ¬ice("Failed to create Net::$service object! Aborting."); + ¬ice("Failed to create object! Aborting."); + return; + } + + return &verify_twitter_object( $server, $win, $user, $service, $twit ); +} + +sub cmd_oauth { + my ( $data, $server, $win ) = @_; + my ( $key, $pin ) = split ' ', $data; + my ( $user, $service ); + $key = &normalize_username($key); + if ( $key =~ /^(.*)@(Twitter|Identica)$/ ) { + ( $user, $service ) = ( $1, $2 ); + } + $pin =~ s/\D//g; + print "Applying pin to $key" if &debug; + + unless ( exists $oauth{pending}{$key} ) { + ¬ice("There isn't a pending oauth request for $key. " + . "Try /twitter_login first" ); return; } + my $twit = $oauth{pending}{$key}; + my ( $access_token, $access_token_secret ); + eval { + ( $access_token, $access_token_secret ) = + $twit->request_access_token( verifier => $pin ); + }; + + if ($@) { + ¬ice("Invalid pin, try again."); + return; + } + + delete $oauth{pending}{$key}; + + my $store_file = Irssi::settings_get_str("twirssi_oauth_store"); + if ($store_file) { + my @store; + if ( open( OAUTH, $store_file ) ) { + while () { + chomp; + next if /$key/i; + push @store, $_; + } + close OAUTH; + + } + + push @store, "$key $access_token $access_token_secret"; + + if ( open( OAUTH, ">$store_file.new" ) ) { + print OAUTH "$_\n" foreach @store; + close OAUTH; + rename "$store_file.new", $store_file + or ¬ice("Failed to rename $store_file.new: $!"); + } else { + ¬ice("Failed to write $store_file.new: $!"); + } + } else { + ¬ice("No persistant storage set for OAuth. " + . "Please /set twirssi_oauth_store to a writable filename." ); + } + + return &verify_twitter_object( $server, $win, $user, $service, $twit ); +} + +sub verify_twitter_object { + my ( $server, $win, $user, $service, $twit ) = @_; + if ( my $timeout = Irssi::settings_get_int("twitter_timeout") and $twit->can('ua') ) { @@ -537,31 +612,27 @@ sub cmd_login { return; } - if ($twit) { - my $rate_limit = $twit->rate_limit_status(); - if ( $rate_limit and $rate_limit->{remaining_hits} < 1 ) { - ¬ice( - "Rate limit exceeded, try again after $rate_limit->{reset_time}" - ); - $twit = undef; - return; - } + my $rate_limit = $twit->rate_limit_status(); + if ( $rate_limit and $rate_limit->{remaining_hits} < 1 ) { + ¬ice( + "Rate limit exceeded, try again after $rate_limit->{reset_time}"); + $twit = undef; + return; + } - $twits{"$user\@$service"} = $twit; - Irssi::timeout_remove($poll) if $poll; - $poll = Irssi::timeout_add( &get_poll_time * 1000, \&get_updates, "" ); - ¬ice("Logged in as $user\@$service, loading friends list..."); - &load_friends(); - ¬ice( "loaded friends: ", scalar keys %friends ); - if ( Irssi::settings_get_bool("twirssi_first_run") ) { - Irssi::settings_set_bool( "twirssi_first_run", 0 ); - } - %nicks = %friends; - $nicks{$user} = 0; - return 1; - } else { - ¬ice("Login failed"); + print "saving object for $user\@$service" if &debug; + $twits{"$user\@$service"} = $twit; + Irssi::timeout_remove($poll) if $poll; + $poll = Irssi::timeout_add( &get_poll_time * 1000, \&get_updates, "" ); + ¬ice("Logged in as $user\@$service, loading friends list..."); + &load_friends(); + ¬ice( "loaded friends: ". scalar keys %friends ); + if ( Irssi::settings_get_bool("twirssi_first_run") ) { + Irssi::settings_set_bool( "twirssi_first_run", 0 ); } + %nicks = %friends; + $nicks{$user} = 0; + return 1; } sub cmd_add_follow { @@ -817,7 +888,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; } @@ -927,11 +999,13 @@ sub get_updates { sub do_updates { my ( $fh, $username, $obj, $cache ) = @_; - my $rate_limit = $obj->rate_limit_status(); - if ( $rate_limit and $rate_limit->{remaining_hits} < 1 ) { - ¬ice("Rate limit exceeded for $username"); - return undef; - } + eval { + my $rate_limit = $obj->rate_limit_status(); + if ( $rate_limit and $rate_limit->{remaining_hits} < 1 ) { + ¬ice("Rate limit exceeded for $username"); + return undef; + } + }; print scalar localtime, " - Polling for updates for $username" if &debug; my $tweets; @@ -968,7 +1042,7 @@ sub do_updates { } foreach my $t ( reverse @$tweets ) { - my $text = &get_text($t, $obj); + my $text = &get_text( $t, $obj ); my $reply = "tweet"; if ( Irssi::settings_get_bool("show_reply_context") and $t->{in_reply_to_screen_name} ne $username @@ -1185,6 +1259,9 @@ sub monitor_child { if &debug; my ($new_last_poll); + # reap any random leftover processes - work around a bug in irssi on gentoo + waitpid( -1, WNOHANG ); + # first time we run we don't want to print out *everything*, so we just # pretend @@ -1425,7 +1502,7 @@ sub monitor_child { } if ( not $failwhale and time - $last_poll > 60 * 60 ) { - foreach my $whale ( + &ccrap( q{ v v v}, q{ | | v | v}, q{ | .-, | | |}, @@ -1434,10 +1511,7 @@ sub monitor_child { q{ \\ a |}, q{ ',.__. ,__.-'/}, q{ '--/_.'----'`} - ) - { - &ccrap($whale); - } + ); $failwhale = 1; } @@ -1452,11 +1526,15 @@ sub debug { } sub notice { - $window->print( "%R***%n @_", MSGLEVEL_PUBLIC ); + foreach my $msg (@_) { + $window->print( "%R***%n $msg", MSGLEVEL_PUBLIC ); + } } sub ccrap { - $window->print( "%R***%n @_", MSGLEVEL_CLIENTCRAP ); + foreach my $msg (@_) { + $window->print( "%R***%n $msg", MSGLEVEL_CLIENTCRAP ); + } } sub update_away { @@ -1659,16 +1737,15 @@ sub normalize_username { } sub get_text { - my $tweet = shift; + my $tweet = shift; my $object = shift; - my $text = decode_entities( $tweet->{text} ); - if ($tweet->{truncated}) { - if (exists $tweet->{retweeted_status}) { - $text = "RT $tweet->{retweeted_status}{user}{screen_name}: " . - "$tweet->{retweeted_status}{text}"; - } elsif ( $object->isa('Net::Twitter') ) { - $text .= - " -- http://twitter.com/$tweet->{user}{screen_name}" + my $text = decode_entities( $tweet->{text} ); + if ( $tweet->{truncated} ) { + if ( exists $tweet->{retweeted_status} ) { + $text = "RT \@$tweet->{retweeted_status}{user}{screen_name}: " + . "$tweet->{retweeted_status}{text}"; + } elsif ( $object->isa('Net::Twitter::Lite') ) { + $text .= " -- http://twitter.com/$tweet->{user}{screen_name}" . "/status/$tweet->{id}"; } } @@ -1703,9 +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/scripts/twirssi.pl" ); + Irssi::get_irssi_dir . "/scripts/twirssi.pl" ); Irssi::settings_add_str( "twirssi", "twirssi_replies_store", - ".irssi/scripts/twirssi.json" ); + Irssi::get_irssi_dir . "/scripts/twirssi.json" ); +Irssi::settings_add_str( "twirssi", "twirssi_oauth_store", + Irssi::get_irssi_dir . "/scripts/twirssi.oauth" ); Irssi::settings_add_int( "twirssi", "twitter_friends_poll", 600 ); Irssi::settings_add_int( "twirssi", "twitter_timeout", 30 ); @@ -1724,6 +1803,7 @@ 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 ); Irssi::settings_add_bool( "twirssi", "twirssi_avoid_ssl", 0 ); +Irssi::settings_add_bool( "twirssi", "twirssi_use_oauth", 1 ); $last_poll = time - &get_poll_time; $window = Irssi::window_find_name( Irssi::settings_get_str('twitter_window') ); @@ -1754,6 +1834,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( "twirssi_oauth", "cmd_oauth" ); Irssi::command_bind( "twitter_updates", "get_updates" ); Irssi::command_bind( "twitter_add_follow_extra", "cmd_add_follow" ); Irssi::command_bind( "twitter_del_follow_extra", "cmd_del_follow" ); @@ -1786,8 +1867,8 @@ if ($window) { ¬ice( "Twirssi v$VERSION; " . ( - $Net::Twitter::VERSION - ? "Net::Twitter v$Net::Twitter::VERSION. " + $Net::Twitter::Lite::VERSION + ? "Net::Twitter v$Net::Twitter::Lite::VERSION. " : "" ) . ( @@ -1843,10 +1924,9 @@ if ($window) { ); Irssi::signal_add_last( 'complete word' => \&sig_complete ); - ¬ice(" %Y<%C(%B^%C)%N TWIRSSI v%R$VERSION%N"); - ¬ice(" %C(_(\\%N http://twirssi.com/ for full docs"); - ¬ice( - " %Y||%C `%N Log in with /twitter_login, send updates with /tweet"); + ¬ice(" %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 ) { @@ -1880,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; }