X-Git-Url: https://git.sommitrealweird.co.uk/twirssi-net-twitter-lite.git/blobdiff_plain/abb94ae1f393fed98efadcafd77ca04eeb034bd8..b677a10fcaf483e05489407db9b4362f18f062a1:/twirssi.pl diff --git a/twirssi.pl b/twirssi.pl index aa360ce..738e929 100644 --- a/twirssi.pl +++ b/twirssi.pl @@ -11,8 +11,8 @@ $Data::Dumper::Indent = 1; use vars qw($VERSION %IRSSI); -$VERSION = "2.0.2"; -my ($REV) = '$Rev: 454 $' =~ /(\d+)/; +$VERSION = "2.0.6"; +my ($REV) = '$Rev: 487 $' =~ /(\d+)/; %IRSSI = ( authors => 'Dan Boger', contact => 'zigdon@gmail.com', @@ -21,7 +21,7 @@ my ($REV) = '$Rev: 454 $' =~ /(\d+)/; . 'Can optionally set your bitlbee /away message to same', license => 'GNU GPL v2', url => 'http://twirssi.com', - changed => '$Date: 2009-02-04 13:35:29 -0800 (Wed, 04 Feb 2009) $', + changed => '$Date: 2009-02-24 11:27:26 -0800 (Tue, 24 Feb 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; } @@ -226,17 +235,20 @@ sub cmd_reply_as { $data = "\@$nick " . $data; } - 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; - }; + 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( @@ -248,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; } @@ -280,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."); @@ -489,13 +504,6 @@ 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) { eval { use Digest::MD5; }; @@ -627,6 +635,7 @@ sub get_updates { return unless &logged_in($twit); my ( $fh, $filename ) = File::Temp::tempfile(); + binmode( $fh, ":utf8" ); my $pid = fork(); if ($pid) { # parent @@ -682,13 +691,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; } @@ -850,7 +857,7 @@ sub monitor_child { } } - if (not $meta{type} or $meta{type} ne 'searchid') { + if ( not $meta{type} or $meta{type} ne 'searchid' ) { next if exists $meta{id} and exists $tweet_cache{ $meta{id} }; $tweet_cache{ $meta{id} } = time; } @@ -874,7 +881,9 @@ sub monitor_child { my $hilight_color = $irssi_to_mirc_colors{ Irssi::settings_get_str("hilight_color") }; - if ( ($_ =~ /\@$meta{account}\W/i) && Irssi::settings_get_bool("twirssi_hilights") ) { + if ( ( $_ =~ /\@$meta{account}\W/i ) + && Irssi::settings_get_bool("twirssi_hilights") ) + { $meta{nick} = "\cC$hilight_color$meta{nick}\cO"; $hilight = MSGLEVEL_HILIGHT; } @@ -950,7 +959,7 @@ sub monitor_child { # 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; @@ -967,18 +976,47 @@ sub monitor_child { ¬ice("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{ '--/_.'----'`} + ) + { + ¬ice($whale); + } + $failwhale = 1; + } + ¬ice("Haven't been able to get updated tweets since $since"); } } @@ -1093,8 +1131,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; @@ -1122,6 +1168,8 @@ 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", "tweet_to_away", 0 ); Irssi::settings_add_bool( "twirssi", "show_reply_context", 0 ); Irssi::settings_add_bool( "twirssi", "show_own_tweets", 1 ); @@ -1130,6 +1178,7 @@ 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 );