X-Git-Url: https://git.sommitrealweird.co.uk/twirssi-net-twitter-lite.git/blobdiff_plain/d1284e4f0c4dfa4a5e33708c1a6f75caf57786b8..0c9ff87addaabcd2f252b04b192dfe63777a2935:/twirssi.pl diff --git a/twirssi.pl b/twirssi.pl index 1d24b86..d894a36 100644 --- a/twirssi.pl +++ b/twirssi.pl @@ -11,7 +11,7 @@ $Data::Dumper::Indent = 1; use vars qw($VERSION %IRSSI); -$VERSION = "2.2.6beta"; +$VERSION = "2.3.0beta"; my ($REV) = '$Rev: 687 $' =~ /(\d+)/; %IRSSI = ( authors => 'Dan Boger', @@ -39,6 +39,7 @@ my %id_map; my $failwhale = 0; my $first_call = 1; my $child_pid; +my %fix_replies_index; my %irssi_to_mirc_colors = ( '%k' => '01', @@ -441,6 +442,10 @@ sub cmd_login { my $pass; if ($data) { ( $user, $pass ) = split ' ', $data, 2; + unless ($pass) { + ¬ice("usage: /twitter_login [\@] "); + return; + } } elsif ( my $autouser = Irssi::settings_get_str("twitter_usernames") and my $autopass = Irssi::settings_get_str("twitter_passwords") ) { @@ -556,6 +561,68 @@ sub cmd_login { } } +sub cmd_add_follow { + my ( $data, $server, $win ) = @_; + + unless ($data) { + ¬ice("Usage: /twitter_add_follow_extra "); + return; + } + + $data =~ s/^\s+|\s+$//; + $data =~ s/^\@//; + $data = lc $data; + + if ( exists $id_map{__fixreplies}{"$user\@$defservice"}{$data} ) { + ¬ice("Already following all replies by \@$data"); + return; + } + + $id_map{__fixreplies}{"$user\@$defservice"}{$data} = 1; + ¬ice("Will now follow all replies by \@$data"); +} + +sub cmd_del_follow { + my ( $data, $server, $win ) = @_; + + unless ($data) { + ¬ice("Usage: /twitter_del_follow_extra "); + return; + } + + $data =~ s/^\s+|\s+$//; + $data =~ s/^\@//; + $data = lc $data; + + unless ( exists $id_map{__fixreplies}{"$user\@$defservice"}{$data} ) { + ¬ice("Wasn't following all replies by \@$data"); + return; + } + + delete $id_map{__fixreplies}{"$user\@$defservice"}{$data}; + ¬ice("Will no longer follow all replies by \@$data"); +} + +sub cmd_list_follow { + my ( $data, $server, $win ) = @_; + + my $found = 0; + foreach my $suser ( sort keys %{ $id_map{__fixreplies} } ) { + my $frusers; + foreach my $fruser ( sort keys %{ $id_map{__fixreplies}{$suser} } ) { + $frusers = $frusers ? "$frusers, $fruser" : $fruser; + } + if ($frusers) { + $found = 1; + ¬ice("Following all replies as \@$suser: $frusers"); + } + } + + unless ($found) { + ¬ice("Not following all replies by anyone"); + } +} + sub cmd_add_search { my ( $data, $server, $win ) = @_; @@ -632,8 +699,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; } @@ -643,8 +710,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; } @@ -658,8 +725,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; } @@ -797,6 +864,20 @@ sub get_updates { my %context_cache; foreach ( keys %twits ) { $error++ unless &do_updates( $fh, $_, $twits{$_}, \%context_cache ); + + if ( $id_map{__fixreplies}{$_} ) { + my @frusers = sort keys %{ $id_map{__fixreplies}{$_} }; + + $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"; + } } print $fh "__friends__\n"; @@ -905,7 +986,7 @@ sub do_updates { " -- http://twitter.com/$context->{user}{screen_name}" . "/status/$context->{id}"; } - printf $fh "id:%u account:%s nick:%s type:tweet %s\n", + printf $fh "id:%s account:%s nick:%s type:tweet %s\n", $context->{id}, $username, $context->{user}{screen_name}, $ctext; $reply = "reply"; @@ -918,11 +999,11 @@ sub do_updates { $text .= " -- http://twitter.com/$t->{user}{screen_name}" . "/status/$t->{id}"; } - printf $fh "id:%u account:%s nick:%s type:%s %s\n", + 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}; } - printf $fh "id:%u account:%s type:last_id timeline\n", + printf $fh "id:%s account:%s type:last_id timeline\n", $new_poll_id, $username; print scalar localtime, " - Polling for replies since ", @@ -955,11 +1036,11 @@ sub do_updates { $text .= " -- http://twitter.com/$t->{user}{screen_name}" . "/status/$t->{id}"; } - printf $fh "id:%u account:%s nick:%s type:tweet %s\n", + 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}; } - printf $fh "id:%u account:%s type:last_id reply\n", $new_poll_id, $username; + printf $fh "id:%s account:%s type:last_id reply\n", $new_poll_id, $username; print scalar localtime, " - Polling for DMs" if &debug; $new_poll_id = 0; @@ -982,11 +1063,11 @@ sub do_updates { foreach my $t ( reverse @$tweets ) { my $text = decode_entities( $t->{text} ); $text =~ s/[\n\r]/ /g; - printf $fh "id:%u account:%s nick:%s type:dm %s\n", + printf $fh "id:%s account:%s nick:%s type:dm %s\n", $t->{id}, $username, $t->{sender_screen_name}, $text; $new_poll_id = $t->{id} if $new_poll_id < $t->{id}; } - printf $fh "id:%u account:%s type:last_id dm\n", $new_poll_id, $username; + printf $fh "id:%s account:%s type:last_id dm\n", $new_poll_id, $username; print scalar localtime, " - Polling for subscriptions" if &debug; if ( $obj->can('search') and $id_map{__searches}{$username} ) { @@ -1016,13 +1097,13 @@ sub do_updates { } $id_map{__searches}{$username}{$topic} = $search->{max_id}; - printf $fh "id:%u account:%s type:searchid topic:%s\n", + printf $fh "id:%s account:%s type:searchid topic:%s\n", $search->{max_id}, $username, $topic; foreach my $t ( reverse @{ $search->{results} } ) { my $text = decode_entities( $t->{text} ); $text =~ s/[\n\r]/ /g; - printf $fh "id:%u account:%s nick:%s type:search topic:%s %s\n", + 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} if not $new_poll_id @@ -1036,6 +1117,86 @@ sub do_updates { return 1; } +sub get_timeline { + my ( $fh, $target, $username, $obj, $cache ) = @_; + 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, + ( + $last_id ? (since_id => $last_id) : () + ), + } + ); + }; + + if ($@) { + 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"; + return 1; + } + + foreach my $t ( reverse @$tweets ) { + my $text = decode_entities( $t->{text} ); + $text =~ s/[\n\r]/ /g; + my $reply = "tweet"; + if ( Irssi::settings_get_bool("show_reply_context") + and $t->{in_reply_to_screen_name} ne $username + and $t->{in_reply_to_screen_name} + and not exists $friends{ $t->{in_reply_to_screen_name} } ) + { + $nicks{ $t->{in_reply_to_screen_name} } = time; + my $context; + unless ( $cache->{ $t->{in_reply_to_status_id} } ) { + eval { + $cache->{ $t->{in_reply_to_status_id} } = + $obj->show_status( $t->{in_reply_to_status_id} ); + }; + + } + $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}"; + } + 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; +} + sub monitor_child { my ($data) = @_; my $filename = $data->[0]; @@ -1068,6 +1229,13 @@ 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; + next; + } + if ( not $meta{type} or $meta{type} !~ /searchid|last_id/ ) { if ( exists $meta{id} and exists $new_cache{ $meta{id} } ) { next; @@ -1162,6 +1330,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' ) { @@ -1255,6 +1428,7 @@ sub monitor_child { [ $filename, $attempt + 1 ] ); } else { print "Giving up on polling $filename" if &debug; + Irssi::pidwait_remove($child_pid); unlink $filename unless &debug; return unless Irssi::settings_get_bool("twirssi_notify_timeouts"); @@ -1376,7 +1550,7 @@ 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, @@ -1453,7 +1627,7 @@ sub shorten { "Set short_url_args to username,API_key or change your", "short_url_provider." ); - return $data; + return decode "utf8", $data; } } @@ -1576,6 +1750,9 @@ if ($window) { Irssi::command_bind( "twitter_list_subscriptions", "cmd_list_search" ); Irssi::command_bind( "twirssi_upgrade", "cmd_upgrade" ); 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" ); + Irssi::command_bind( "twitter_list_follow_extra", "cmd_list_follow" ); Irssi::command_bind( "bitlbee_away", "update_away" ); if ( Irssi::settings_get_bool("twirssi_use_reply_aliases") ) { Irssi::command_bind( "reply", "cmd_reply" ); @@ -1679,6 +1856,7 @@ if ($window) { ¬ice( sprintf "Loaded old replies from %d contact%s.", $num, ( $num == 1 ? "" : "s" ) ); &cmd_list_search; + &cmd_list_follow; }; } else { ¬ice("Failed to load old replies from $file: $!");