use vars qw($VERSION %IRSSI);
-$VERSION = "1.4";
-my ($REV) = '$Rev: 317 $' =~ /(\d+)/;
+$VERSION = "1.5.3";
+my ($REV) = '$Rev: 333 $' =~ /(\d+)/;
%IRSSI = (
authors => 'Dan Boger',
contact => 'zigdon@gmail.com',
my %nicks;
my %friends;
my $last_poll = time - 300;
+my %tweet_cache;
+my %id_map;
sub cmd_direct {
my ( $data, $server, $win ) = @_;
}
}
+ if ( length $data > 140 ) {
+ ¬ice(
+ "Tweet too long (" . length($data) . " characters) - aborted" );
+ return;
+ }
+
unless ( $twits{$username}->update($data) ) {
¬ice("Update failed");
return;
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 = ();
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 );
return;
}
- $md5 = get("http://irc.peeron.com/~zigdon/twirssi/md5sum");
+ $md5 = get("http://twirssi.com/md5sum");
chomp $md5;
$md5 =~ s/ .*//;
unless ($md5) {
}
}
- 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" );
}
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 {
if ($pid) { # parent
Irssi::timeout_add_once( 5000, 'monitor_child', [$filename] );
+ Irssi::pidwait_add($pid);
} elsif ( defined $pid ) { # child
close STDIN;
close STDOUT;
&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";
}
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}
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;
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;
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;
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;
}
while (<FILE>) {
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 = ();
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;
}
}
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" );
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");
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 {
projects / twirssi-net-twitter-lite.git / blobdiff