X-Git-Url: https://git.sommitrealweird.co.uk/twirssi-net-twitter-lite.git/blobdiff_plain/4556599e332d4d87eef10999a81975328fb549ab..95a9977c844bcfe7329a20218ac016c94656446d:/twirssi.pl?ds=inline diff --git a/twirssi.pl b/twirssi.pl index 6d23292..fe9db3e 100644 --- a/twirssi.pl +++ b/twirssi.pl @@ -11,8 +11,8 @@ $Data::Dumper::Indent = 1; use vars qw($VERSION %IRSSI); -$VERSION = "1.4"; -my ($REV) = '$Rev: 317 $' =~ /(\d+)/; +$VERSION = "1.5.3"; +my ($REV) = '$Rev: 331 $' =~ /(\d+)/; %IRSSI = ( authors => 'Dan Boger', contact => 'zigdon@gmail.com', @@ -32,6 +32,7 @@ my $poll; my %nicks; my %friends; my $last_poll = time - 300; +my %tweet_cache; sub cmd_direct { my ( $data, $server, $win ) = @_; @@ -127,6 +128,12 @@ sub cmd_tweet_as { } } + if ( length $data > 140 ) { + ¬ice( + "Tweet too long (" . length($data) . " characters) - aborted" ); + return; + } + unless ( $twits{$username}->update($data) ) { ¬ice("Update failed"); return; @@ -221,7 +228,30 @@ sub cmd_logout { sub cmd_login { my ( $data, $server, $win ) = @_; my $pass; - ( $user, $pass ) = split ' ', $data, 2; + if ($data) { + ( $user, $pass ) = split ' ', $data, 2; + } elsif ( my $autouser = Irssi::settings_get_str("twitter_usernames") + and my $autopass = Irssi::settings_get_str("twitter_passwords") ) + { + my @user = split /\s*,\s*/, $autouser; + my @pass = split /\s*,\s*/, $autopass; + if ( @user != @pass ) { + ¬ice("Number of usernames doesn't match " + . "the number of passwords - auto-login failed" ); + } else { + my ( $u, $p ); + while ( @user and @pass ) { + $u = shift @user; + $p = shift @pass; + &cmd_login("$u $p"); + } + return; + } + } else { + ¬ice("/twitter_login requires either a username and password " + . "or twitter_usernames and twitter_passwords to be set." ); + return; + } %friends = %nicks = (); @@ -376,14 +406,20 @@ sub load_friends { $friends = $twit->friends( page => $page ); } + my ($added, $removed) = (0, 0); foreach ( keys %new_friends ) { next if exists $friends{$_}; $friends{$_} = time; + $added++; } foreach ( keys %friends ) { - delete $friends{$_} unless exists $new_friends{$_}; + next if exists $new_friends{$_}; + delete $friends{$_}; + $removed++; } + + return ($added, $removed); } sub get_updates { @@ -407,6 +443,7 @@ sub get_updates { if ($pid) { # parent Irssi::timeout_add_once( 5000, 'monitor_child', [$filename] ); + Irssi::pidwait_add($pid); } elsif ( defined $pid ) { # child close STDIN; close STDOUT; @@ -420,8 +457,13 @@ sub get_updates { &do_updates( $fh, $_, $twits{$_} ); } + my ($added, $removed) = &load_friends; + if ($added + $removed) { + print $fh "%R***%n Friends list updated: ", + join(", ", sprintf("%d added", $added), + sprintf("%d removed", $removed)), "\n"; + } print $fh "__friends__\n"; - &load_friends; foreach ( sort keys %friends ) { print $fh "$_ $friends{$_}\n"; } @@ -455,7 +497,8 @@ sub do_updates { my $ctext = decode_entities( $context->{text} ); $ctext =~ s/%/%%/g; $ctext =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g; - printf $fh "[%s%%B\@%s%%n] %s\n", + printf $fh "id:%d [%s%%B\@%s%%n] %s\n", + $context->{id}, ( $username ne $user ? "$username: " : "" ), $context->{user}{screen_name}, $ctext; $prefix = "\--> "; @@ -467,7 +510,8 @@ sub do_updates { next if $t->{user}{screen_name} eq $username and not Irssi::settings_get_bool("show_own_tweets"); - printf $fh "%s[%s%%B\@%s%%n] %s\n", + printf $fh "id:%d %s[%s%%B\@%s%%n] %s\n", + $t->{id}, $prefix, ( $username ne $user ? "$username: " : "" ), $t->{user}{screen_name}, @@ -484,7 +528,8 @@ sub do_updates { my $text = decode_entities( $t->{text} ); $text =~ s/%/%%/g; $text =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g; - printf $fh "[%s%%B\@%s%%n] %s\n", + printf $fh "id:%d [%s%%B\@%s%%n] %s\n", + $t->{id}, ( $username ne $user ? "$username: " : "" ), $t->{user}{screen_name}, $text; @@ -498,7 +543,8 @@ sub do_updates { my $text = decode_entities( $t->{text} ); $text =~ s/%/%%/g; $text =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g; - printf $fh "[%s%%B\@%s%%n (%%WDM%%n)] %s\n", + printf $fh "id:%d [%s%%B\@%s%%n (%%WDM%%n)] %s\n", + $t->{id}, ( $username ne $user ? "$username: " : "" ), $t->{sender_screen_name}, $text; @@ -517,6 +563,10 @@ sub monitor_child { while () { chomp; last if /^__friends__/; + if (s/^id:(\d+) //) { + next if exists $tweet_cache{$1}; + $tweet_cache{$1} = time; + } push @lines, $_ unless /^__friends__/; } @@ -544,6 +594,12 @@ sub monitor_child { unlink $filename or warn "Failed to remove $filename: $!" unless &debug; + + # keep 10 minutes of cached tweets, to make sure we don't show duplicates. + foreach ( keys %tweet_cache ) { + next if $tweet_cache{$_} > time - 600; + delete $tweet_cache{$_}; + } return; } } @@ -564,10 +620,11 @@ sub sig_complete { my ( $complist, $window, $word, $linestart, $want_space ) = @_; return unless $linestart =~ /^\/(?:tweet|dm)/; - return if $linestart eq '/tweet' and $word !~ s/^@//; + my $prefix = $word =~ s/^@//; + $prefix = 0 if $linestart eq '/dm' or $linestart eq '/dm_as'; push @$complist, grep /^\Q$word/i, sort { $nicks{$b} <=> $nicks{$a} } keys %nicks; - @$complist = map { "\@$_" } @$complist if $linestart eq '/tweet'; + @$complist = map { "\@$_" } @$complist if $prefix; } Irssi::settings_add_str( "twirssi", "twitter_window", "twitter" ); @@ -647,20 +704,7 @@ if ($window) { if ( my $autouser = Irssi::settings_get_str("twitter_usernames") and my $autopass = Irssi::settings_get_str("twitter_passwords") ) { - my @user = split /\s*,\s*/, $autouser; - my @pass = split /\s*,\s*/, $autopass; - if ( @user != @pass ) { - ¬ice( -"Number of usernames doesn't match the number of passwords - auto-login failed" - ); - } else { - my ( $u, $p ); - while ( @user and @pass ) { - $u = shift @user; - $p = shift @pass; - &cmd_login("$u $p"); - } - } + &cmd_login(); } } else {