X-Git-Url: https://git.sommitrealweird.co.uk/twirssi-net-twitter-lite.git/blobdiff_plain/4d57961e9e959e8b069c54a6ae333ddd3e97bd4e..c119e650820fc03f4ffa5d6ecfe5c1a1332bd7d5:/twirssi.pl diff --git a/twirssi.pl b/twirssi.pl index 0ee8ab1..3cb6df8 100644 --- a/twirssi.pl +++ b/twirssi.pl @@ -11,8 +11,8 @@ $Data::Dumper::Indent = 1; use vars qw($VERSION %IRSSI); -$VERSION = "2.1.1beta"; -my ($REV) = '$Rev: 491 $' =~ /(\d+)/; +$VERSION = "2.1.2"; +my ($REV) = '$Rev: 523 $' =~ /(\d+)/; %IRSSI = ( authors => 'Dan Boger', contact => 'zigdon@gmail.com', @@ -21,7 +21,7 @@ my ($REV) = '$Rev: 491 $' =~ /(\d+)/; . 'Can optionally set your bitlbee /away message to same', license => 'GNU GPL v2', url => 'http://twirssi.com', - changed => '$Date: 2009-02-25 10:44:26 -0800 (Wed, 25 Feb 2009) $', + changed => '$Date: 2009-03-07 14:09:03 -0800 (Sat, 07 Mar 2009) $', ); my $window; @@ -354,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; @@ -546,7 +558,7 @@ sub cmd_upgrade { ¬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." @@ -737,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: $@"; @@ -751,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; @@ -772,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; @@ -868,6 +898,10 @@ sub monitor_child { } 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} } ) { @@ -907,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, [ @@ -998,7 +1038,7 @@ 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; @@ -1037,11 +1077,11 @@ sub monitor_child { q{ '--/_.'----'`} ) { - ¬ice($whale); + &ccrap($whale); } $failwhale = 1; } - ¬ice("Haven't been able to get updated tweets since $since"); + &ccrap("Haven't been able to get updated tweets since $since"); } } @@ -1053,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; @@ -1066,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; } @@ -1119,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 @@ -1211,6 +1257,10 @@ 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 );