X-Git-Url: https://git.sommitrealweird.co.uk//gitweb/?p=twirssi-net-twitter-lite.git;a=blobdiff_plain;f=twirssi.pl;h=331715ce03737fbfe13a9606df4d34fc16799292;hp=2375ba9b0504299f51079c357904c6b5d900155b;hb=4edf2cd46af41132f0235069bb4c03b09c1a24ca;hpb=58fa79277e8853a34e2982b994d7fb9b93a265c3 diff --git a/twirssi.pl b/twirssi.pl index 2375ba9..331715c 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.1beta"; -my ($REV) = '$Rev: 607 $' =~ /(\d+)/; +$VERSION = "2.2.5beta"; +my ($REV) = '$Rev: 687 $' =~ /(\d+)/; %IRSSI = ( authors => 'Dan Boger', contact => 'zigdon@gmail.com', @@ -20,7 +21,7 @@ my ($REV) = '$Rev: 607 $' =~ /(\d+)/; . 'Can optionally set your bitlbee /away message to same', license => 'GNU GPL v2', url => 'http://twirssi.com', - changed => '$Date: 2009-04-09 21:22:55 -0700 (Thu, 09 Apr 2009) $', + changed => '$Date: 2009-08-07 01:24:53 -0700 (Fri, 07 Aug 2009) $', ); my $window; @@ -30,11 +31,14 @@ my $user; my $defservice; my $poll; my $last_poll; +my $last_friends_poll = 0; my %nicks; my %friends; my %tweet_cache; my %id_map; -my $failwhale = 0; +my $failwhale = 0; +my $first_call = 1; + my %irssi_to_mirc_colors = ( '%k' => '01', '%r' => '05', @@ -179,8 +183,9 @@ sub cmd_retweet_as { unless ( $twits{$username}->update( { - status => $data, - in_reply_to_status_id => $id_map{ lc $nick }[$id] + status => $data, + + # in_reply_to_status_id => $id_map{ lc $nick }[$id] } ) ) @@ -490,9 +495,19 @@ 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") ) { + $twit->ua->timeout($timeout); + } + unless ( $twit->verify_credentials() ) { ¬ice("Login as $user\@$service failed"); $twit = undef; @@ -524,7 +539,7 @@ sub cmd_login { ¬ice("Welcome to twirssi!" . " Perhaps you should add \@twirssi to your friends list," . " so you can be notified when a new version is release?" - . " Just type /twitter_friend twirssi." ); + . " Just type /twitter_follow twirssi." ); } } %nicks = %friends; @@ -552,12 +567,12 @@ sub cmd_add_search { return; } - if ( exists $id_map{__searches}{$user}{$data} ) { + if ( exists $id_map{__searches}{"$user\@$defservice"}{$data} ) { ¬ice("Already had a subscription for '$data'"); return; } - $id_map{__searches}{$user}{$data} = 1; + $id_map{__searches}{"$user\@$defservice"}{$data} = 1; ¬ice("Added subscription for '$data'"); } @@ -577,12 +592,12 @@ sub cmd_del_search { return; } - unless ( exists $id_map{__searches}{$user}{$data} ) { + unless ( exists $id_map{__searches}{"$user\@$defservice"}{$data} ) { ¬ice("No subscription found for '$data'"); return; } - delete $id_map{__searches}{$user}{$data}; + delete $id_map{__searches}{"$user\@$defservice"}{$data}; ¬ice("Removed subscription for '$data'"); } @@ -659,10 +674,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,7 +777,8 @@ sub get_updates { my $pid = fork(); if ($pid) { # parent - Irssi::timeout_add_once( 5000, 'monitor_child', [ $filename, 0 ] ); + Irssi::timeout_add_once( 5000, 'monitor_child', + [ "$filename.done", 0 ] ); Irssi::pidwait_add($pid); } elsif ( defined $pid ) { # child close STDIN; @@ -770,15 +793,22 @@ sub get_updates { $error++ unless &do_updates( $fh, $_, $twits{$_}, \%context_cache ); } - my ( $added, $removed ) = &load_friends($fh); - if ( $added + $removed ) { - print $fh "type:debug %R***%n Friends list updated: ", - join( ", ", - sprintf( "%d added", $added ), - sprintf( "%d removed", $removed ) ), - "\n"; - } print $fh "__friends__\n"; + if ( + time - $last_friends_poll > + Irssi::settings_get_int('twitter_friends_poll') ) + { + print $fh "__updated ", time, "\n"; + my ( $added, $removed ) = &load_friends($fh); + if ( $added + $removed ) { + print $fh "type:debug %R***%n Friends list updated: ", + join( ", ", + sprintf( "%d added", $added ), + sprintf( "%d removed", $removed ) ), + "\n"; + } + } + foreach ( sort keys %friends ) { print $fh "$_ $friends{$_}\n"; } @@ -790,7 +820,10 @@ sub get_updates { print $fh "-- $new_poll"; } close $fh; + rename $filename, "$filename.done"; exit; + } else { + &ccrap("Failed to fork for updating: $!"); } print scalar localtime, " - get_updates ends" if &debug; } @@ -810,8 +843,7 @@ sub do_updates { eval { if ( $id_map{__last_id}{$username}{timeline} ) { - $tweets = $obj->friends_timeline( - { since_id => $id_map{__last_id}{$username}{timeline} } ); + $tweets = $obj->friends_timeline( { count => 100 } ); } else { $tweets = $obj->friends_timeline(); } @@ -841,7 +873,7 @@ sub do_updates { foreach my $t ( reverse @$tweets ) { my $text = decode_entities( $t->{text} ); - $text = &hilight($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 @@ -861,13 +893,13 @@ sub do_updates { if ($context) { my $ctext = decode_entities( $context->{text} ); - $ctext = &hilight($ctext); + $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:%d account:%s nick:%s type:tweet %s\n", + printf $fh "id:%u account:%s nick:%s type:tweet %s\n", $context->{id}, $username, $context->{user}{screen_name}, $ctext; $reply = "reply"; @@ -880,14 +912,16 @@ sub do_updates { $text .= " -- http://twitter.com/$t->{user}{screen_name}" . "/status/$t->{id}"; } - printf $fh "id:%d account:%s nick:%s type:%s %s\n", + printf $fh "id:%u 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:%d account:%s type:last_id timeline\n", + 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} ) @@ -910,16 +944,16 @@ sub do_updates { if exists $friends{ $t->{user}{screen_name} }; my $text = decode_entities( $t->{text} ); - $text = &hilight($text); + $text =~ s/[\n\r]/ /g; if ( $t->{truncated} ) { $text .= " -- http://twitter.com/$t->{user}{screen_name}" . "/status/$t->{id}"; } - printf $fh "id:%d account:%s nick:%s type:tweet %s\n", + printf $fh "id:%u 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:%d account:%s type:last_id reply\n", $new_poll_id, $username; + printf $fh "id:%u account:%s type:last_id reply\n", $new_poll_id, $username; print scalar localtime, " - Polling for DMs" if &debug; $new_poll_id = 0; @@ -941,12 +975,12 @@ sub do_updates { foreach my $t ( reverse @$tweets ) { my $text = decode_entities( $t->{text} ); - $text = &hilight($text); - printf $fh "id:%d account:%s nick:%s type:dm %s\n", + $text =~ s/[\n\r]/ /g; + printf $fh "id:%u 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:%d account:%s type:last_id dm\n", $new_poll_id, $username; + printf $fh "id:%u 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} ) { @@ -976,13 +1010,13 @@ sub do_updates { } $id_map{__searches}{$username}{$topic} = $search->{max_id}; - printf $fh "id:%d account:%s type:searchid topic:%s\n", + printf $fh "id:%u 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 = &hilight($text); - printf $fh "id:%d account:%s nick:%s type:search topic:%s %s\n", + $text =~ s/[\n\r]/ /g; + printf $fh "id:%u 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 @@ -1007,15 +1041,18 @@ sub monitor_child { # first time we run we don't want to print out *everything*, so we just # pretend - my $suppress = 0; - $suppress = 1 unless keys %tweet_cache; if ( open FILE, $filename ) { + binmode FILE, ":utf8"; my @lines; my %new_cache; while () { - chomp; last if /^__friends__/; + unless (/\n$/) { # skip partial lines + # print "Skipping partial line: $_" if &debug; + next; + } + chomp; my $hilight = 0; my %meta; @@ -1066,8 +1103,7 @@ sub monitor_child { my $hilight_color = $irssi_to_mirc_colors{ Irssi::settings_get_str("hilight_color") }; - my $nick = - '@' . substr( $meta{account}, 0, index( $meta{account}, "@" ) ); + my $nick = "\@$meta{account}"; if ( $_ =~ /\Q$nick\E(?:\W|$)/i and Irssi::settings_get_bool("twirssi_hilights") ) { @@ -1105,8 +1141,9 @@ sub monitor_child { } elsif ( $meta{type} eq 'searchid' ) { print "Search '$meta{topic}' returned id $meta{id}" if &debug; if ( + not exists $id_map{__searches}{ $meta{account} }{ $meta{topic} } - and $meta{id} >= + or $meta{id} >= $id_map{__searches}{ $meta{account} }{ $meta{topic} } ) { $id_map{__searches}{ $meta{account} }{ $meta{topic} } = @@ -1130,9 +1167,23 @@ sub monitor_child { %friends = (); while () { + if (/^__updated (\d+)$/) { + $last_friends_poll = $1; + print "Friend list updated" if &debug; + next; + } + 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; @@ -1141,14 +1192,15 @@ sub monitor_child { if ($new_last_poll) { print "new last_poll = $new_last_poll" if &debug; print "new last_poll_id = ", Dumper( $id_map{__last_id} ) if &debug; - if ($suppress) { + if ($first_call) { print "First call, not printing updates" if &debug; } else { foreach my $line (@lines) { $window->printformat( $line->[0], "twirssi_" . $line->[1], - @$line[ 2 .. $#$line ] + @$line[ 2 .. $#$line - 1 ], + &hilight( $line->[-1] ) ); } } @@ -1181,7 +1233,8 @@ sub monitor_child { &ccrap("Failed to write replies to $file: $!"); } } - $failwhale = 0; + $failwhale = 0; + $first_call = 0; return; } } @@ -1221,7 +1274,10 @@ sub monitor_child { } $failwhale = 1; } - &ccrap("Haven't been able to get updated tweets since $since"); + + if ( time - $last_poll < 600 ) { + &ccrap("Haven't been able to get updated tweets since $since"); + } } } @@ -1311,6 +1367,13 @@ sub sig_complete { keys %{ $id_map{__indexes} }; } + if ( $linestart =~ /^\/twitter_unfriend\s*$/ ) + { # /twitter_unfriend gets a nick + $word =~ s/^@//; + push @$complist, grep /^\Q$word/i, + sort { $nicks{$b} <=> $nicks{$a} } keys %nicks; + } + # /tweet, /tweet_as, /dm, /dm_as - complete @nicks (and nicks as the first # arg to dm) if ( $linestart =~ /^\/(?:tweet|dm)/ ) { @@ -1352,7 +1415,7 @@ sub hilight { if ( Irssi::settings_get_str("twirssi_topic_color") ) { my $c = Irssi::settings_get_str("twirssi_topic_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$3\cO/g if $c; } $text =~ s/[\n\r]/ /g; @@ -1398,7 +1461,7 @@ sub shorten { } } - return $data; + return decode "utf8", $data; } sub normalize_username { @@ -1455,6 +1518,10 @@ Irssi::settings_add_str( "twirssi", "twirssi_location", ".irssi/scripts/twirssi.pl" ); 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 ); Irssi::settings_add_bool( "twirssi", "show_reply_context", 0 ); @@ -1468,6 +1535,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') ); @@ -1499,6 +1567,7 @@ 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( "bitlbee_away", "update_away" ); if ( Irssi::settings_get_bool("twirssi_use_reply_aliases") ) { Irssi::command_bind( "reply", "cmd_reply" ); Irssi::command_bind( "reply_as", "cmd_reply_as" ); @@ -1531,15 +1600,15 @@ if ($window) { } ); Irssi::command_bind( - "twitter_friend", + "twitter_follow", &gen_cmd( - "/twitter_friend ", + "/twitter_follow ", "create_friend", sub { ¬ice("Following $_[0]"); $nicks{ $_[0] } = time; } ) ); Irssi::command_bind( - "twitter_unfriend", + "twitter_unfollow", &gen_cmd( "/twitter_unfriend ", "destroy_friend",