X-Git-Url: https://git.sommitrealweird.co.uk/twirssi-net-twitter-lite.git/blobdiff_plain/cf36fc019be09881c4dfae01df58d7d47571b38d..1da24996a0415d1db4c6e971ec8b4e8f7f965b81:/twirssi.pl diff --git a/twirssi.pl b/twirssi.pl index 48d3201..267db11 100644 --- a/twirssi.pl +++ b/twirssi.pl @@ -7,13 +7,13 @@ use File::Temp; use LWP::Simple; use Data::Dumper; use Encode; +use POSIX qw/:sys_wait_h/; $Data::Dumper::Indent = 1; use vars qw($VERSION %IRSSI); -$VERSION = "2.3.0beta"; -my ($REV) = '$Rev: 687 $' =~ /(\d+)/; -%IRSSI = ( +$VERSION = "2.3.4beta"; +%IRSSI = ( authors => 'Dan Boger', contact => 'zigdon@gmail.com', name => 'twirssi', @@ -91,7 +91,7 @@ sub cmd_direct_as { if ( $twits{$username} ->new_direct_message( { user => $target, text => $text } ) ) { - ¬ice("DM sent to $target"); + ¬ice("DM sent to $target: $text"); $nicks{$target} = time; } else { my $error; @@ -176,25 +176,28 @@ sub cmd_retweet_as { } $text =~ s/\$t/$id_map{__tweets}{ lc $nick }[$id]/; + my $modified = $data; $data = &shorten($text); - return if &too_long($data); + return if $modified and &too_long($data); my $success = 1; eval { - unless ( - $twits{$username}->update( + if ($modified) + { + $success = $twits{$username}->update( { status => $data, # in_reply_to_status_id => $id_map{ lc $nick }[$id] } - ) - ) - { - ¬ice("Update failed"); - $success = 0; + ); + } else { + $success = + $twits{$username}->retweet( { id => $id_map{ lc $nick }[$id] } ); + $success = $success->{id} if ref $success; } + ¬ice("Update failed") unless $success; }; return unless $success; @@ -491,7 +494,7 @@ sub cmd_login { } $defservice = $service = ucfirst lc $service; - eval "use Net::$service"; + eval "use Net::$service 3.05"; if ($@) { ¬ice( "Failed to load Net::$service when trying to log in as $user: $@"); @@ -514,6 +517,7 @@ sub cmd_login { and $twit->can('ua') ) { $twit->ua->timeout($timeout); + ¬ice("Twitter timeout set to $timeout"); } unless ( $twit->verify_credentials() ) { @@ -699,9 +703,8 @@ sub cmd_upgrade { my $loc = Irssi::settings_get_str("twirssi_location"); unless ( -w $loc ) { - ¬ice( -"$loc isn't writable, can't upgrade. Perhaps you need to /set twirssi_location?" - ); + ¬ice("$loc isn't writable, can't upgrade." + . " Perhaps you need to /set twirssi_location?" ); return; } @@ -710,9 +713,8 @@ sub cmd_upgrade { eval { use Digest::MD5; }; if ($@) { - ¬ice( -"Failed to load Digest::MD5. Try '/twirssi_upgrade nomd5' to skip MD5 verification" - ); + ¬ice("Failed to load Digest::MD5." + . " Try '/twirssi_upgrade nomd5' to skip MD5 verification" ); return; } @@ -725,8 +727,8 @@ sub cmd_upgrade { } unless ( open( CUR, $loc ) ) { - ¬ice( -"Failed to read $loc. Check that /set twirssi_location is set to the correct location." + ¬ice("Failed to read $loc." + . " Check that /set twirssi_location is set to the correct location." ); return; } @@ -791,19 +793,27 @@ sub cmd_upgrade { } sub load_friends { - my $fh = shift; - my $page = 1; + my $fh = shift; + my $cursor = -1; + my $page = 1; my %new_friends; eval { - while (1) + while ( $page < 11 and $cursor ne "0" ) { print $fh "type:debug Loading friends page $page...\n" if ( $fh and &debug ); - my $friends = $twit->friends( { page => $page } ); - last unless $friends; + my $friends; + if ( ref $twit =~ /^Net::Twitter/ ) { + $friends = $twit->friends( { cursor => $cursor } ); + last unless $friends; + $cursor = $friends->{next_cursor}; + $friends = $friends->{users}; + } else { + $friends = $twit->friends( { page => $page } ); + last unless $friends; + } $new_friends{ $_->{screen_name} } = time foreach @$friends; $page++; - last if @$friends == 0 or $page == 10; } }; @@ -865,18 +875,21 @@ sub get_updates { foreach ( keys %twits ) { $error++ unless &do_updates( $fh, $_, $twits{$_}, \%context_cache ); - if ($id_map{__fixreplies}{$_}) { - my @frusers = sort keys %{$id_map{__fixreplies}{$_}}; + if ( $id_map{__fixreplies}{$_} ) { + my @frusers = sort keys %{ $id_map{__fixreplies}{$_} }; - $error++ unless &get_timeline( $fh, $frusers[$fix_replies_index{$_}], $_, $twits{$_}, \%context_cache ); + $error++ + unless &get_timeline( $fh, $frusers[ $fix_replies_index{$_} ], + $_, $twits{$_}, \%context_cache ); $fix_replies_index{$_}++; - $fix_replies_index{$_} = 0 if $fix_replies_index{$_} >= @frusers; - print $fh "id:$fix_replies_index{$_} account:$_ type:fix_replies_index\n"; + $fix_replies_index{$_} = 0 + if $fix_replies_index{$_} >= @frusers; + print $fh "id:$fix_replies_index{$_} ", + "account:$_ type:fix_replies_index\n"; } } - print $fh "__friends__\n"; if ( time - $last_friends_poll > @@ -927,14 +940,14 @@ sub do_updates { eval { if ( $id_map{__last_id}{$username}{timeline} ) { - $tweets = $obj->friends_timeline( { count => 100 } ); + $tweets = $obj->home_timeline( { count => 100 } ); } else { - $tweets = $obj->friends_timeline(); + $tweets = $obj->home_timeline(); } }; if ($@) { - print $fh "type:debug Error during friends_timeline call: Aborted.\n"; + print $fh "type:debug Error during home_timeline call: Aborted.\n"; print $fh "type:debug : $_\n" foreach split /\n/, Dumper($@); return undef; } @@ -945,19 +958,18 @@ sub do_updates { eval { $error = JSON::Any->jsonToObj( $obj->get_error() ) }; unless ($@) { $error = $obj->get_error() } print $fh - "type:debug API Error during friends_timeline call: Aborted\n"; + "type:debug API Error during home_timeline call: Aborted\n"; print $fh "type:debug : $_\n" foreach split /\n/, Dumper($error); } else { print $fh - "type:debug API Error during friends_timeline call. Aborted.\n"; + "type:debug API Error during home_timeline call. Aborted.\n"; } return undef; } foreach my $t ( reverse @$tweets ) { - my $text = decode_entities( $t->{text} ); - $text =~ s/[\n\r]/ /g; + 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 @@ -976,13 +988,7 @@ sub do_updates { $context = $cache->{ $t->{in_reply_to_status_id} }; if ($context) { - my $ctext = decode_entities( $context->{text} ); - $ctext =~ s/[\n\r]/ /g; - if ( $context->{truncated} and ref($obj) ne 'Net::Identica' ) { - $ctext .= - " -- http://twitter.com/$context->{user}{screen_name}" - . "/status/$context->{id}"; - } + my $ctext = &get_text( $context, $obj ); printf $fh "id:%s account:%s nick:%s type:tweet %s\n", $context->{id}, $username, $context->{user}{screen_name}, $ctext; @@ -992,10 +998,6 @@ sub do_updates { next if $t->{user}{screen_name} eq $username and not Irssi::settings_get_bool("show_own_tweets"); - if ( $t->{truncated} and ref($obj) ne 'Net::Identica' ) { - $text .= " -- http://twitter.com/$t->{user}{screen_name}" - . "/status/$t->{id}"; - } printf $fh "id:%s account:%s nick:%s type:%s %s\n", $t->{id}, $username, $t->{user}{screen_name}, $reply, $text; $new_poll_id = $t->{id} if $new_poll_id < $t->{id}; @@ -1027,12 +1029,7 @@ sub do_updates { next if exists $friends{ $t->{user}{screen_name} }; - my $text = decode_entities( $t->{text} ); - $text =~ s/[\n\r]/ /g; - if ( $t->{truncated} ) { - $text .= " -- http://twitter.com/$t->{user}{screen_name}" - . "/status/$t->{id}"; - } + my $text = &get_text( $t, $obj ); printf $fh "id:%s account:%s nick:%s type:tweet %s\n", $t->{id}, $username, $t->{user}{screen_name}, $text; $new_poll_id = $t->{id} if $new_poll_id < $t->{id}; @@ -1098,8 +1095,7 @@ sub do_updates { $search->{max_id}, $username, $topic; foreach my $t ( reverse @{ $search->{results} } ) { - my $text = decode_entities( $t->{text} ); - $text =~ s/[\n\r]/ /g; + my $text = &get_text( $t, $obj ); printf $fh "id:%s account:%s nick:%s type:search topic:%s %s\n", $t->{id}, $username, $t->{from_user}, $topic, $text; $new_poll_id = $t->{id} @@ -1116,26 +1112,36 @@ sub do_updates { sub get_timeline { my ( $fh, $target, $username, $obj, $cache ) = @_; - print $fh "type:debug get_timeline($fix_replies_index{$username}=$target) started. username = $username\n"; my $tweets; + my $last_id = $id_map{__last_id}{$username}{$target}; + + print $fh "type:debug get_timeline(" + . "$fix_replies_index{$username}=$target > $last_id) started." + . " username = $username\n"; eval { - $tweets = $obj->user_timeline({id => $target}); + $tweets = $obj->user_timeline( + { + id => $target, + ( $last_id ? ( since_id => $last_id ) : () ), + } + ); }; if ($@) { - print $fh "type:debug Error during user_timeline($target) call: Aborted.\n"; + print $fh + "type:debug Error during user_timeline($target) call: Aborted.\n"; print $fh "type:debug : $_\n" foreach split /\n/, Dumper($@); return undef; } unless ($tweets) { - print $fh "type:debug user_timeline($target) call returned undef! Aborted\n"; + print $fh + "type:debug user_timeline($target) call returned undef! Aborted\n"; return 1; } foreach my $t ( reverse @$tweets ) { - my $text = decode_entities( $t->{text} ); - $text =~ s/[\n\r]/ /g; + 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 @@ -1154,26 +1160,19 @@ sub get_timeline { $context = $cache->{ $t->{in_reply_to_status_id} }; if ($context) { - my $ctext = decode_entities( $context->{text} ); - $ctext =~ s/[\n\r]/ /g; - if ( $context->{truncated} and ref($obj) ne 'Net::Identica' ) { - $ctext .= - " -- http://twitter.com/$context->{user}{screen_name}" - . "/status/$context->{id}"; - } + my $ctext = &get_text( $context, $obj ); printf $fh "id:%s account:%s nick:%s type:tweet %s\n", $context->{id}, $username, $context->{user}{screen_name}, $ctext; $reply = "reply"; } } - if ( $t->{truncated} and ref($obj) ne 'Net::Identica' ) { - $text .= " -- http://twitter.com/$t->{user}{screen_name}" - . "/status/$t->{id}"; - } printf $fh "id:%s account:%s nick:%s type:%s %s\n", $t->{id}, $username, $t->{user}{screen_name}, $reply, $text; + $last_id = $t->{id} if $last_id < $t->{id}; } + printf $fh "id:%s account:%s type:last_id_fixreplies %s\n", + $last_id, $username, $target; return 1; } @@ -1187,6 +1186,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 @@ -1211,8 +1213,9 @@ sub monitor_child { } if ( $meta{type} and $meta{type} eq 'fix_replies_index' ) { - $fix_replies_index{$meta{account}} = $meta{id}; - print "fix_replies_index for $meta{account} set to $meta{id}" if &debug; + $fix_replies_index{ $meta{account} } = $meta{id}; + print "fix_replies_index for $meta{account} set to $meta{id}" + if &debug; next; } @@ -1310,6 +1313,11 @@ sub monitor_child { $meta{id} if $id_map{__last_id}{"$meta{account}\@$meta{service}"}{$_} < $meta{id}; + } elsif ( $meta{type} eq 'last_id_fixreplies' ) { + $id_map{__last_id}{"$meta{account}\@$meta{service}"}{$_} = + $meta{id} + if $id_map{__last_id}{"$meta{account}\@$meta{service}"}{$_} < + $meta{id}; } elsif ( $meta{type} eq 'error' ) { push @lines, [ MSGLEVEL_MSGS, $_ ]; } elsif ( $meta{type} eq 'debug' ) { @@ -1378,6 +1386,9 @@ sub monitor_child { # make sure the pid is removed from the waitpid list Irssi::pidwait_remove($child_pid); + # and that we don't leave any zombies behind, somehow + wait(); + # save id_map hash if ( keys %id_map and my $file = @@ -1403,6 +1414,8 @@ sub monitor_child { [ $filename, $attempt + 1 ] ); } else { print "Giving up on polling $filename" if &debug; + Irssi::pidwait_remove($child_pid); + wait(); unlink $filename unless &debug; return unless Irssi::settings_get_bool("twirssi_notify_timeouts"); @@ -1524,7 +1537,9 @@ sub sig_complete { keys %{ $id_map{__indexes} }; } - if ( $linestart =~ /^\/twitter_unfriend\s*$/ ) + if ( $linestart =~ +/^\/(twitter_unfriend|twitter_add_follow_extra|twitter_del_follow_extra)\s*$/ + ) { # /twitter_unfriend gets a nick $word =~ s/^@//; push @$complist, grep /^\Q$word/i, @@ -1567,7 +1582,7 @@ sub hilight { if ( Irssi::settings_get_str("twirssi_nick_color") ) { my $c = Irssi::settings_get_str("twirssi_nick_color"); $c = $irssi_to_mirc_colors{$c}; - $text =~ s/(^|\W)\@([-\w]+)/$1\cC$c\@$2\cO/g if $c; + $text =~ s/(^|\W)\@(\w+)/$1\cC$c\@$2\cO/g if $c; } if ( Irssi::settings_get_str("twirssi_topic_color") ) { my $c = Irssi::settings_get_str("twirssi_topic_color"); @@ -1647,6 +1662,25 @@ sub normalize_username { return "$username\@$service"; } +sub get_text { + 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}" + . "/status/$tweet->{id}"; + } + } + + $text =~ s/[\n\r]/ /g; + + return $text; +} + Irssi::signal_add( "send text", "event_send_text" ); Irssi::theme_register( @@ -1753,7 +1787,7 @@ if ($window) { "twirssi_version", sub { ¬ice( - "Twirssi v$VERSION (r$REV); " + "Twirssi v$VERSION; " . ( $Net::Twitter::VERSION ? "Net::Twitter v$Net::Twitter::VERSION. " @@ -1812,7 +1846,7 @@ if ($window) { ); Irssi::signal_add_last( 'complete word' => \&sig_complete ); - ¬ice(" %Y<%C(%B^%C)%N TWIRSSI v%R$VERSION%N (r$REV)"); + ¬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");