X-Git-Url: https://git.sommitrealweird.co.uk/twirssi-net-twitter-lite.git/blobdiff_plain/318479f01f223aa72d8c3ab48622521c15bb8364..885c7bec9c577babd66109642635146ca99551f9:/twirssi.pl diff --git a/twirssi.pl b/twirssi.pl index e10396c..7753409 100644 --- a/twirssi.pl +++ b/twirssi.pl @@ -10,8 +10,8 @@ $Data::Dumper::Indent = 1; use vars qw($VERSION %IRSSI); -$VERSION = "2.2.2beta"; -my ($REV) = '$Rev: 612 $' =~ /(\d+)/; +$VERSION = "2.2.4beta"; +my ($REV) = '$Rev: 650 $' =~ /(\d+)/; %IRSSI = ( authors => 'Dan Boger', contact => 'zigdon@gmail.com', @@ -20,7 +20,7 @@ my ($REV) = '$Rev: 612 $' =~ /(\d+)/; . 'Can optionally set your bitlbee /away message to same', license => 'GNU GPL v2', url => 'http://twirssi.com', - changed => '$Date: 2009-04-17 16:02:53 -0700 (Fri, 17 Apr 2009) $', + changed => '$Date: 2009-06-11 16:51:40 -0700 (Thu, 11 Jun 2009) $', ); my $window; @@ -30,11 +30,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', @@ -180,7 +183,7 @@ sub cmd_retweet_as { $twits{$username}->update( { status => $data, - in_reply_to_status_id => $id_map{ lc $nick }[$id] + # in_reply_to_status_id => $id_map{ lc $nick }[$id] } ) ) @@ -552,12 +555,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 +580,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'"); } @@ -770,15 +773,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"; } @@ -791,6 +801,8 @@ sub get_updates { } close $fh; exit; + } else { + &ccrap("Failed to fork for updating: $!"); } print scalar localtime, " - get_updates ends" if &debug; } @@ -1006,15 +1018,17 @@ 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 ) { 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; @@ -1065,8 +1079,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") ) { @@ -1104,8 +1117,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} } = @@ -1129,6 +1143,12 @@ 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; @@ -1140,7 +1160,7 @@ 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) { @@ -1180,7 +1200,8 @@ sub monitor_child { &ccrap("Failed to write replies to $file: $!"); } } - $failwhale = 0; + $failwhale = 0; + $first_call = 0; return; } } @@ -1220,7 +1241,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"); + } } } @@ -1358,7 +1382,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; @@ -1461,6 +1485,9 @@ 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_bool( "twirssi", "twirssi_upgrade_beta", 0 ); Irssi::settings_add_bool( "twirssi", "tweet_to_away", 0 ); Irssi::settings_add_bool( "twirssi", "show_reply_context", 0 ); @@ -1505,6 +1532,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" );