X-Git-Url: https://git.sommitrealweird.co.uk/twirssi-net-twitter-lite.git/blobdiff_plain/2a7a572495dec25cd287bf5186b9cc9067c18018..e7f88ffa156056068113ba9db9cc67cf9e41dd5f:/twirssi.pl?ds=inline diff --git a/twirssi.pl b/twirssi.pl index daa01af..92f60b6 100644 --- a/twirssi.pl +++ b/twirssi.pl @@ -6,12 +6,13 @@ use HTML::Entities; use File::Temp; use LWP::Simple; use Data::Dumper; +use Encode; $Data::Dumper::Indent = 1; use vars qw($VERSION %IRSSI); -$VERSION = "2.2.5beta"; -my ($REV) = '$Rev: 673 $' =~ /(\d+)/; +$VERSION = "2.2.6beta"; +my ($REV) = '$Rev: 687 $' =~ /(\d+)/; %IRSSI = ( authors => 'Dan Boger', contact => 'zigdon@gmail.com', @@ -20,7 +21,7 @@ my ($REV) = '$Rev: 673 $' =~ /(\d+)/; . 'Can optionally set your bitlbee /away message to same', license => 'GNU GPL v2', url => 'http://twirssi.com', - changed => '$Date: 2009-07-16 16:50:30 -0700 (Thu, 16 Jul 2009) $', + changed => '$Date: 2009-08-07 01:24:53 -0700 (Fri, 07 Aug 2009) $', ); my $window; @@ -37,6 +38,7 @@ my %tweet_cache; my %id_map; my $failwhale = 0; my $first_call = 1; +my $child_pid; my %irssi_to_mirc_colors = ( '%k' => '01', @@ -182,7 +184,8 @@ sub cmd_retweet_as { unless ( $twits{$username}->update( { - status => $data, + status => $data, + # in_reply_to_status_id => $id_map{ lc $nick }[$id] } ) @@ -493,9 +496,21 @@ sub cmd_login { $twit = "Net::$service"->new( username => $user, password => $pass, - source => "twirssi" + source => "twirssi", + ssl => Irssi::settings_get_bool("twirssi_avoid_ssl") ? 0 : 1, ); + unless ($twit) { + ¬ice("Failed to create Net::$service object! Aborting."); + return; + } + + if ( my $timeout = Irssi::settings_get_int("twitter_timeout") + and $twit->can('ua') ) + { + $twit->ua->timeout($timeout); + } + unless ( $twit->verify_credentials() ) { ¬ice("Login as $user\@$service failed"); $twit = undef; @@ -535,6 +550,13 @@ sub cmd_login { return 1; } else { ¬ice("Login failed"); + if ( not Irssi::settings_get_bool("twirssi_avoid_ssl") ) { + ¬ice( + "It's possible you're missing one of the modules required for " + . "SSL logins. Try setting twirssi_avoid_ssl to on. See " + . "http://cpansearch.perl.org/src/GAAS/libwww-perl-5.831/README.SSL " + . "for the detailed requirements." ); + } } } @@ -662,10 +684,17 @@ sub cmd_upgrade { ¬ice("Downloading twirssi from $URL"); LWP::Simple::getstore( $URL, "$loc.upgrade" ); + unless ( -s "$loc.upgrade" ) { + ¬ice("Failed to save $loc.upgrade." + . " Check that /set twirssi_location is set to the correct location." + ); + return; + } + unless ( $data or Irssi::settings_get_bool("twirssi_upgrade_beta") ) { unless ( open( NEW, "$loc.upgrade" ) ) { - ¬ice( -"Failed to read $loc.upgrade. Check that /set twirssi_location is set to the correct location." + ¬ice("Failed to read $loc.upgrade." + . " Check that /set twirssi_location is set to the correct location." ); return; } @@ -755,12 +784,13 @@ sub get_updates { my ( $fh, $filename ) = File::Temp::tempfile(); binmode( $fh, ":utf8" ); - my $pid = fork(); + $child_pid = fork(); - if ($pid) { # parent - Irssi::timeout_add_once( 5000, 'monitor_child', [ "$filename.done", 0 ] ); - Irssi::pidwait_add($pid); - } elsif ( defined $pid ) { # child + if ($child_pid) { # parent + Irssi::timeout_add_once( 5000, 'monitor_child', + [ "$filename.done", 0 ] ); + Irssi::pidwait_add($child_pid); + } elsif ( defined $child_pid ) { # child close STDIN; close STDOUT; close STDERR; @@ -899,7 +929,9 @@ sub do_updates { printf $fh "id:%u account:%s type:last_id timeline\n", $new_poll_id, $username; - print scalar localtime, " - Polling for replies" if &debug; + print scalar localtime, " - Polling for replies since ", + $id_map{__last_id}{$username}{reply} + if &debug; $new_poll_id = 0; eval { if ( $id_map{__last_id}{$username}{reply} ) @@ -1021,6 +1053,7 @@ sub monitor_child { # pretend if ( open FILE, $filename ) { + binmode FILE, ":utf8"; my @lines; my %new_cache; while () { @@ -1151,8 +1184,16 @@ sub monitor_child { } if (/^-- (\d+)$/) { - ($new_last_poll) = ($1); - last; + $new_last_poll = $1; + if ( $new_last_poll >= $last_poll ) { + last; + } else { + print "Impossible! ", + "new_last_poll=$new_last_poll < last_poll=$last_poll!" + if &debug; + undef $new_last_poll; + next; + } } my ( $f, $t ) = split ' ', $_; $nicks{$f} = $friends{$f} = $t; @@ -1168,8 +1209,8 @@ sub monitor_child { $window->printformat( $line->[0], "twirssi_" . $line->[1], - @$line[ 2 .. $#$line-1 ], - &hilight($line->[-1]) + @$line[ 2 .. $#$line - 1 ], + &hilight( $line->[-1] ) ); } } @@ -1190,6 +1231,9 @@ sub monitor_child { } $last_poll = $new_last_poll; + # make sure the pid is removed from the waitpid list + Irssi::pidwait_remove($child_pid); + # save id_map hash if ( keys %id_map and my $file = @@ -1430,7 +1474,7 @@ sub shorten { } } - return $data; + return decode "utf8", $data; } sub normalize_username { @@ -1489,6 +1533,7 @@ Irssi::settings_add_str( "twirssi", "twirssi_replies_store", ".irssi/scripts/twirssi.json" ); Irssi::settings_add_int( "twirssi", "twitter_friends_poll", 600 ); +Irssi::settings_add_int( "twirssi", "twitter_timeout", 30 ); Irssi::settings_add_bool( "twirssi", "twirssi_upgrade_beta", 0 ); Irssi::settings_add_bool( "twirssi", "tweet_to_away", 0 ); @@ -1503,6 +1548,7 @@ Irssi::settings_add_bool( "twirssi", "twirssi_notify_timeouts", 1 ); 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 ); $last_poll = time - &get_poll_time; $window = Irssi::window_find_name( Irssi::settings_get_str('twitter_window') ); @@ -1559,11 +1605,22 @@ if ($window) { Irssi::command_bind( "twirssi_version", sub { - ¬ice("Twirssi v$VERSION (r$REV); " - . "Net::Twitter v$Net::Twitter::VERSION. " + ¬ice( + "Twirssi v$VERSION (r$REV); " + . ( + $Net::Twitter::VERSION + ? "Net::Twitter v$Net::Twitter::VERSION. " + : "" + ) + . ( + $Net::Identica::VERSION + ? "Net::Identica v$Net::Identica::VERSION. " + : "" + ) . "JSON in use: " . JSON::Any::handler() - . ". See details at http://twirssi.com/" ); + . ". See details at http://twirssi.com/" + ); } ); Irssi::command_bind( @@ -1590,6 +1647,22 @@ if ($window) { sub { ¬ice("Device updated to $_[0]"); } ) ); + Irssi::command_bind( + "twitter_block", + &gen_cmd( + "/twitter_block ", + "create_block", + sub { ¬ice("Blocked $_[0]"); } + ) + ); + Irssi::command_bind( + "twitter_unblock", + &gen_cmd( + "/twitter_unblock ", + "destroy_block", + sub { ¬ice("Unblock $_[0]"); } + ) + ); Irssi::signal_add_last( 'complete word' => \&sig_complete ); ¬ice(" %Y<%C(%B^%C)%N TWIRSSI v%R$VERSION%N (r$REV)");