X-Git-Url: https://git.sommitrealweird.co.uk/twirssi-net-twitter-lite.git/blobdiff_plain/01e6bdc8186acbd3c5f570e2252a8f9fc1009b8a..2c4bb6a4f3a97c91dd7e2e595024358bc496f7a5:/twirssi.pl?ds=inline diff --git a/twirssi.pl b/twirssi.pl index a1b4bcf..ced5f95 100644 --- a/twirssi.pl +++ b/twirssi.pl @@ -11,8 +11,8 @@ $Data::Dumper::Indent = 1; use vars qw($VERSION %IRSSI); -$VERSION = "1.7.6"; -my ($REV) = '$Rev: 379 $' =~ /(\d+)/; +$VERSION = "2.1.3beta"; +my ($REV) = '$Rev: 548 $' =~ /(\d+)/; %IRSSI = ( authors => 'Dan Boger', contact => 'zigdon@gmail.com', @@ -20,8 +20,8 @@ my ($REV) = '$Rev: 379 $' =~ /(\d+)/; description => 'Send twitter updates using /tweet. ' . 'Can optionally set your bitlbee /away message to same', license => 'GNU GPL v2', - url => 'http://tinyurl.com/twirssi', - changed => '$Date: 2009-01-21 09:50:42 -0800 (Wed, 21 Jan 2009) $', + url => 'http://twirssi.com', + changed => '$Date: 2009-03-13 10:45:47 -0700 (Fri, 13 Mar 2009) $', ); my $window; @@ -29,11 +29,30 @@ my $twit; my %twits; my $user; my $poll; +my $last_poll; my %nicks; my %friends; -my $last_poll = time - 300; my %tweet_cache; my %id_map; +my $failwhale = 0; +my %irssi_to_mirc_colors = ( + '%k' => '01', + '%r' => '05', + '%g' => '03', + '%y' => '07', + '%b' => '02', + '%m' => '06', + '%c' => '10', + '%w' => '15', + '%K' => '14', + '%R' => '04', + '%G' => '09', + '%Y' => '08', + '%B' => '12', + '%M' => '13', + '%C' => '11', + '%W' => '00', +); sub cmd_direct { my ( $data, $server, $win ) = @_; @@ -63,21 +82,26 @@ sub cmd_direct_as { return unless &valid_username($username); eval { - unless ( $twits{$username} + if ( $twits{$username} ->new_direct_message( { user => $target, text => $text } ) ) { + ¬ice("DM sent to $target"); + $nicks{$target} = time; + } else { + my $error; + eval { + $error = JSON::Any->jsonToObj( $twits{$username}->get_error() ); + $error = $error->{error}; + }; + die $error if $error; ¬ice("DM to $target failed"); - return; } }; if ($@) { - ¬ice("DM caused an error. Aborted"); + ¬ice("DM caused an error: $@"); return; } - - ¬ice("DM sent to $target"); - $nicks{$target} = time; } sub cmd_tweet { @@ -100,6 +124,7 @@ sub cmd_tweet_as { return unless &logged_in($twit); $data =~ s/^\s+|\s+$//; + $data =~ s/\s\s+/ /g; my ( $username, $data ) = split ' ', $data, 2; unless ( $username and $data ) { @@ -109,27 +134,22 @@ sub cmd_tweet_as { return unless &valid_username($username); - if ( Irssi::settings_get_str("short_url_provider") ) { - foreach my $url ( $data =~ /(https?:\/\/\S+[\w\/])/g ) { - eval { - my $short = makeashorterlink($url); - $data =~ s/\Q$url/$short/g; - }; - } - } + $data = &shorten($data); return if &too_long($data); + my $success = 1; eval { unless ( $twits{$username}->update($data) ) { ¬ice("Update failed"); - return; + $success = 0; } }; + return unless $success; if ($@) { - ¬ice("Update caused an error. Aborted."); + ¬ice("Update caused an error: $@. Aborted."); return; } @@ -199,21 +219,18 @@ sub cmd_reply_as { return; } - # remove any @nick at the beginning of the reply, as we'll add it anyway - $data =~ s/^\s*\@?$nick\s*//; - $data = "\@$nick " . $data; + if ( Irssi::settings_get_bool("twirssi_replies_autonick") ) { - if ( Irssi::settings_get_str("short_url_provider") ) { - foreach my $url ( $data =~ /(https?:\/\/\S+[\w\/])/g ) { - eval { - my $short = makeashorterlink($url); - $data =~ s/\Q$url/$short/g; - }; - } + # remove any @nick at the beginning of the reply, as we'll add it anyway + $data =~ s/^\s*\@?$nick\s*//; + $data = "\@$nick " . $data; } + $data = &shorten($data); + return if &too_long($data); + my $success = 1; eval { unless ( $twits{$username}->update( @@ -225,12 +242,13 @@ sub cmd_reply_as { ) { ¬ice("Update failed"); - return; + $success = 0; } }; + return unless $success; if ($@) { - ¬ice("Update caused an error. Aborted"); + ¬ice("Update caused an error: $@. Aborted"); return; } @@ -257,13 +275,15 @@ sub gen_cmd { return; } + my $success = 1; eval { unless ( $twit->$api_name($data) ) { ¬ice("$api_name failed"); - return; + $success = 0; } }; + return unless $success; if ($@) { ¬ice("$api_name caused an error. Aborted."); @@ -291,23 +311,18 @@ sub cmd_logout { my ( $data, $server, $win ) = @_; $data =~ s/^\s+|\s+$//g; + $data = $user unless $data; return unless &valid_username($data); - if ($data) { - ¬ice("Logging out $data..."); - $twits{$data}->end_session(); - delete $twits{$data}; + ¬ice("Logging out $data..."); + $twits{$data}->end_session(); + delete $twits{$data}; + undef $twit; + if ( keys %twits ) { + &cmd_switch( ( keys %twits )[0], $server, $win ); } else { - ¬ice("Logging out $user..."); - $twit->end_session(); - undef $twit; - delete $twits{$user}; - if ( keys %twits ) { - &cmd_switch( ( keys %twits )[0], $server, $win ); - } else { - Irssi::timeout_remove($poll) if $poll; - undef $poll; - } + Irssi::timeout_remove($poll) if $poll; + undef $poll; } } @@ -321,14 +336,26 @@ sub cmd_login { { my @user = split /\s*,\s*/, $autouser; my @pass = split /\s*,\s*/, $autopass; - if ( @user != @pass ) { + + # if a password ends with a '\', it was meant to escape the comma, and + # it should be concatinated with the next one + my @unescaped; + while (@pass) { + my $p = shift @pass; + while ( $p =~ /\\$/ and @pass ) { + $p .= "," . shift @pass; + } + push @unescaped, $p; + } + + if ( @user != @unescaped ) { ¬ice("Number of usernames doesn't match " . "the number of passwords - auto-login failed" ); } else { my ( $u, $p ); - while ( @user and @pass ) { + while ( @user and @unescaped ) { $u = shift @user; - $p = shift @pass; + $p = shift @unescaped; &cmd_login("$u $p"); } return; @@ -359,14 +386,16 @@ sub cmd_login { if ($twit) { my $rate_limit = $twit->rate_limit_status(); if ( $rate_limit and $rate_limit->{remaining_hits} < 1 ) { - ¬ice("Rate limit exceeded, try again later"); + ¬ice( + "Rate limit exceeded, try again after $rate_limit->{reset_time}" + ); $twit = undef; return; } $twits{$user} = $twit; Irssi::timeout_remove($poll) if $poll; - $poll = Irssi::timeout_add( 300 * 1000, \&get_updates, "" ); + $poll = Irssi::timeout_add( &get_poll_time * 1000, \&get_updates, "" ); ¬ice("Logged in as $user, loading friends list..."); &load_friends(); ¬ice( "loaded friends: ", scalar keys %friends ); @@ -381,12 +410,83 @@ sub cmd_login { } %nicks = %friends; $nicks{$user} = 0; - &get_updates; + return 1; } else { ¬ice("Login failed"); } } +sub cmd_add_search { + my ( $data, $server, $win ) = @_; + + unless ( $twit and $twit->can('search') ) { + ¬ice("ERROR: Your version of Net::Twitter ($Net::Twitter::VERSION) " + . "doesn't support searches." ); + return; + } + + $data =~ s/^\s+|\s+$//; + $data = lc $data; + + unless ($data) { + ¬ice("Usage: /twitter_subscribe "); + return; + } + + if ( exists $id_map{__searches}{$user}{$data} ) { + ¬ice("Already had a subscription for '$data'"); + return; + } + + $id_map{__searches}{$user}{$data} = 1; + ¬ice("Added subscription for '$data'"); +} + +sub cmd_del_search { + my ( $data, $server, $win ) = @_; + + unless ( $twit and $twit->can('search') ) { + ¬ice("ERROR: Your version of Net::Twitter ($Net::Twitter::VERSION) " + . "doesn't support searches." ); + return; + } + $data =~ s/^\s+|\s+$//; + $data = lc $data; + + unless ($data) { + ¬ice("Usage: /twitter_unsubscribe "); + return; + } + + unless ( exists $id_map{__searches}{$user}{$data} ) { + ¬ice("No subscription found for '$data'"); + return; + } + + delete $id_map{__searches}{$user}{$data}; + ¬ice("Removed subscription for '$data'"); +} + +sub cmd_list_search { + my ( $data, $server, $win ) = @_; + + my $found = 0; + foreach my $suser ( sort keys %{ $id_map{__searches} } ) { + my $topics; + foreach my $topic ( sort keys %{ $id_map{__searches}{$suser} } ) { + $topics = $topics ? "$topics, $topic" : $topic; + } + if ($topics) { + $found = 1; + ¬ice("Search subscriptions for \@$suser: $topics"); + } + } + + unless ($found) { + ¬ice("No search subscriptions set up"); + } +} + sub cmd_upgrade { my ( $data, $server, $win ) = @_; @@ -398,15 +498,8 @@ sub cmd_upgrade { return; } - if ( not -x "/usr/bin/md5sum" and not $data ) { - ¬ice( -"/usr/bin/md5sum can't be found - try '/twirssi_upgrade nomd5' to skip MD5 verification" - ); - return; - } - my $md5; - unless ($data) { + unless ( $data or Irssi::settings_get_bool("twirssi_upgrade_beta") ) { eval { use Digest::MD5; }; if ($@) { @@ -440,11 +533,14 @@ sub cmd_upgrade { } } - my $URL = "http://twirssi.com/twirssi.pl"; + my $URL = + Irssi::settings_get_bool("twirssi_upgrade_beta") + ? "http://github.com/zigdon/twirssi/raw/master/twirssi.pl" + : "http://twirssi.com/twirssi.pl"; ¬ice("Downloading twirssi from $URL"); LWP::Simple::getstore( $URL, "$loc.upgrade" ); - unless ($data) { + 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." @@ -536,6 +632,7 @@ sub get_updates { return unless &logged_in($twit); my ( $fh, $filename ) = File::Temp::tempfile(); + binmode( $fh, ":utf8" ); my $pid = fork(); if ($pid) { # parent @@ -583,15 +680,19 @@ sub get_updates { sub do_updates { my ( $fh, $username, $obj ) = @_; + my $rate_limit = $obj->rate_limit_status(); + if ( $rate_limit and $rate_limit->{remaining_hits} < 1 ) { + ¬ice("Rate limit exceeded for $username"); + return 1; + } + print scalar localtime, " - Polling for updates for $username" if &debug; my $tweets; - eval { - $tweets = $obj->friends_timeline( - { since => HTTP::Date::time2str($last_poll) } ); - }; + eval { $tweets = $obj->friends_timeline(); }; if ($@) { - print $fh "type:debug Error during friends_timeline call. Aborted.\n"; + print $fh + "type:debug Error during friends_timeline call: $@. Aborted.\n"; return 1; } @@ -611,8 +712,7 @@ sub do_updates { foreach my $t ( reverse @$tweets ) { my $text = decode_entities( $t->{text} ); - $text =~ s/(^|\W)\@([-\w]+)/$1\cC12\@$2\cO/g; - $text =~ s/[\n\r]/ /g; + $text = &hilight($text); my $reply = "tweet"; if ( Irssi::settings_get_bool("show_reply_context") and $t->{in_reply_to_screen_name} ne $username @@ -627,17 +727,22 @@ sub do_updates { if ($context) { my $ctext = decode_entities( $context->{text} ); - $ctext =~ s/(^|\W)\@([-\w]+)/$1\cC12\@$2\cO/g; - $ctext =~ s/[\n\r]/ /g; + $ctext = &hilight($ctext); printf $fh "id:%d account:%s nick:%s type:tweet %s\n", $context->{id}, $username, $context->{user}{screen_name}, $ctext; + if ( $context->{truncated} ) { + printf $fh "id:%s account:%s nick:%s type:ellispis %s\n", + $context->{id} . "-url", $username, + $context->{user}{screen_name}, +"http://twitter.com/$context->{user}{screen_name}/status/$context->{id}"; + } $reply = "reply"; } elsif ($@) { print $fh "type:debug request to get context failed: $@"; } else { print $fh -"type:debug Failed to get context from $t->{in_reply_to_screen_name}" +"type:debug Failed to get context from $t->{in_reply_to_screen_name}\n" if &debug; } } @@ -646,6 +751,12 @@ sub do_updates { and not Irssi::settings_get_bool("show_own_tweets"); printf $fh "id:%d account:%s nick:%s type:%s %s\n", $t->{id}, $username, $t->{user}{screen_name}, $reply, $text; + if ( $t->{truncated} ) { + printf $fh "id:%s account:%s nick:%s type:ellispis %s\n", + $t->{id} . "-url", $username, + $t->{user}{screen_name}, + "http://twitter.com/$t->{user}{screen_name}/status/$t->{id}"; + } } print scalar localtime, " - Polling for replies" if &debug; @@ -664,10 +775,15 @@ sub do_updates { if exists $friends{ $t->{user}{screen_name} }; my $text = decode_entities( $t->{text} ); - $text =~ s/(^|\W)\@([-\w]+)/$1\cC12\@$2\cO/g; - $text =~ s/[\n\r]/ /g; + $text = &hilight($text); printf $fh "id:%d account:%s nick:%s type:tweet %s\n", $t->{id}, $username, $t->{user}{screen_name}, $text; + if ( $t->{truncated} ) { + printf $fh "id:%s account:%s nick:%s type:ellispis %s\n", + $t->{id} . "-url", $username, + $t->{user}{screen_name}, + "http://twitter.com/$t->{user}{screen_name}/status/$t->{id}"; + } } print scalar localtime, " - Polling for DMs" if &debug; @@ -684,11 +800,52 @@ sub do_updates { foreach my $t ( reverse @$tweets ) { my $text = decode_entities( $t->{text} ); - $text =~ s/(^|\W)\@([-\w]+)/$1\cC12\@$2\cO/g; - $text =~ s/[\n\r]/ /g; + $text = &hilight($text); printf $fh "id:%d account:%s nick:%s type:dm %s\n", $t->{id}, $username, $t->{sender_screen_name}, $text; } + + print scalar localtime, " - Polling for subscriptions" if &debug; + if ( $obj->can('search') and $id_map{__searches}{$username} ) { + my $search; + foreach my $topic ( sort keys %{ $id_map{__searches}{$username} } ) { + print $fh "type:debug searching for $topic since ", + "$id_map{__searches}{$username}{$topic}\n"; + eval { + $search = $obj->search( + { + q => $topic, + since_id => $id_map{__searches}{$username}{$topic} + } + ); + }; + + if ($@) { + print $fh + "type:debug Error during search($topic) call. Aborted.\n"; + return 1; + } + + unless ( $search->{max_id} ) { + print $fh +"type:debug Invalid search results when searching for $topic.", + " Aborted.\n"; + return 1; + } + + $id_map{__searches}{$username}{$topic} = $search->{max_id}; + printf $fh "id:%d 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", + $t->{id}, $username, $t->{from_user}, $topic, $text; + } + } + } + print scalar localtime, " - Done" if &debug; return 0; @@ -702,21 +859,38 @@ sub monitor_child { print scalar localtime, " - checking child log at $filename ($attempt)" if &debug; my $new_last_poll; + + # 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__/; my $hilight = 0; my %meta; - foreach my $key (qw/id account nick type/) { + foreach my $key (qw/id account nick type topic/) { if (s/^$key:(\S+)\s*//) { $meta{$key} = $1; } } - next if exists $meta{id} and exists $tweet_cache{ $meta{id} }; - $tweet_cache{ $meta{id} } = time; + if ( not $meta{type} or $meta{type} ne 'searchid' ) { + if ( exists $meta{id} and exists $new_cache{ $meta{id} } ) { + next; + } + + $new_cache{ $meta{id} } = time; + + if ( exists $meta{id} and exists $tweet_cache{ $meta{id} } ) { + next; + } + } + my $account = ""; if ( $meta{account} ne $user ) { $account = "$meta{account}: "; @@ -734,18 +908,59 @@ sub monitor_child { $marker = ":$marker"; } - if ( $_ =~ /\@$meta{account}\W/ ) { + my $hilight_color = + $irssi_to_mirc_colors{ Irssi::settings_get_str("hilight_color") }; + if ( ( $_ =~ /\@$meta{account}\W/i ) + && Irssi::settings_get_bool("twirssi_hilights") ) + { + $meta{nick} = "\cC$hilight_color$meta{nick}\cO"; $hilight = MSGLEVEL_HILIGHT; } - if ( $meta{type} eq 'tweet' ) { - push @lines, [(MSGLEVEL_PUBLIC | $hilight), $meta{type}, $account, $meta{nick}, $marker, $_]; - } elsif ( $meta{type} eq 'reply' ) { - push @lines, [(MSGLEVEL_PUBLIC | $hilight), $meta{type}, $account, $meta{nick}, $marker, $_]; + if ( $meta{type} =~ /tweet|reply/ ) { + push @lines, + [ + ( MSGLEVEL_PUBLIC | $hilight ), + $meta{type}, $account, $meta{nick}, $marker, $_ + ]; + } elsif ( $meta{type} eq 'ellispis' ) { + push @lines, + [ MSGLEVEL_PUBLIC, "tweet", $account, $meta{nick}, "", $_ ]; + } elsif ( $meta{type} eq 'search' ) { + push @lines, + [ + ( MSGLEVEL_PUBLIC | $hilight ), + $meta{type}, $account, $meta{topic}, + $meta{nick}, $marker, $_ + ]; + if ( + exists $id_map{__searches}{ $meta{account} }{ $meta{topic} } + and $meta{id} > + $id_map{__searches}{ $meta{account} }{ $meta{topic} } ) + { + $id_map{__searches}{ $meta{account} }{ $meta{topic} } = + $meta{id}; + } } elsif ( $meta{type} eq 'dm' ) { - push @lines, [(MSGLEVEL_MSGS | $hilight), $meta{type}, $account, $meta{nick}, $_]; + push @lines, + [ + ( MSGLEVEL_MSGS | $hilight ), + $meta{type}, $account, $meta{nick}, $_ + ]; + } elsif ( $meta{type} eq 'searchid' ) { + print "Search '$meta{topic}' returned id $meta{id}" if &debug; + if ( + exists $id_map{__searches}{ $meta{account} }{ $meta{topic} } + and $meta{id} >= + $id_map{__searches}{ $meta{account} }{ $meta{topic} } ) + { + $id_map{__searches}{ $meta{account} }{ $meta{topic} } = + $meta{id}; + } elsif (&debug) { + print "Search '$meta{topic}' returned invalid id $meta{id}"; + } } elsif ( $meta{type} eq 'error' ) { - push @lines, [MSGLEVEL_MSGS, $_]; + push @lines, [ MSGLEVEL_MSGS, $_ ]; } elsif ( $meta{type} eq 'debug' ) { print "$_" if &debug,; } else { @@ -765,9 +980,16 @@ sub monitor_child { if ($new_last_poll) { print "new last_poll = $new_last_poll" if &debug; - for my $line ( @lines ) { - $window->printformat(@$line[0], "twirssi_".@$line[1], - @$line[2,3,4,5]); + if ($suppress) { + print "First call, not printing updates" if &debug; + } else { + foreach my $line (@lines) { + $window->printformat( + $line->[0], + "twirssi_" . $line->[1], + @$line[ 2 .. $#$line ] + ); + } } close FILE; @@ -775,9 +997,13 @@ sub monitor_child { or warn "Failed to remove $filename: $!" unless &debug; + # commit the pending cache lines to the actual cache, now that + # we've printed our output + %tweet_cache = ( %tweet_cache, %new_cache ); + # keep enough cached tweets, to make sure we don't show duplicates. foreach ( keys %tweet_cache ) { - next if $tweet_cache{$_} >= $last_poll; + next if $tweet_cache{$_} >= $last_poll - 3600; delete $tweet_cache{$_}; } $last_poll = $new_last_poll; @@ -791,21 +1017,50 @@ sub monitor_child { print JSON JSON::Any->objToJson( \%id_map ); close JSON; } else { - ¬ice("Failed to write replies to $file: $!"); + &ccrap("Failed to write replies to $file: $!"); } } + $failwhale = 0; return; } } close FILE; - if ( $attempt < 12 ) { + if ( $attempt < 24 ) { Irssi::timeout_add_once( 5000, 'monitor_child', [ $filename, $attempt + 1 ] ); } else { - ¬ice("Giving up on polling $filename"); + print "Giving up on polling $filename" if &debug; unlink $filename unless &debug; + + return unless Irssi::settings_get_bool("twirssi_notify_timeouts"); + + my $since; + my @time = localtime($last_poll); + if ( time - $last_poll < 24 * 60 * 60 ) { + $since = sprintf( "%d:%02d", @time[ 2, 1 ] ); + } else { + $since = scalar localtime($last_poll); + } + + if ( not $failwhale and time - $last_poll > 60 * 60 ) { + foreach my $whale ( + q{ v v v}, + q{ | | v | v}, + q{ | .-, | | |}, + q{ .--./ / | _.---.| }, + q{ '-. (__..-" \\}, + q{ \\ a |}, + q{ ',.__. ,__.-'/}, + q{ '--/_.'----'`} + ) + { + &ccrap($whale); + } + $failwhale = 1; + } + &ccrap("Haven't been able to get updated tweets since $since"); } } @@ -817,6 +1072,10 @@ sub notice { $window->print( "%R***%n @_", MSGLEVEL_PUBLIC ); } +sub ccrap { + $window->print( "%R***%n @_", MSGLEVEL_CLIENTCRAP ); +} + sub update_away { my $data = shift; @@ -830,7 +1089,7 @@ sub update_away { $server->send_raw("away :$data"); return 1; } else { - ¬ice( "Can't find bitlbee server.", + &ccrap( "Can't find bitlbee server.", "Update bitlbee_server or disable tweet_to_away" ); return 0; } @@ -840,11 +1099,12 @@ sub update_away { } sub too_long { - my $data = shift; + my $data = shift; + my $noalert = shift; if ( length $data > 140 ) { - ¬ice( - "Tweet too long (" . length($data) . " characters) - aborted" ); + ¬ice( "Tweet too long (" . length($data) . " characters) - aborted" ) + unless $noalert; return 1; } @@ -882,8 +1142,10 @@ sub sig_complete { ) { # /twitter_reply gets a nick:num $word =~ s/^@//; - @$complist = map { "$_:$id_map{__indexes}{$_}" } grep /^\Q$word/i, - sort keys %{ $id_map{__indexes} }; + @$complist = map { "$_:$id_map{__indexes}{$_}" } + sort { $nicks{$b} <=> $nicks{$a} } + grep /^\Q$word/i, + keys %{ $id_map{__indexes} }; } # /tweet, /tweet_as, /dm, /dm_as - complete @nicks (and nicks as the first @@ -910,50 +1172,138 @@ sub event_send_text { } } +sub get_poll_time { + my $poll = Irssi::settings_get_int("twitter_poll_interval"); + return $poll if $poll >= 60; + return 60; +} + +sub hilight { + my $text = shift; + + 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; + } + 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/[\n\r]/ /g; + + return $text; +} + +sub shorten { + my $data = shift; + + my $provider = Irssi::settings_get_str("short_url_provider"); + if ( + ( + Irssi::settings_get_bool("twirssi_always_shorten") + or &too_long( $data, 1 ) + ) + and $provider + ) + { + my @args; + if ( $provider eq 'Bitly' ) { + @args[ 1, 2 ] = split ',', + Irssi::settings_get_str("short_url_args"), 2; + unless ( @args == 3 ) { + &ccrap( + "WWW::Shorten::Bitly requires a username and API key.", + "Set short_url_args to username,API_key or change your", + "short_url_provider." + ); + return $data; + } + } + + foreach my $url ( $data =~ /(https?:\/\/\S+[\w\/])/g ) { + eval { + $args[0] = $url; + my $short = makeashorterlink(@args); + if ($short) { + $data =~ s/\Q$url/$short/g; + } else { + ¬ice("Failed to shorten $url!"); + } + }; + } + } + + return $data; +} + Irssi::signal_add( "send text", "event_send_text" ); -Irssi::theme_register([ - 'twirssi_tweet', '[$0%B@$1%n$2] $3', - 'twirssi_reply', '[$0\--> %B@$1%n$2] $3', - 'twirssi_dm', '[$0%B@$1%n (%WDM%n)] $2', - 'twirssi_error', 'ERROR: $0', -]); +Irssi::theme_register( + [ + 'twirssi_tweet', '[$0%B@$1%n$2] $3', + 'twirssi_search', '[$0%r$1%n:%B@$2%n$3] $4', + 'twirssi_reply', '[$0\--> %B@$1%n$2] $3', + 'twirssi_dm', '[$0%r@$1%n (%WDM%n)] $2', + 'twirssi_error', 'ERROR: $0', + ] +); -Irssi::settings_add_str( "twirssi", "twitter_window", "twitter" ); -Irssi::settings_add_str( "twirssi", "bitlbee_server", "bitlbee" ); -Irssi::settings_add_str( "twirssi", "short_url_provider", "TinyURL" ); +Irssi::settings_add_int( "twirssi", "twitter_poll_interval", 300 ); +Irssi::settings_add_str( "twirssi", "twitter_window", "twitter" ); +Irssi::settings_add_str( "twirssi", "bitlbee_server", "bitlbee" ); +Irssi::settings_add_str( "twirssi", "short_url_provider", "TinyURL" ); +Irssi::settings_add_str( "twirssi", "short_url_args", undef ); +Irssi::settings_add_str( "twirssi", "twitter_usernames", undef ); +Irssi::settings_add_str( "twirssi", "twitter_passwords", undef ); +Irssi::settings_add_str( "twirssi", "twirssi_nick_color", "%B" ); +Irssi::settings_add_str( "twirssi", "twirssi_topic_color", "%r" ); Irssi::settings_add_str( "twirssi", "twirssi_location", ".irssi/scripts/twirssi.pl" ); -Irssi::settings_add_str( "twirssi", "twitter_usernames", undef ); -Irssi::settings_add_str( "twirssi", "twitter_passwords", undef ); Irssi::settings_add_str( "twirssi", "twirssi_replies_store", ".irssi/scripts/twirssi.json" ); +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 ); Irssi::settings_add_bool( "twirssi", "show_own_tweets", 1 ); Irssi::settings_add_bool( "twirssi", "twirssi_debug", 0 ); Irssi::settings_add_bool( "twirssi", "twirssi_first_run", 1 ); Irssi::settings_add_bool( "twirssi", "twirssi_track_replies", 1 ); +Irssi::settings_add_bool( "twirssi", "twirssi_replies_autonick", 1 ); Irssi::settings_add_bool( "twirssi", "twirssi_use_reply_aliases", 0 ); +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 ); -$window = Irssi::window_find_name( Irssi::settings_get_str('twitter_window') ); -if (!$window) { - $window = Irssi::Windowitem::window_create (Irssi::settings_get_str('twitter_window'), 1); - $window->set_name (Irssi::settings_get_str('twitter_window')); +$last_poll = time - &get_poll_time; +$window = Irssi::window_find_name( Irssi::settings_get_str('twitter_window') ); +if ( !$window ) { + Irssi::active_win() + ->print( "Couldn't find a window named '" + . Irssi::settings_get_str('twitter_window') + . "', trying to create it." ); + $window = + Irssi::Windowitem::window_create( + Irssi::settings_get_str('twitter_window'), 1 ); + $window->set_name( Irssi::settings_get_str('twitter_window') ); } if ($window) { - Irssi::command_bind( "dm", "cmd_direct" ); - Irssi::command_bind( "dm_as", "cmd_direct_as" ); - Irssi::command_bind( "tweet", "cmd_tweet" ); - Irssi::command_bind( "tweet_as", "cmd_tweet_as" ); - Irssi::command_bind( "twitter_reply", "cmd_reply" ); - Irssi::command_bind( "twitter_reply_as", "cmd_reply_as" ); - Irssi::command_bind( "twitter_login", "cmd_login" ); - Irssi::command_bind( "twitter_logout", "cmd_logout" ); - Irssi::command_bind( "twitter_switch", "cmd_switch" ); - Irssi::command_bind( "twirssi_upgrade", "cmd_upgrade" ); + Irssi::command_bind( "dm", "cmd_direct" ); + Irssi::command_bind( "dm_as", "cmd_direct_as" ); + Irssi::command_bind( "tweet", "cmd_tweet" ); + Irssi::command_bind( "tweet_as", "cmd_tweet_as" ); + Irssi::command_bind( "twitter_reply", "cmd_reply" ); + Irssi::command_bind( "twitter_reply_as", "cmd_reply_as" ); + Irssi::command_bind( "twitter_login", "cmd_login" ); + Irssi::command_bind( "twitter_logout", "cmd_logout" ); + Irssi::command_bind( "twitter_switch", "cmd_switch" ); + Irssi::command_bind( "twitter_subscribe", "cmd_add_search" ); + Irssi::command_bind( "twitter_unsubscribe", "cmd_del_search" ); + Irssi::command_bind( "twitter_list_subscriptions", "cmd_list_search" ); + Irssi::command_bind( "twirssi_upgrade", "cmd_upgrade" ); if ( Irssi::settings_get_bool("twirssi_use_reply_aliases") ) { Irssi::command_bind( "reply", "cmd_reply" ); Irssi::command_bind( "reply_as", "cmd_reply_as" ); @@ -965,8 +1315,13 @@ if ($window) { map { "u: $_->{username}" } values %twits; print "friends: ", join ", ", sort keys %friends; print "nicks: ", join ", ", sort keys %nicks; - print "id_map: ", Dumper \%{ $id_map{__indexes} }; + print "searches: ", Dumper \%{ $id_map{__searches} }; print "last poll: $last_poll"; + if ( open DUMP, ">/tmp/twirssi.cache.txt" ) { + print DUMP Dumper \%tweet_cache; + close DUMP; + print "cache written out to /tmp/twirssi.cache.txt"; + } } ); Irssi::command_bind( @@ -1015,6 +1370,7 @@ if ($window) { my $num = keys %{ $id_map{__indexes} }; ¬ice( sprintf "Loaded old replies from %d contact%s.", $num, ( $num == 1 ? "" : "s" ) ); + &cmd_list_search; }; } else { ¬ice("Failed to load old replies from $file: $!"); @@ -1022,11 +1378,13 @@ if ($window) { } if ( my $provider = Irssi::settings_get_str("short_url_provider") ) { + ¬ice("Loading WWW::Shorten::$provider..."); eval "use WWW::Shorten::$provider;"; if ($@) { ¬ice( -"Failed to load WWW::Shorten::$provider - either clear short_url_provider or install the CPAN module" + "Failed to load WWW::Shorten::$provider - either clear", + "short_url_provider or install the CPAN module" ); } } @@ -1035,6 +1393,7 @@ if ($window) { and my $autopass = Irssi::settings_get_str("twitter_passwords") ) { &cmd_login(); + &get_updates; } } else {