X-Git-Url: https://git.sommitrealweird.co.uk/twirssi-net-twitter-lite.git/blobdiff_plain/f4b220535e82988bf50156a9f41bfb3054e47267..e001d6141c89a41ceca27b1b46e2a629afcc1bde:/twirssi.pl?ds=inline diff --git a/twirssi.pl b/twirssi.pl index b3b63a5..44fae63 100644 --- a/twirssi.pl +++ b/twirssi.pl @@ -11,8 +11,8 @@ $Data::Dumper::Indent = 1; use vars qw($VERSION %IRSSI); -$VERSION = "2.0.1"; -my ($REV) = '$Rev: 449 $' =~ /(\d+)/; +$VERSION = "2.1.2beta"; +my ($REV) = '$Rev: 522 $' =~ /(\d+)/; %IRSSI = ( authors => 'Dan Boger', contact => 'zigdon@gmail.com', @@ -21,7 +21,7 @@ my ($REV) = '$Rev: 449 $' =~ /(\d+)/; . 'Can optionally set your bitlbee /away message to same', license => 'GNU GPL v2', url => 'http://twirssi.com', - changed => '$Date: 2009-02-02 09:49:45 -0800 (Mon, 02 Feb 2009) $', + changed => '$Date: 2009-03-07 14:07:25 -0800 (Sat, 07 Mar 2009) $', ); my $window; @@ -34,6 +34,7 @@ my %nicks; my %friends; my %tweet_cache; my %id_map; +my $failwhale = 0; my %irssi_to_mirc_colors = ( '%k' => '01', '%r' => '05', @@ -81,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 { @@ -118,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 ) { @@ -140,16 +147,18 @@ sub cmd_tweet_as { 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; } @@ -219,21 +228,27 @@ 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; + } + + if ( &too_long( $data, 1 ) ) { + 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; + }; + } } } return if &too_long($data); + my $success = 1; eval { unless ( $twits{$username}->update( @@ -245,12 +260,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; } @@ -277,13 +293,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."); @@ -314,21 +332,15 @@ sub cmd_logout { $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; } } @@ -342,14 +354,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; @@ -404,7 +428,7 @@ sub cmd_login { } %nicks = %friends; $nicks{$user} = 0; - &get_updates; + return 1; } else { ¬ice("Login failed"); } @@ -492,15 +516,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 ($@) { @@ -534,11 +551,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." @@ -630,6 +650,7 @@ sub get_updates { return unless &logged_in($twit); my ( $fh, $filename ) = File::Temp::tempfile(); + binmode( $fh, ":utf8" ); my $pid = fork(); if ($pid) { # parent @@ -685,13 +706,11 @@ sub do_updates { 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; } @@ -730,6 +749,12 @@ sub do_updates { 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: $@"; @@ -744,6 +769,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; @@ -765,6 +796,12 @@ sub do_updates { $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; @@ -840,8 +877,15 @@ 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__/; @@ -853,8 +897,18 @@ sub monitor_child { } } - 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}: "; @@ -874,7 +928,9 @@ sub monitor_child { my $hilight_color = $irssi_to_mirc_colors{ Irssi::settings_get_str("hilight_color") }; - if ( $_ =~ /\@$meta{account}\W/i ) { + if ( ( $_ =~ /\@$meta{account}\W/i ) + && Irssi::settings_get_bool("twirssi_hilights") ) + { $meta{nick} = "\cC$hilight_color$meta{nick}\cO"; $hilight = MSGLEVEL_HILIGHT; } @@ -885,6 +941,12 @@ sub monitor_child { ( 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, [ @@ -892,6 +954,14 @@ sub monitor_child { $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, [ @@ -899,16 +969,17 @@ sub monitor_child { $meta{type}, $account, $meta{nick}, $_ ]; } elsif ( $meta{type} eq 'searchid' ) { - print "Search '$meta{topic}' returned id $meta{id}"; - if ( $meta{id} >= + 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}; - } else { + } elsif (&debug) { print "Search '$meta{topic}' returned invalid id $meta{id}"; } - print "Search '$meta{topic}' id set to $meta{id}" if &debug; } elsif ( $meta{type} eq 'error' ) { push @lines, [ MSGLEVEL_MSGS, $_ ]; } elsif ( $meta{type} eq 'debug' ) { @@ -930,12 +1001,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 .. $#$line ] - ); + 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; @@ -943,9 +1018,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; @@ -959,21 +1038,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"); } } @@ -985,6 +1093,10 @@ sub notice { $window->print( "%R***%n @_", MSGLEVEL_PUBLIC ); } +sub ccrap { + $window->print( "%R***%n @_", MSGLEVEL_CLIENTCRAP ); +} + sub update_away { my $data = shift; @@ -998,7 +1110,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; } @@ -1051,8 +1163,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 @@ -1088,8 +1202,16 @@ sub get_poll_time { sub hilight { my $text = shift; - $text =~ s/(^|\W)\@([-\w]+)/$1\cC12\@$2\cO/g; - $text =~ s/(^|\W)\#([-\w]+)/$1\cC5\#$2\cO/g; + 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; @@ -1117,18 +1239,28 @@ 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_str( "twirssi", "twirssi_nick_color", "%B" ); +Irssi::settings_add_str( "twirssi", "twirssi_topic_color", "%r" ); +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", "tweet_window_input", 0 ); $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 ); @@ -1162,6 +1294,11 @@ if ($window) { print "nicks: ", join ", ", sort keys %nicks; 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( @@ -1210,6 +1347,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: $!"); @@ -1230,6 +1368,7 @@ if ($window) { and my $autopass = Irssi::settings_get_str("twitter_passwords") ) { &cmd_login(); + &get_updates; } } else {