X-Git-Url: https://git.sommitrealweird.co.uk/twirssi-net-twitter-lite.git/blobdiff_plain/11c665e576edfdeb58d911c7853818e38f66717c..3dabfbdfe64eae04d7872d1b4cbbc317401ea989:/twirssi.pl diff --git a/twirssi.pl b/twirssi.pl index de3b484..acb469c 100644 --- a/twirssi.pl +++ b/twirssi.pl @@ -1,18 +1,18 @@ use strict; use Irssi; use Irssi::Irc; -use Net::Twitter; use HTTP::Date; use HTML::Entities; use File::Temp; use LWP::Simple; use Data::Dumper; +use Net::Twitter; $Data::Dumper::Indent = 1; use vars qw($VERSION %IRSSI); -$VERSION = "1.7.2"; -my ($REV) = '$Rev: 347 $' =~ /(\d+)/; +$VERSION = "1.7.6"; +my ($REV) = '$Rev: 379 $' =~ /(\d+)/; %IRSSI = ( authors => 'Dan Boger', contact => 'zigdon@gmail.com', @@ -21,7 +21,7 @@ my ($REV) = '$Rev: 347 $' =~ /(\d+)/; . 'Can optionally set your bitlbee /away message to same', license => 'GNU GPL v2', url => 'http://tinyurl.com/twirssi', - changed => '$Date: 2009-01-06 09:54:25 -0800 (Tue, 06 Jan 2009) $', + changed => '$Date: 2009-01-21 09:50:42 -0800 (Wed, 21 Jan 2009) $', ); my $window; @@ -38,10 +38,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 +52,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,10 +60,7 @@ sub cmd_direct_as { return; } - unless ( exists $twits{$username} ) { - ¬ice("Unknown username $username"); - return; - } + return unless &valid_username($username); eval { unless ( $twits{$username} @@ -92,10 +83,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) { @@ -109,10 +97,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; @@ -122,10 +107,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 ) { @@ -136,11 +118,7 @@ sub cmd_tweet_as { } } - if ( length $data > 140 ) { - ¬ice( - "Tweet too long (" . length($data) . " characters) - aborted" ); - return; - } + return if &too_long($data); eval { unless ( $twits{$username}->update($data) ) @@ -159,21 +137,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 disable tweet_to_away" ); - } - } + my $away = &update_away($data); ¬ice( "Update sent" . ( $away ? " (and away msg set)" : "" ) ); } @@ -181,10 +145,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) { @@ -212,10 +173,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; @@ -225,10 +183,7 @@ 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; @@ -257,11 +212,7 @@ sub cmd_reply_as { } } - if ( length $data > 140 ) { - ¬ice( - "Tweet too long (" . length($data) . " characters) - aborted" ); - return; - } + return if &too_long($data); eval { unless ( @@ -287,21 +238,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)" : "" ) ); } @@ -312,10 +249,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) { @@ -357,12 +291,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(); @@ -553,7 +487,8 @@ sub load_friends { eval { while (1) { - print $fh "Loading friends page $page...\n" if ( $fh and &debug ); + 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; @@ -563,19 +498,20 @@ sub load_friends { }; if ($@) { - ¬ice("Error during friends list update. Aborted."); + 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{$_}; @@ -596,10 +532,8 @@ 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(); @@ -623,7 +557,7 @@ sub get_updates { 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 ) ), @@ -635,7 +569,7 @@ sub get_updates { } if ($error) { - print $fh "type:error Update encountered errors. Aborted\n"; + print $fh "type:debug Update encountered errors. Aborted\n"; print $fh $last_poll; } else { print $fh $new_poll; @@ -653,19 +587,32 @@ sub do_updates { my $tweets; eval { $tweets = $obj->friends_timeline( - { since => HTTP::Date::time2str($last_poll) } ) - || []; + { since => HTTP::Date::time2str($last_poll) } ); }; if ($@) { - print $fh "type:error Error during friends_timeline call. Aborted.\n"; + print $fh "type:debug Error during friends_timeline call. Aborted.\n"; + return 1; + } + + unless ( ref $tweets ) { + if ( $obj->can("get_error") ) { + my $error; + eval { $error = JSON::Any->jsonToObj( $obj->get_error() ) }; + if ($@) { $error = $obj->get_error() } + print $fh "type:debug API Error during friends_timeline call: ", + "$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/(^|\W)\@([-\w]+)/$1\cC12\@$2\cO/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 @@ -673,17 +620,24 @@ 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/(^|\W)\@([-\w]+)/$1\cC12\@$2\cO/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; } } @@ -701,7 +655,7 @@ sub do_updates { }; if ($@) { - print $fh "type:error Error during replies call. Aborted.\n"; + print $fh "type:debug Error during replies call. Aborted.\n"; return 1; } @@ -710,8 +664,8 @@ sub do_updates { if exists $friends{ $t->{user}{screen_name} }; my $text = decode_entities( $t->{text} ); - $text =~ s/%/%%/g; - $text =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g; + $text =~ s/(^|\W)\@([-\w]+)/$1\cC12\@$2\cO/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; } @@ -724,14 +678,14 @@ sub do_updates { }; if ($@) { - print $fh "type:error Error during direct_messages call. Aborted.\n"; + 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/(^|\W)\@([-\w]+)/$1\cC12\@$2\cO/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; } @@ -741,11 +695,13 @@ sub do_updates { } sub monitor_child { - my ( $data, $attempt ) = @_; + 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 () { @@ -753,11 +709,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 ) { @@ -777,36 +734,35 @@ sub monitor_child { } if ( $meta{type} eq 'tweet' ) { - push @lines, "[$account%B\@$meta{nick}%n$marker] $_\n",; + push @lines, [$meta{type}, $account, $meta{nick}, $marker, $_]; } elsif ( $meta{type} eq 'reply' ) { - push @lines, "[$account\\--> %B\@$meta{nick}%n$marker] $_\n",; + push @lines, [$meta{type}, $account, $meta{nick}, $marker, $_]; } elsif ( $meta{type} eq 'dm' ) { - push @lines, "[$account%B\@$meta{nick}%n (%WDM%n)] $_\n",; + push @lines, [$meta{type}, $account, $meta{nick}, $_]; } elsif ( $meta{type} eq 'error' ) { - push @lines, "error: $_\n" if &debug,; + $window->print("ERROR: $_", MSGLEVEL_PUBLIC); } 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; - foreach my $line (@lines) { - chomp $line; - $window->print( $line, MSGLEVEL_PUBLIC ); - foreach ( $line =~ /\@([-\w]+)/ ) { - $nicks{$1} = time; - } + if ($new_last_poll) { + print "new last_poll = $new_last_poll" if &debug; + for my $line ( @lines ) { + $window->printformat(MSGLEVEL_PUBLIC, "twirssi_".@$line[0], + @$line[1,2,3,4]); } close FILE; @@ -816,9 +772,10 @@ sub monitor_child { # keep enough cached tweets, to make sure we don't show duplicates. foreach ( keys %tweet_cache ) { - next if $tweet_cache{$_} >= $old_last_poll; + next if $tweet_cache{$_} >= $last_poll; delete $tweet_cache{$_}; } + $last_poll = $new_last_poll; # save id_map hash if ( keys %id_map @@ -855,12 +812,73 @@ 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 ) = @_; - # /twitter_reply gets a nick:num - if ( $linestart =~ /^\/twitter_reply(?:_as)?\s*$/ ) { - @$complist = grep /^\Q$word/i, sort keys %{ $id_map{__indexes} }; + if ( + $linestart =~ /^\/twitter_reply(?:_as)?\s*$/ + or ( Irssi::settings_get_bool("twirssi_use_reply_aliases") + and $linestart =~ /^\/reply(?:_as)?\s*$/ ) + ) + { # /twitter_reply gets a nick:num + $word =~ s/^@//; + @$complist = map { "$_:$id_map{__indexes}{$_}" } grep /^\Q$word/i, + sort keys %{ $id_map{__indexes} }; } # /tweet, /tweet_as, /dm, /dm_as - complete @nicks (and nicks as the first @@ -874,6 +892,27 @@ sub sig_complete { } } +sub event_send_text { + my ( $line, $server, $win ) = @_; + my $awin = Irssi::active_win(); + + # if the window where we got our text was the twitter window, and the user + # wants to be lazy, tweet away! + if ( ( $awin->get_active_name() eq $window->{name} ) + and Irssi::settings_get_bool("tweet_window_input") ) + { + &cmd_tweet( $line, $server, $win ); + } +} + +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', +]); + 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" ); @@ -883,14 +922,21 @@ 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 ); -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", "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_use_reply_aliases", 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')); +} + if ($window) { Irssi::command_bind( "dm", "cmd_direct" ); Irssi::command_bind( "dm_as", "cmd_direct_as" ); @@ -902,6 +948,10 @@ if ($window) { Irssi::command_bind( "twitter_logout", "cmd_logout" ); Irssi::command_bind( "twitter_switch", "cmd_switch" ); 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" ); + } Irssi::command_bind( "twirssi_dump", sub { @@ -916,9 +966,11 @@ if ($window) { 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( @@ -986,3 +1038,4 @@ if ($window) { . " or change the value of twitter_window. Then, reload twirssi." ); } +# vim: set sts=4 expandtab: