use HTTP::Date;
use HTML::Entities;
use File::Temp;
+use LWP::Simple;
+use Data::Dumper;
+$Data::Dumper::Indent = 1;
use vars qw($VERSION %IRSSI);
-use constant { DEBUG => 0 };
-$VERSION = "1.2";
-my ($REV) = '$Rev: 310 $' =~ /(\d+)/;
+$VERSION = "1.5.3";
+my ($REV) = '$Rev: 331 $' =~ /(\d+)/;
%IRSSI = (
authors => 'Dan Boger',
contact => 'zigdon@gmail.com',
my %nicks;
my %friends;
my $last_poll = time - 300;
+my %tweet_cache;
sub cmd_direct {
my ( $data, $server, $win ) = @_;
return;
}
- foreach my $url ( $data =~ /(https?:\/\/\S+[\w\/])/g ) {
- eval { my $short = makeashorterlink($url); $data =~ s/\Q$url/$short/g; };
+ if ( Irssi::settings_get_str("short_url_provider") ) {
+ foreach my $url ( $data =~ /(https?:\/\/\S+[\w\/])/g ) {
+ eval {
+ my $short = makeashorterlink($url);
+ $data =~ s/\Q$url/$short/g;
+ };
+ }
+ }
+
+ if ( length $data > 140 ) {
+ ¬ice(
+ "Tweet too long (" . length($data) . " characters) - aborted" );
+ return;
}
unless ( $twits{$username}->update($data) ) {
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 = ();
);
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;
}
¬ice("Logged in as $user, loading friends list...");
&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;
}
}
+sub cmd_upgrade {
+ my ( $data, $server, $win ) = @_;
+
+ my $loc = Irssi::settings_get_str("twirssi_location");
+ unless ( -w $loc ) {
+ ¬ice(
+"$loc isn't writable, can't upgrade. Perhaps you need to /set twirssi_location?"
+ );
+ return;
+ }
+
+ if ( not -x "/usr/bin/md5sum" and not $data ) {
+ ¬ice(
+"/usr/bin/md5sum can't be found - try '/twirssi_upgrade nomd5' to skip MD5 verification"
+ );
+ return;
+ }
+
+ my $md5;
+ unless ($data) {
+ eval { use Digest::MD5; };
+
+ if ($@) {
+ ¬ice(
+"Failed to load Digest::MD5. Try '/twirssi_upgrade nomd5' to skip MD5 verification"
+ );
+ return;
+ }
+
+ $md5 = get("http://irc.peeron.com/~zigdon/twirssi/md5sum");
+ chomp $md5;
+ $md5 =~ s/ .*//;
+ unless ($md5) {
+ ¬ice("Failed to download md5sum from peeron! Aborting.");
+ return;
+ }
+
+ unless ( open( CUR, $loc ) ) {
+ ¬ice(
+"Failed to read $loc. Check that /set twirssi_location is set to the correct location."
+ );
+ return;
+ }
+
+ my $cur_md5 = Digest::MD5::md5_hex(<CUR>);
+ close CUR;
+
+ if ( $cur_md5 eq $md5 ) {
+ ¬ice("Current twirssi seems to be up to date.");
+ return;
+ }
+ }
+
+ my $URL = "http://irc.peeron.com/~zigdon/twirssi/twirssi.pl";
+ ¬ice("Downloading twirssi from $URL");
+ LWP::Simple::getstore( $URL, "$loc.upgrade" );
+
+ unless ($data) {
+ unless ( open( NEW, "$loc.upgrade" ) ) {
+ ¬ice(
+"Failed to read $loc.upgrade. Check that /set twirssi_location is set to the correct location."
+ );
+ return;
+ }
+
+ my $new_md5 = Digest::MD5::md5_hex(<NEW>);
+ close NEW;
+
+ if ( $new_md5 ne $md5 ) {
+ ¬ice("MD5 verification failed. expected $md5, got $new_md5");
+ return;
+ }
+ }
+
+ rename $loc, "$loc.backup"
+ or ¬ice("Failed to back up $loc: $!. Aborting")
+ and return;
+ rename "$loc.upgrade", $loc
+ or ¬ice("Failed to rename $loc.upgrade: $!. Aborting")
+ and return;
+
+ my ( $dir, $file ) = ( $loc =~ m{(.*)/([^/]+)$} );
+ if ( -e "$dir/autorun/$file" ) {
+ ¬ice("Updating $dir/autorun/$file");
+ unlink "$dir/autorun/$file"
+ or ¬ice("Failed to remove old $file from autorun: $!");
+ symlink "../$file", "$dir/autorun/$file"
+ or ¬ice("Failed to create symlink in autorun directory: $!");
+ }
+
+ ¬ice("Download complete. Reload twirssi with /script load $file");
+}
+
sub load_friends {
my $page = 1;
my %new_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 {
+ print scalar localtime, " - get_updates starting" if &debug;
+
$window =
Irssi::window_find_name( Irssi::settings_get_str('twitter_window') );
unless ($window) {
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;
+ 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";
}
close $fh;
exit;
}
+ print scalar localtime, " - get_updates ends" if &debug;
}
sub do_updates {
my ( $fh, $username, $obj ) = @_;
- print scalar localtime, " - Polling for updates for $username" if DEBUG;
+ print scalar localtime, " - Polling for updates for $username" if &debug;
my $tweets =
$obj->friends_timeline( { since => HTTP::Date::time2str($last_poll) } )
|| [];
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 = "\--> ";
+ } 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",
+ printf $fh "id:%d %s[%s%%B\@%s%%n] %s\n",
+ $t->{id},
$prefix,
( $username ne $user ? "$username: " : "" ),
$t->{user}{screen_name},
$text;
}
- print scalar localtime, " - Polling for replies" if DEBUG;
+ print scalar localtime, " - Polling for replies" if &debug;
$tweets = $obj->replies( { since => HTTP::Date::time2str($last_poll) } )
|| [];
foreach my $t ( reverse @$tweets ) {
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;
}
- print scalar localtime, " - Polling for DMs" if DEBUG;
+ print scalar localtime, " - Polling for DMs" if &debug;
$tweets =
$obj->direct_messages( { since => HTTP::Date::time2str($last_poll) } )
|| [];
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;
}
- print scalar localtime, " - Done" if DEBUG;
+ print scalar localtime, " - Done" if &debug;
}
sub monitor_child {
my $data = shift;
my $filename = $data->[0];
- print scalar localtime, " - checking child log at $filename" if DEBUG;
+ print scalar localtime, " - checking child log at $filename" if &debug;
+ my $old_last_poll = $last_poll;
if ( open FILE, $filename ) {
my @lines;
while (<FILE>) {
chomp;
last if /^__friends__/;
+ if (s/^id:(\d+) //) {
+ next if exists $tweet_cache{$1};
+ $tweet_cache{$1} = time;
+ }
push @lines, $_ unless /^__friends__/;
}
$nicks{$f} = $friends{$f} = $t;
}
- 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 ( $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;
+ }
}
- }
- close FILE;
- unlink $filename or warn "Failed to remove $filename: $!";
- return;
+ close FILE;
+ 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;
+ }
}
+ close FILE;
Irssi::timeout_add_once( 5000, 'monitor_child', [$filename] );
}
+sub debug {
+ return Irssi::settings_get_bool("twirssi_debug");
+}
+
sub notice {
$window->print( "%R***%n @_", MSGLEVEL_PUBLIC );
}
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::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) {
- Irssi::command_bind( "dm", "cmd_direct" );
- Irssi::command_bind( "tweet", "cmd_tweet" );
- Irssi::command_bind( "dm_as", "cmd_direct_as" );
- Irssi::command_bind( "tweet_as", "cmd_tweet_as" );
- Irssi::command_bind( "twitter_login", "cmd_login" );
- Irssi::command_bind( "twitter_logout", "cmd_logout" );
- Irssi::command_bind( "twitter_switch", "cmd_switch" );
+ Irssi::command_bind( "dm", "cmd_direct" );
+ Irssi::command_bind( "tweet", "cmd_tweet" );
+ Irssi::command_bind( "dm_as", "cmd_direct_as" );
+ Irssi::command_bind( "tweet_as", "cmd_tweet_as" );
+ Irssi::command_bind( "twitter_login", "cmd_login" );
+ Irssi::command_bind( "twitter_logout", "cmd_logout" );
+ Irssi::command_bind( "twitter_switch", "cmd_switch" );
+ Irssi::command_bind( "twirssi_upgrade", "cmd_upgrade" );
+ Irssi::command_bind(
+ "twitter_dump",
+ sub {
+ print "twits: ", Dumper \%twits;
+ print "friends: ", join ", ", sort keys %friends;
+ print "nicks: ", join ", ", sort keys %nicks;
+ print "last poll: $last_poll";
+ }
+ );
Irssi::command_bind(
"twirssi_version",
sub {
¬ice(
-"Twirssi v$VERSION (r$REV). See details at http://tinyurl.com/twirssi"
- );
+"Twirssi v$VERSION (r$REV); Net::Twitter v$Net::Twitter::VERSION. "
+ . "See details at http://tinyurl.com/twirssi" );
}
);
Irssi::command_bind(
);
}
}
+
+ 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 "
projects / twirssi-net-twitter-lite.git / blobdiff