X-Git-Url: https://git.sommitrealweird.co.uk//gitweb/?p=twirssi-net-twitter-lite.git;a=blobdiff_plain;f=twirssi.pl;h=80ee2438622539be1a5096a13d5ef1e9696ee4b6;hp=48d32013b0688b53e4edf863e0cc4f19aa8a18ad;hb=8114683d7cb6d635d5edc2945277dd59e11a7a87;hpb=cf36fc019be09881c4dfae01df58d7d47571b38d diff --git a/twirssi.pl b/twirssi.pl index 48d3201..80ee243 100644 --- a/twirssi.pl +++ b/twirssi.pl @@ -11,9 +11,8 @@ $Data::Dumper::Indent = 1; use vars qw($VERSION %IRSSI); -$VERSION = "2.3.0beta"; -my ($REV) = '$Rev: 687 $' =~ /(\d+)/; -%IRSSI = ( +$VERSION = "2.3.0"; +%IRSSI = ( authors => 'Dan Boger', contact => 'zigdon@gmail.com', name => 'twirssi', @@ -91,7 +90,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; @@ -699,9 +698,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 +708,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 +722,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 +788,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 +870,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 > @@ -1116,20 +1124,31 @@ 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; } @@ -1173,7 +1192,10 @@ sub get_timeline { } 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; } @@ -1211,8 +1233,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 +1333,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 +1406,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 +1434,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 +1557,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, @@ -1753,7 +1788,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 +1847,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");