X-Git-Url: https://git.sommitrealweird.co.uk/twirssi-net-twitter-lite.git/blobdiff_plain/713c72908ff6fe1c115024e3e714f6681e612f3e..1e8a35098ef53f648b15d7409fb83810e1f2358b:/twirssi.pl diff --git a/twirssi.pl b/twirssi.pl index 374f139..94ed554 100644 --- a/twirssi.pl +++ b/twirssi.pl @@ -11,8 +11,8 @@ $Data::Dumper::Indent = 1; use vars qw($VERSION %IRSSI); -$VERSION = "1.3"; -my ($REV) = '$Rev: 312 $' =~ /(\d+)/; +$VERSION = "1.5.3"; +my ($REV) = '$Rev: 333 $' =~ /(\d+)/; %IRSSI = ( authors => 'Dan Boger', contact => 'zigdon@gmail.com', @@ -32,6 +32,8 @@ my $poll; my %nicks; my %friends; my $last_poll = time - 300; +my %tweet_cache; +my %id_map; sub cmd_direct { my ( $data, $server, $win ) = @_; @@ -127,6 +129,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 +229,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 = (); @@ -232,8 +263,11 @@ sub cmd_login { ); unless ( $twit->verify_credentials() ) { - ¬ice("Login failed"); + ¬ice("Login as $user failed"); $twit = undef; + if ( keys %twits ) { + &cmd_switch( ( keys %twits )[0], $server, $win ); + } return; } @@ -249,8 +283,17 @@ sub cmd_login { Irssi::timeout_remove($poll) if $poll; $poll = Irssi::timeout_add( 300 * 1000, \&get_updates, "" ); ¬ice("Logged in as $user, loading friends list..."); - &load_friends; + &load_friends(); ¬ice( "loaded friends: ", scalar keys %friends ); + if ( Irssi::settings_get_bool("twirssi_first_run") ) { + Irssi::settings_set_bool( "twirssi_first_run", 0 ); + unless ( exists $friends{twirssi} ) { + ¬ice("Welcome to twirssi!" + . " Perhaps you should add \@twirssi to your friends list," + . " so you can be notified when a new version is release?" + . " Just type /twitter_friend twirssi." ); + } + } %nicks = %friends; $nicks{$user} = 0; &get_updates; @@ -288,7 +331,7 @@ sub cmd_upgrade { return; } - $md5 = get("http://irc.peeron.com/~zigdon/twirssi/md5sum"); + $md5 = get("http://twirssi.com/md5sum"); chomp $md5; $md5 =~ s/ .*//; unless ($md5) { @@ -312,7 +355,7 @@ sub cmd_upgrade { } } - my $URL = "http://irc.peeron.com/~zigdon/twirssi/twirssi.pl"; + my $URL = "http://twirssi.com/twirssi.pl"; ¬ice("Downloading twirssi from $URL"); LWP::Simple::getstore( $URL, "$loc.upgrade" ); @@ -353,25 +396,34 @@ sub cmd_upgrade { } 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; - $friends = $twit->friends( page => $page ); } + my ($added, $removed) = (0, 0); + print $fh "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); foreach ( keys %friends ) { - delete $friends{$_} unless exists $new_friends{$_}; + next if exists $new_friends{$_}; + delete $friends{$_}; + $removed++; } + + return ($added, $removed); } sub get_updates { @@ -395,6 +447,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; @@ -408,8 +461,13 @@ sub get_updates { &do_updates( $fh, $_, $twits{$_} ); } + my ($added, $removed) = &load_friends($fh); + 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"; } @@ -431,7 +489,7 @@ sub do_updates { my $text = decode_entities( $t->{text} ); $text =~ s/%/%%/g; $text =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g; - my $prefix = ""; + my $reply = "tweet"; if ( Irssi::settings_get_bool("show_reply_context") and $t->{in_reply_to_screen_name} ne $username and $t->{in_reply_to_screen_name} @@ -443,10 +501,10 @@ 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", - ( $username ne $user ? "$username: " : "" ), + printf $fh "id:%d account:%s nick:%s type:tweet %s\n", + $context->{id}, $username, $context->{user}{screen_name}, $ctext; - $prefix = "\--> "; + $reply = "reply"; } else { print "Failed to get context from $t->{in_reply_to_screen_name}" if &debug; @@ -455,11 +513,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", - $prefix, - ( $username ne $user ? "$username: " : "" ), - $t->{user}{screen_name}, - $text; + printf $fh "id:%d account:%s nick:%s type:%s %s\n", + $t->{id}, $username, $t->{user}{screen_name}, $reply, $text; } print scalar localtime, " - Polling for replies" if &debug; @@ -472,10 +527,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", - ( $username ne $user ? "$username: " : "" ), - $t->{user}{screen_name}, - $text; + 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; @@ -486,10 +539,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", - ( $username ne $user ? "$username: " : "" ), - $t->{sender_screen_name}, - $text; + 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; } @@ -505,7 +556,27 @@ sub monitor_child { while () { chomp; last if /^__friends__/; - push @lines, $_ unless /^__friends__/; + my %meta; + foreach my $key (qw/id account nick type/) { + s/^$key:(\S+)\s*//; + $meta{$key} = $1; + } + + next if exists $tweet_cache{$meta{id}}; + $tweet_cache{$meta{id}} = time; + my $account = ""; + if ($meta{account} ne $user) { + $account = "$meta{account}: "; + } + if ($meta{type} eq 'tweet') { + push @lines, "[$account%B\@$meta{nick}%n] $_\n", + } elsif ($meta{type} eq 'reply') { + push @lines, "[$account\\--> %B\@$meta{nick}%n] $_\n", + } elsif ($meta{type} eq 'dm') { + push @lines, "[$account%B\@$meta{nick}%n (%%WDM%%n)] $_\n", + } elsif ($meta{type} eq 'debug') { + push @lines, "debug: $_\n" if &debug, + } } %friends = (); @@ -532,6 +603,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; } } @@ -552,10 +629,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" ); @@ -563,10 +641,13 @@ Irssi::settings_add_str( "twirssi", "bitlbee_server", "bitlbee" ); Irssi::settings_add_str( "twirssi", "short_url_provider", "TinyURL" ); 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_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 ); $window = Irssi::window_find_name( Irssi::settings_get_str('twitter_window') ); if ($window) { @@ -615,7 +696,7 @@ if ($window) { Irssi::signal_add_last( 'complete word' => \&sig_complete ); ¬ice(" %Y<%C(%B^%C)%N TWIRSSI v%R$VERSION%N (r$REV)"); - ¬ice(" %C(_(\\%N http://tinyurl.com/twirssi for full docs"); + ¬ice(" %C(_(\\%N http://twirssi.com/ for full docs"); ¬ice( " %Y||%C `%N Log in with /twitter_login, send updates with /tweet"); @@ -628,6 +709,13 @@ if ($window) { ); } } + + if ( my $autouser = Irssi::settings_get_str("twitter_usernames") + and my $autopass = Irssi::settings_get_str("twitter_passwords") ) + { + &cmd_login(); + } + } else { Irssi::active_win() ->print( "Create a window named "