X-Git-Url: https://git.sommitrealweird.co.uk/twirssi-net-twitter-lite.git/blobdiff_plain/d96e64f043955a740e0ee2fc93cc4b5873abdc0a..d45fb40111af895f017bfa0d7e0f2bc9e988f2c9:/twirssi.pl diff --git a/twirssi.pl b/twirssi.pl index a147335..c3ce58f 100644 --- a/twirssi.pl +++ b/twirssi.pl @@ -1,7 +1,6 @@ use strict; use Irssi; use Irssi::Irc; -use Net::Twitter; use HTTP::Date; use HTML::Entities; use File::Temp; @@ -9,10 +8,18 @@ use LWP::Simple; use Data::Dumper; $Data::Dumper::Indent = 1; +BEGIN { + $ENV{JSON_ANY_ORDER} = "JSON Syck DWIW"; + require JSON::Any; + import JSON::Any; + require Net::Twitter; + import Net::Twitter; +} + use vars qw($VERSION %IRSSI); -$VERSION = "1.6.1"; -my ($REV) = '$Rev: 335 $' =~ /(\d+)/; +$VERSION = "1.7.3"; +my ($REV) = '$Rev: 354 $' =~ /(\d+)/; %IRSSI = ( authors => 'Dan Boger', contact => 'zigdon@gmail.com', @@ -21,7 +28,7 @@ my ($REV) = '$Rev: 335 $' =~ /(\d+)/; . 'Can optionally set your bitlbee /away message to same', license => 'GNU GPL v2', url => 'http://tinyurl.com/twirssi', - changed => 'Mon Dec 1 15:36:01 PST 2008', + changed => '$Date: 2009-01-08 14:46:04 -0800 (Thu, 08 Jan 2009) $', ); my $window; @@ -38,10 +45,7 @@ my %id_map; sub cmd_direct { my ( $data, $server, $win ) = @_; - unless ($twit) { - ¬ice("Not logged in! Use /twitter_login username pass!"); - return; - } + return unless &logged_in($twit); my ( $target, $text ) = split ' ', $data, 2; unless ( $target and $text ) { @@ -55,10 +59,7 @@ sub cmd_direct { sub cmd_direct_as { my ( $data, $server, $win ) = @_; - unless ($twit) { - ¬ice("Not logged in! Use /twitter_login username pass!"); - return; - } + return unless &logged_in($twit); my ( $username, $target, $text ) = split ' ', $data, 3; unless ( $username and $target and $text ) { @@ -66,15 +67,19 @@ sub cmd_direct_as { return; } - unless ( exists $twits{$username} ) { - ¬ice("Unknown username $username"); - return; - } + return unless &valid_username($username); - unless ( $twits{$username} - ->new_direct_message( { user => $target, text => $text } ) ) - { - ¬ice("DM to $target failed"); + eval { + unless ( $twits{$username} + ->new_direct_message( { user => $target, text => $text } ) ) + { + ¬ice("DM to $target failed"); + return; + } + }; + + if ($@) { + ¬ice("DM caused an error. Aborted"); return; } @@ -85,10 +90,7 @@ sub cmd_direct_as { sub cmd_tweet { my ( $data, $server, $win ) = @_; - unless ($twit) { - ¬ice("Not logged in! Use /twitter_login username pass!"); - return; - } + return unless &logged_in($twit); $data =~ s/^\s+|\s+$//; unless ($data) { @@ -102,10 +104,7 @@ sub cmd_tweet { sub cmd_tweet_as { my ( $data, $server, $win ) = @_; - unless ($twit) { - ¬ice("Not logged in! Use /twitter_login username pass!"); - return; - } + return unless &logged_in($twit); $data =~ s/^\s+|\s+$//; my ( $username, $data ) = split ' ', $data, 2; @@ -115,10 +114,7 @@ sub cmd_tweet_as { return; } - unless ( exists $twits{$username} ) { - ¬ice("Unknown username $username"); - return; - } + return unless &valid_username($username); if ( Irssi::settings_get_str("short_url_provider") ) { foreach my $url ( $data =~ /(https?:\/\/\S+[\w\/])/g ) { @@ -129,14 +125,18 @@ sub cmd_tweet_as { } } - if ( length $data > 140 ) { - ¬ice( - "Tweet too long (" . length($data) . " characters) - aborted" ); - return; - } + return if &too_long($data); - unless ( $twits{$username}->update($data) ) { - ¬ice("Update failed"); + eval { + unless ( $twits{$username}->update($data) ) + { + ¬ice("Update failed"); + return; + } + }; + + if ($@) { + ¬ice("Update caused an error. Aborted."); return; } @@ -144,21 +144,7 @@ sub cmd_tweet_as { $nicks{$1} = time; } - my $away = 0; - if ( Irssi::settings_get_bool("tweet_to_away") - and $data !~ /\@\w/ - and $data !~ /^[dD] / ) - { - my $server = - Irssi::server_find_tag( Irssi::settings_get_str("bitlbee_server") ); - if ($server) { - $server->send_raw("away :$data"); - $away = 1; - } else { - ¬ice( "Can't find bitlbee server.", - "Update bitlbee_server or disalbe tweet_to_away" ); - } - } + my $away = &update_away($data); ¬ice( "Update sent" . ( $away ? " (and away msg set)" : "" ) ); } @@ -166,10 +152,7 @@ sub cmd_tweet_as { sub cmd_reply { my ( $data, $server, $win ) = @_; - unless ($twit) { - ¬ice("Not logged in! Use /twitter_login username pass!"); - return; - } + return unless &logged_in($twit); $data =~ s/^\s+|\s+$//; unless ($data) { @@ -197,10 +180,7 @@ sub cmd_reply_as { return; } - unless ($twit) { - ¬ice("Not logged in! Use /twitter_login username pass!"); - return; - } + return unless &logged_in($twit); $data =~ s/^\s+|\s+$//; my ( $username, $id, $data ) = split ' ', $data, 3; @@ -210,21 +190,18 @@ sub cmd_reply_as { return; } - unless ( exists $twits{$username} ) { - ¬ice("Unknown username $username"); - return; - } + return unless &valid_username($username); my $nick; $id =~ s/[^\w\d\-:]+//g; ( $nick, $id ) = split /:/, $id; - unless ( exists $id_map{$nick} ) { + unless ( exists $id_map{ lc $nick } ) { ¬ice("Can't find a tweet from $nick to reply to!"); return; } $id = $id_map{__indexes}{$nick} unless $id; - unless ( $id_map{lc $nick}[$id] ) { + unless ( $id_map{ lc $nick }[$id] ) { ¬ice("Can't find a tweet numbered $id from $nick to reply to!"); return; } @@ -242,19 +219,25 @@ sub cmd_reply_as { } } - if ( length $data > 140 ) { - ¬ice( - "Tweet too long (" . length($data) . " characters) - aborted" ); - return; - } + return if &too_long($data); - unless ( - $twits{$username}->update( - { status => $data, in_reply_to_status_id => $id_map{lc $nick}[$id] } - ) - ) - { - ¬ice("Update failed"); + eval { + unless ( + $twits{$username}->update( + { + status => $data, + in_reply_to_status_id => $id_map{ lc $nick }[$id] + } + ) + ) + { + ¬ice("Update failed"); + return; + } + }; + + if ($@) { + ¬ice("Update caused an error. Aborted"); return; } @@ -262,21 +245,7 @@ sub cmd_reply_as { $nicks{$1} = time; } - my $away = 0; - if ( Irssi::settings_get_bool("tweet_to_away") - and $data !~ /\@\w/ - and $data !~ /^[dD] / ) - { - my $server = - Irssi::server_find_tag( Irssi::settings_get_str("bitlbee_server") ); - if ($server) { - $server->send_raw("away :$data"); - $away = 1; - } else { - ¬ice( "Can't find bitlbee server.", - "Update bitlbee_server or disalbe tweet_to_away" ); - } - } + my $away = &update_away($data); ¬ice( "Update sent" . ( $away ? " (and away msg set)" : "" ) ); } @@ -287,10 +256,7 @@ sub gen_cmd { return sub { my ( $data, $server, $win ) = @_; - unless ($twit) { - ¬ice("Not logged in! Use /twitter_login username pass!"); - return; - } + return unless &logged_in($twit); $data =~ s/^\s+|\s+$//; unless ($data) { @@ -298,8 +264,16 @@ sub gen_cmd { return; } - unless ( $twit->$api_name($data) ) { - ¬ice("$api_name failed"); + eval { + unless ( $twit->$api_name($data) ) + { + ¬ice("$api_name failed"); + return; + } + }; + + if ($@) { + ¬ice("$api_name caused an error. Aborted."); return; } @@ -324,12 +298,12 @@ sub cmd_logout { my ( $data, $server, $win ) = @_; $data =~ s/^\s+|\s+$//g; - if ( $data and exists $twits{$data} ) { + return unless &valid_username($data); + + if ($data) { ¬ice("Logging out $data..."); $twits{$data}->end_session(); delete $twits{$data}; - } elsif ($data) { - ¬ice("Unknown username '$data'"); } else { ¬ice("Logging out $user..."); $twit->end_session(); @@ -517,24 +491,34 @@ sub load_friends { my $fh = shift; my $page = 1; my %new_friends; - while (1) { - print $fh "Loading friends page $page...\n" if ( $fh and &debug ); - my $friends = $twit->friends( { page => $page } ); - last unless $friends; - $new_friends{ $_->{screen_name} } = time foreach @$friends; - $page++; - last if @$friends == 0 or $page == 10; + eval { + while (1) + { + print $fh "type:debug Loading friends page $page...\n" + if ( $fh and &debug ); + my $friends = $twit->friends( { page => $page } ); + last unless $friends; + $new_friends{ $_->{screen_name} } = time foreach @$friends; + $page++; + last if @$friends == 0 or $page == 10; + } + }; + + if ($@) { + print $fh "type:debug Error during friends list update. Aborted.\n"; + return; } my ( $added, $removed ) = ( 0, 0 ); - print $fh "Scanning for new friends...\n" if ( $fh and &debug ); + print $fh "type:debug Scanning for new friends...\n" if ( $fh and &debug ); foreach ( keys %new_friends ) { next if exists $friends{$_}; $friends{$_} = time; $added++; } - print $fh "Scanning for removed friends...\n" if ( $fh and &debug ); + print $fh "type:debug Scanning for removed friends...\n" + if ( $fh and &debug ); foreach ( keys %friends ) { next if exists $new_friends{$_}; delete $friends{$_}; @@ -555,16 +539,14 @@ sub get_updates { . Irssi::settings_get_str('twitter_window') . "'. Create it or change the value of twitter_window" ); } - unless ($twit) { - ¬ice("Not logged in! Use /twitter_login username pass!"); - return; - } + + return unless &logged_in($twit); my ( $fh, $filename ) = File::Temp::tempfile(); my $pid = fork(); if ($pid) { # parent - Irssi::timeout_add_once( 5000, 'monitor_child', [$filename] ); + Irssi::timeout_add_once( 5000, 'monitor_child', [ $filename, 0 ] ); Irssi::pidwait_add($pid); } elsif ( defined $pid ) { # child close STDIN; @@ -573,15 +555,16 @@ sub get_updates { my $new_poll = time; - &do_updates( $fh, $user, $twit ); + my $error = 0; + $error += &do_updates( $fh, $user, $twit ); foreach ( keys %twits ) { next if $_ eq $user; - &do_updates( $fh, $_, $twits{$_} ); + $error += &do_updates( $fh, $_, $twits{$_} ); } my ( $added, $removed ) = &load_friends($fh); if ( $added + $removed ) { - print $fh "%R***%n Friends list updated: ", + print $fh "type:debug %R***%n Friends list updated: ", join( ", ", sprintf( "%d added", $added ), sprintf( "%d removed", $removed ) ), @@ -591,7 +574,13 @@ sub get_updates { foreach ( sort keys %friends ) { print $fh "$_ $friends{$_}\n"; } - print $fh $new_poll; + + if ($error) { + print $fh "type:debug Update encountered errors. Aborted\n"; + print $fh $last_poll; + } else { + print $fh $new_poll; + } close $fh; exit; } @@ -602,13 +591,33 @@ sub do_updates { my ( $fh, $username, $obj ) = @_; print scalar localtime, " - Polling for updates for $username" if &debug; - my $tweets = - $obj->friends_timeline( { since => HTTP::Date::time2str($last_poll) } ) - || []; + my $tweets; + eval { + $tweets = $obj->friends_timeline( + { since => HTTP::Date::time2str($last_poll) } ); + }; + + if ($@) { + print $fh "type:debug Error during friends_timeline call. Aborted.\n"; + return 1; + } + + unless ( ref $tweets ) { + if ( $obj->can("get_error") ) { + print $fh "type:debug API Error during friends_timeline call: ", + JSON::Any->jsonToObj( $obj->get_error() ), " Aborted.\n"; + } else { + print $fh + "type:debug API Error during friends_timeline call. Aborted.\n"; + } + return 1; + } + foreach my $t ( reverse @$tweets ) { my $text = decode_entities( $t->{text} ); $text =~ s/%/%%/g; $text =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g; + $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 @@ -616,17 +625,25 @@ sub do_updates { and not exists $friends{ $t->{in_reply_to_screen_name} } ) { $nicks{ $t->{in_reply_to_screen_name} } = time; - my $context = $obj->show_status( $t->{in_reply_to_status_id} ); + my $context; + eval { + $context = $obj->show_status( $t->{in_reply_to_status_id} ); + }; + if ($context) { my $ctext = decode_entities( $context->{text} ); $ctext =~ s/%/%%/g; $ctext =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g; + $ctext =~ s/[\n\r]/ /g; printf $fh "id:%d account:%s nick:%s type:tweet %s\n", $context->{id}, $username, $context->{user}{screen_name}, $ctext; $reply = "reply"; + } elsif ($@) { + print $fh "type:debug request to get context failed: $@"; } else { - print "Failed to get context from $t->{in_reply_to_screen_name}" + print $fh +"type:debug Failed to get context from $t->{in_reply_to_screen_name}" if &debug; } } @@ -638,8 +655,16 @@ sub do_updates { } print scalar localtime, " - Polling for replies" if &debug; - $tweets = $obj->replies( { since => HTTP::Date::time2str($last_poll) } ) - || []; + eval { + $tweets = $obj->replies( { since => HTTP::Date::time2str($last_poll) } ) + || []; + }; + + if ($@) { + print $fh "type:debug Error during replies call. Aborted.\n"; + return 1; + } + foreach my $t ( reverse @$tweets ) { next if exists $friends{ $t->{user}{screen_name} }; @@ -647,30 +672,44 @@ sub do_updates { my $text = decode_entities( $t->{text} ); $text =~ s/%/%%/g; $text =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g; + $text =~ s/[\n\r]/ /g; printf $fh "id:%d account:%s nick:%s type:tweet %s\n", $t->{id}, $username, $t->{user}{screen_name}, $text; } print scalar localtime, " - Polling for DMs" if &debug; - $tweets = - $obj->direct_messages( { since => HTTP::Date::time2str($last_poll) } ) - || []; + eval { + $tweets = + $obj->direct_messages( { since => HTTP::Date::time2str($last_poll) } ) + || []; + }; + + if ($@) { + print $fh "type:debug Error during direct_messages call. Aborted.\n"; + return 1; + } + foreach my $t ( reverse @$tweets ) { my $text = decode_entities( $t->{text} ); $text =~ s/%/%%/g; $text =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g; + $text =~ s/[\n\r]/ /g; printf $fh "id:%d account:%s nick:%s type:dm %s\n", $t->{id}, $username, $t->{sender_screen_name}, $text; } print scalar localtime, " - Done" if &debug; + + return 0; } sub monitor_child { - my $data = shift; + my ($data) = @_; my $filename = $data->[0]; + my $attempt = $data->[1]; - print scalar localtime, " - checking child log at $filename" if &debug; - my $old_last_poll = $last_poll; + print scalar localtime, " - checking child log at $filename ($attempt)" + if &debug; + my $new_last_poll; if ( open FILE, $filename ) { my @lines; while () { @@ -678,11 +717,12 @@ sub monitor_child { last if /^__friends__/; my %meta; foreach my $key (qw/id account nick type/) { - s/^$key:(\S+)\s*//; - $meta{$key} = $1; + if (s/^$key:(\S+)\s*//) { + $meta{$key} = $1; + } } - next if exists $tweet_cache{ $meta{id} }; + next if exists $meta{id} and exists $tweet_cache{ $meta{id} }; $tweet_cache{ $meta{id} } = time; my $account = ""; if ( $meta{account} ne $user ) { @@ -696,9 +736,9 @@ sub monitor_child { and $meta{id} ) { $marker = ( $id_map{__indexes}{ $meta{nick} } + 1 ) % 100; - $id_map{ lc $meta{nick} }[$marker] = $meta{id}; - $id_map{__indexes}{ $meta{nick} } = $marker; - $marker = ":$marker"; + $id_map{ lc $meta{nick} }[$marker] = $meta{id}; + $id_map{__indexes}{ $meta{nick} } = $marker; + $marker = ":$marker"; } if ( $meta{type} eq 'tweet' ) { @@ -706,24 +746,28 @@ sub monitor_child { } elsif ( $meta{type} eq 'reply' ) { push @lines, "[$account\\--> %B\@$meta{nick}%n$marker] $_\n",; } elsif ( $meta{type} eq 'dm' ) { - push @lines, "[$account%B\@$meta{nick}%n (%%WDM%%n)] $_\n",; + push @lines, "[$account%B\@$meta{nick}%n (%WDM%n)] $_\n",; + } elsif ( $meta{type} eq 'error' ) { + push @lines, "ERROR: $_\n"; } elsif ( $meta{type} eq 'debug' ) { - push @lines, "debug: $_\n" if &debug,; + print "$_" if &debug,; + } else { + print "Unknown line type $meta{type}: $_" if &debug,; } } %friends = (); while () { if (/^\d+$/) { - $last_poll = $_; + $new_last_poll = $_; last; } my ( $f, $t ) = split ' ', $_; $nicks{$f} = $friends{$f} = $t; } - if ( $last_poll != $old_last_poll ) { - print "new last_poll = $last_poll" if &debug; + if ($new_last_poll) { + print "new last_poll = $new_last_poll" if &debug; foreach my $line (@lines) { chomp $line; $window->print( $line, MSGLEVEL_PUBLIC ); @@ -737,17 +781,38 @@ sub monitor_child { or warn "Failed to remove $filename: $!" unless &debug; - # keep 10 minutes of cached tweets, to make sure we don't show duplicates. + # keep enough cached tweets, to make sure we don't show duplicates. foreach ( keys %tweet_cache ) { - next if $tweet_cache{$_} > time - 600; + next if $tweet_cache{$_} >= $last_poll; delete $tweet_cache{$_}; } + $last_poll = $new_last_poll; + + # save id_map hash + if ( keys %id_map + and my $file = + Irssi::settings_get_str("twirssi_replies_store") ) + { + if ( open JSON, ">$file" ) { + print JSON JSON::Any->objToJson( \%id_map ); + close JSON; + } else { + ¬ice("Failed to write replies to $file: $!"); + } + } return; } } close FILE; - Irssi::timeout_add_once( 5000, 'monitor_child', [$filename] ); + + if ( $attempt < 12 ) { + Irssi::timeout_add_once( 5000, 'monitor_child', + [ $filename, $attempt + 1 ] ); + } else { + ¬ice("Giving up on polling $filename"); + unlink $filename unless &debug; + } } sub debug { @@ -758,6 +823,61 @@ sub notice { $window->print( "%R***%n @_", MSGLEVEL_PUBLIC ); } +sub update_away { + my $data = shift; + + if ( Irssi::settings_get_bool("tweet_to_away") + and $data !~ /\@\w/ + and $data !~ /^[dD] / ) + { + my $server = + Irssi::server_find_tag( Irssi::settings_get_str("bitlbee_server") ); + if ($server) { + $server->send_raw("away :$data"); + return 1; + } else { + ¬ice( "Can't find bitlbee server.", + "Update bitlbee_server or disable tweet_to_away" ); + return 0; + } + } + + return 0; +} + +sub too_long { + my $data = shift; + + if ( length $data > 140 ) { + ¬ice( + "Tweet too long (" . length($data) . " characters) - aborted" ); + return 1; + } + + return 0; +} + +sub valid_username { + my $username = shift; + + unless ( exists $twits{$username} ) { + ¬ice("Unknown username $username"); + return 0; + } + + return 1; +} + +sub logged_in { + my $obj = shift; + unless ($obj) { + ¬ice("Not logged in! Use /twitter_login username pass!"); + return 0; + } + + return 1; +} + sub sig_complete { my ( $complist, $window, $word, $linestart, $want_space ) = @_; @@ -767,7 +887,7 @@ sub sig_complete { and $linestart =~ /^\/reply(?:_as)?\s*$/ ) ) { # /twitter_reply gets a nick:num - @$complist = grep /^\Q$word/i, sort keys %{$id_map{__indexes}}; + @$complist = grep /^\Q$word/i, sort keys %{ $id_map{__indexes} }; } # /tweet, /tweet_as, /dm, /dm_as - complete @nicks (and nicks as the first @@ -788,6 +908,8 @@ 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", "tweet_to_away", 0 ); Irssi::settings_add_bool( "twirssi", "show_reply_context", 0 ); Irssi::settings_add_bool( "twirssi", "show_own_tweets", 1 ); @@ -813,20 +935,24 @@ if ($window) { Irssi::command_bind( "reply_as", "cmd_reply_as" ); } Irssi::command_bind( - "twitter_dump", + "twirssi_dump", sub { - print "twits: ", Dumper \%twits; + print "twits: ", join ", ", + 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 "last poll: $last_poll"; } ); Irssi::command_bind( "twirssi_version", sub { - ¬ice( -"Twirssi v$VERSION (r$REV); Net::Twitter v$Net::Twitter::VERSION. " - . "See details at http://tinyurl.com/twirssi" ); + ¬ice("Twirssi v$VERSION (r$REV); " + . "Net::Twitter v$Net::Twitter::VERSION. " + . "JSON in use: " + . JSON::Any::handler() + . ". See details at http://twirssi.com/" ); } ); Irssi::command_bind( @@ -853,6 +979,24 @@ if ($window) { ¬ice( " %Y||%C `%N Log in with /twitter_login, send updates with /tweet"); + my $file = Irssi::settings_get_str("twirssi_replies_store"); + if ( $file and -r $file ) { + if ( open( JSON, $file ) ) { + local $/; + my $json = ; + close JSON; + eval { + my $ref = JSON::Any->jsonToObj($json); + %id_map = %$ref; + my $num = keys %{ $id_map{__indexes} }; + ¬ice( sprintf "Loaded old replies from %d contact%s.", + $num, ( $num == 1 ? "" : "s" ) ); + }; + } else { + ¬ice("Failed to load old replies from $file: $!"); + } + } + if ( my $provider = Irssi::settings_get_str("short_url_provider") ) { eval "use WWW::Shorten::$provider;";