use File::Temp;
use LWP::Simple;
use Data::Dumper;
+use Encode;
+use POSIX qw/:sys_wait_h/;
+use Net::Twitter qw/3.05/;
$Data::Dumper::Indent = 1;
-BEGIN {
- $ENV{JSON_ANY_ORDER} = "JSON Syck DWIW";
- require JSON::Any;
- import JSON::Any;
- require Net::Twitter;
- import Net::Twitter;
-}
-
use vars qw($VERSION %IRSSI);
-$VERSION = "1.7.3";
-my ($REV) = '$Rev: 354 $' =~ /(\d+)/;
-%IRSSI = (
+$VERSION = "2.4.2beta";
+%IRSSI = (
authors => 'Dan Boger',
contact => 'zigdon@gmail.com',
name => 'twirssi',
description => 'Send twitter updates using /tweet. '
. 'Can optionally set your bitlbee /away message to same',
license => 'GNU GPL v2',
- url => 'http://tinyurl.com/twirssi',
- changed => '$Date: 2009-01-08 14:46:04 -0800 (Thu, 08 Jan 2009) $',
+ url => 'http://twirssi.com',
+ changed => 'Fri Jan 22 14:40:48 PST 2010',
);
my $window;
my $twit;
my %twits;
+my %oauth;
my $user;
+my $defservice;
my $poll;
+my $last_poll;
+my $last_friends_poll = 0;
my %nicks;
my %friends;
-my $last_poll = time - 300;
my %tweet_cache;
my %id_map;
+my $failwhale = 0;
+my $first_call = 1;
+my $child_pid;
+my %fix_replies_index;
+
+my %irssi_to_mirc_colors = (
+ '%k' => '01',
+ '%r' => '05',
+ '%g' => '03',
+ '%y' => '07',
+ '%b' => '02',
+ '%m' => '06',
+ '%c' => '10',
+ '%w' => '15',
+ '%K' => '14',
+ '%R' => '04',
+ '%G' => '09',
+ '%Y' => '08',
+ '%B' => '12',
+ '%M' => '13',
+ '%C' => '11',
+ '%W' => '00',
+);
sub cmd_direct {
my ( $data, $server, $win ) = @_;
return;
}
- return unless &valid_username($username);
+ return unless $username = &valid_username($username);
eval {
- unless ( $twits{$username}
+ if ( $twits{$username}
->new_direct_message( { user => $target, text => $text } ) )
{
+ ¬ice("DM sent to $target: $text");
+ $nicks{$target} = time;
+ } else {
+ my $error;
+ eval {
+ $error = JSON::Any->jsonToObj( $twits{$username}->get_error() );
+ $error = $error->{error};
+ };
+ die $error if $error;
¬ice("DM to $target failed");
- return;
}
};
if ($@) {
- ¬ice("DM caused an error. Aborted");
+ ¬ice("DM caused an error: $@");
+ return;
+ }
+}
+
+sub cmd_retweet {
+ my ( $data, $server, $win ) = @_;
+
+ return unless &logged_in($twit);
+
+ $data =~ s/^\s+|\s+$//;
+ unless ($data) {
+ ¬ice("Usage: /retweet <nick[:num]> [comment]");
return;
}
- ¬ice("DM sent to $target");
- $nicks{$target} = time;
+ my ( $id, $data ) = split ' ', $data, 2;
+
+ &cmd_retweet_as( "$user $id $data", $server, $win );
+}
+
+sub cmd_retweet_as {
+ my ( $data, $server, $win ) = @_;
+
+ return unless &logged_in($twit);
+
+ $data =~ s/^\s+|\s+$//;
+ my ( $username, $id, $data ) = split ' ', $data, 3;
+
+ unless ($username) {
+ ¬ice("Usage: /retweet_as <username> <nick[:num]> [comment]");
+ return;
+ }
+
+ return unless $username = &valid_username($username);
+
+ my $nick;
+ $id =~ s/[^\w\d\-:]+//g;
+ ( $nick, $id ) = split /:/, $id;
+ unless ( exists $id_map{ lc $nick } ) {
+ ¬ice("Can't find a tweet from $nick to retweet!");
+ return;
+ }
+
+ $id = $id_map{__indexes}{$nick} unless $id;
+ unless ( $id_map{ lc $nick }[$id] ) {
+ ¬ice("Can't find a tweet numbered $id from $nick to retweet!");
+ return;
+ }
+
+ unless ( $id_map{__tweets}{ lc $nick }[$id] ) {
+ ¬ice("The text of this tweet isn't saved, sorry!");
+ return;
+ }
+
+# Irssi::settings_add_str( "twirssi", "twirssi_retweet_format", 'RT $n: $t ${-- $c$}' );
+ my $text = Irssi::settings_get_str("twirssi_retweet_format");
+ $text =~ s/\$n/\@$nick/g;
+ if ($data) {
+ $text =~ s/\${|\$}//g;
+ $text =~ s/\$c/$data/;
+ } else {
+ $text =~ s/\${.*?\$}//;
+ }
+ $text =~ s/\$t/$id_map{__tweets}{ lc $nick }[$id]/;
+
+ my $modified = $data;
+ $data = &shorten($text);
+
+ return if $modified and &too_long($data);
+
+ my $success = 1;
+ eval {
+ if ($modified)
+ {
+ $success = $twits{$username}->update(
+ {
+ status => $data,
+
+ # in_reply_to_status_id => $id_map{ lc $nick }[$id]
+ }
+ );
+ } else {
+ $success =
+ $twits{$username}->retweet( { id => $id_map{ lc $nick }[$id] } );
+ $success = $success->{id} if ref $success;
+ }
+ ¬ice("Update failed") unless $success;
+ };
+ return unless $success;
+
+ if ($@) {
+ ¬ice("Update caused an error: $@. Aborted");
+ return;
+ }
+
+ foreach ( $data =~ /@([-\w]+)/ ) {
+ $nicks{$1} = time;
+ }
+
+ ¬ice("Retweet sent");
}
sub cmd_tweet {
return;
}
- &cmd_tweet_as( "$user $data", $server, $win );
+ &cmd_tweet_as( "$user\@$defservice $data", $server, $win );
}
sub cmd_tweet_as {
return unless &logged_in($twit);
$data =~ s/^\s+|\s+$//;
+ $data =~ s/\s\s+/ /g;
my ( $username, $data ) = split ' ', $data, 2;
unless ( $username and $data ) {
return;
}
- return unless &valid_username($username);
+ return unless $username = &valid_username($username);
- 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;
- };
- }
- }
+ $data = &shorten($data);
return if &too_long($data);
+ my $success = 1;
eval {
unless ( $twits{$username}->update($data) )
{
¬ice("Update failed");
- return;
+ $success = 0;
}
};
+ return unless $success;
if ($@) {
- ¬ice("Update caused an error. Aborted.");
+ ¬ice("Update caused an error: $@. Aborted.");
return;
}
return;
}
- $data =~ s/^\s+|\s+$//;
my ( $id, $data ) = split ' ', $data, 2;
unless ( $id and $data ) {
- ¬ice("Usage: /reply_as <nick[:num]> <update>");
+ ¬ice("Usage: /reply <nick[:num]> <update>");
return;
}
sub cmd_reply_as {
my ( $data, $server, $win ) = @_;
- unless ( Irssi::settings_get_bool("twirssi_track_replies") ) {
- ¬ice("twirssi_track_replies is required in order to reply to "
- . "specific tweets. Either enable it, or just use /tweet "
- . "\@username <text>." );
- return;
- }
-
return unless &logged_in($twit);
$data =~ s/^\s+|\s+$//;
return;
}
- return unless &valid_username($username);
+ return unless $username = &valid_username($username);
my $nick;
$id =~ s/[^\w\d\-:]+//g;
return;
}
- # remove any @nick at the beginning of the reply, as we'll add it anyway
- $data =~ s/^\s*\@?$nick\s*//;
- $data = "\@$nick " . $data;
+ if ( Irssi::settings_get_bool("twirssi_replies_autonick") ) {
- 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;
- };
- }
+ # remove any @nick at the beginning of the reply, as we'll add it anyway
+ $data =~ s/^\s*\@?$nick\s*//;
+ $data = "\@$nick " . $data;
}
+ $data = &shorten($data);
+
return if &too_long($data);
+ my $success = 1;
eval {
unless (
$twits{$username}->update(
)
{
¬ice("Update failed");
- return;
+ $success = 0;
}
};
+ return unless $success;
if ($@) {
- ¬ice("Update caused an error. Aborted");
+ ¬ice("Update caused an error: $@. Aborted");
return;
}
return;
}
+ my $success = 1;
eval {
unless ( $twit->$api_name($data) )
{
¬ice("$api_name failed");
- return;
+ $success = 0;
}
};
+ return unless $success;
if ($@) {
¬ice("$api_name caused an error. Aborted.");
my ( $data, $server, $win ) = @_;
$data =~ s/^\s+|\s+$//g;
+ $data = &normalize_username($data);
if ( exists $twits{$data} ) {
¬ice("Switching to $data");
$twit = $twits{$data};
- $user = $data;
+ if ( $data =~ /(.*)\@(.*)/ ) {
+ $user = $1;
+ $defservice = $2;
+ } else {
+ ¬ice("Couldn't figure out what service '$data' is on");
+ }
} else {
¬ice("Unknown user $data");
}
my ( $data, $server, $win ) = @_;
$data =~ s/^\s+|\s+$//g;
- return unless &valid_username($data);
-
- if ($data) {
- ¬ice("Logging out $data...");
- $twits{$data}->end_session();
- delete $twits{$data};
+ $data = $user unless $data;
+ return unless $data = &valid_username($data);
+
+ ¬ice("Logging out $data...");
+ eval { $twits{$data}->end_session(); };
+ delete $twits{$data};
+ undef $twit;
+ if ( keys %twits ) {
+ &cmd_switch( ( keys %twits )[0], $server, $win );
} else {
- ¬ice("Logging out $user...");
- $twit->end_session();
- undef $twit;
- delete $twits{$user};
- if ( keys %twits ) {
- &cmd_switch( ( keys %twits )[0], $server, $win );
- } else {
- Irssi::timeout_remove($poll) if $poll;
- undef $poll;
- }
+ Irssi::timeout_remove($poll) if $poll;
+ undef $poll;
}
}
sub cmd_login {
my ( $data, $server, $win ) = @_;
my $pass;
+ print "logging in: $data" if &debug;
if ($data) {
+ print "manual data login" if &debug;
( $user, $pass ) = split ' ', $data, 2;
+ unless ( Irssi::settings_get_bool("twirssi_use_oauth") or $pass ) {
+ ¬ice("usage: /twitter_login <username>[\@<service>] <password>");
+ return;
+ }
+ } elsif ( Irssi::settings_get_bool("twirssi_use_oauth")
+ and my $autouser = Irssi::settings_get_str("twitter_usernames") )
+ {
+ print "oauth autouser login" if &debug;
+ foreach my $user ( split /,/, $autouser ) {
+ &cmd_login($user);
+ }
+ return;
} elsif ( my $autouser = Irssi::settings_get_str("twitter_usernames")
and my $autopass = Irssi::settings_get_str("twitter_passwords") )
{
+ print "autouser login" if &debug;
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;
}
} else {
- ¬ice("/twitter_login requires either a username and password "
- . "or twitter_usernames and twitter_passwords to be set." );
+ ¬ice("/twitter_login requires either a username/password "
+ . "or twitter_usernames and twitter_passwords to be set. "
+ . "Note that if twirssi_use_oauth is true, passwords are "
+ . "not required" );
return;
}
%friends = %nicks = ();
- $twit = Net::Twitter->new(
- username => $user,
- password => $pass,
- source => "twirssi"
- );
+ my $service;
+ if ( $user =~ /^(.*)@(twitter|identica)$/ ) {
+ ( $user, $service ) = ( $1, $2 );
+ } else {
+ $service = Irssi::settings_get_str("twirssi_default_service");
+ }
+ $defservice = $service = ucfirst lc $service;
+
+ if ( $service eq 'Twitter'
+ and Irssi::settings_get_bool("twirssi_use_oauth") )
+ {
+ print "Attempting OAuth for $user\@$service" if &debug;
+ eval {
+ if ( $service eq 'Identica' )
+ {
+ $twit = Net::Twitter->new(
+ identica => 1,
+ traits => [ 'API::REST', 'API::Search' ],
+ source => "twirssi",
+ ssl => !Irssi::settings_get_bool("twirssi_avoid_ssl"),
+ );
+ } else {
+ $twit = Net::Twitter->new(
+ traits => [ 'API::REST', 'OAuth', 'API::Search' ],
+ consumer_key => 'BZVAvBma4GxdiRwXIvbnw',
+ consumer_secret =>
+ '0T5kahwLyb34vciGZsgkA9lsjtGCQ05vxVE2APXM',
+ source => "twirssi",
+ ssl => !Irssi::settings_get_bool("twirssi_avoid_ssl"),
+ );
+ }
+ };
+
+ if ($twit) {
+ if ( open( OAUTH, Irssi::settings_get_str("twirssi_oauth_store") ) )
+ {
+ while (<OAUTH>) {
+ chomp;
+ next unless m/$user\@$service (\S+) (\S+)/i;
+ print "Trying cached oauth creds for $user\@$service"
+ if &debug;
+ $twit->access_token($1);
+ $twit->access_token_secret($2);
+ last;
+ }
+ close OAUTH;
+ }
+
+ unless ( $twit->authorized ) {
+ my $url;
+ eval { $url = $twit->get_authorization_url; };
+
+ if ($@) {
+ ¬ice("ERROR: Failed to get OAuth authorization_url. "
+ . "Try again later." );
+ return;
+ }
+ ¬ice(
+ "Twirssi not autorized to access $service for $user.",
+ "Please authorize at the following url, then enter the pin",
+ "supplied with /twirssi_oauth $user\@$service <pin>",
+ $url
+ );
+
+ $oauth{pending}{"$user\@$service"} = $twit;
+ return;
+ }
+ }
+ } else {
+ $twit = Net::Twitter->new(
+ $service eq 'Identica' ? ( identica => 1 ) : (),
+ username => $user,
+ password => $pass,
+ source => "twirssi",
+ ssl => Irssi::settings_get_bool("twirssi_avoid_ssl") ? 0 : 1,
+ );
+ }
+
+ unless ($twit) {
+ ¬ice("Failed to create object! Aborting.");
+ return;
+ }
+
+ return &verify_twitter_object( $server, $win, $user, $service, $twit );
+}
+
+sub cmd_oauth {
+ my ( $data, $server, $win ) = @_;
+ my ( $key, $pin ) = split ' ', $data;
+ my ( $user, $service );
+ $key = &normalize_username($key);
+ if ( $key =~ /^(.*)@(Twitter|Identica)$/ ) {
+ ( $user, $service ) = ( $1, $2 );
+ }
+ $pin =~ s/\D//g;
+ print "Applying pin to $key" if &debug;
+
+ unless ( exists $oauth{pending}{$key} ) {
+ ¬ice("There isn't a pending oauth request for $key. "
+ . "Try /twitter_login first" );
+ return;
+ }
+
+ my $twit = $oauth{pending}{$key};
+ my ( $access_token, $access_token_secret );
+ eval {
+ ( $access_token, $access_token_secret ) =
+ $twit->request_access_token( verifier => $pin );
+ };
+
+ if ($@) {
+ ¬ice("Invalid pin, try again.");
+ return;
+ }
+
+ delete $oauth{pending}{$key};
+
+ my $store_file = Irssi::settings_get_str("twirssi_oauth_store");
+ if ($store_file) {
+ my @store;
+ if ( open( OAUTH, $store_file ) ) {
+ while (<OAUTH>) {
+ chomp;
+ next if /$key/i;
+ push @store, $_;
+ }
+ close OAUTH;
+
+ }
+
+ push @store, "$key $access_token $access_token_secret";
+
+ if ( open( OAUTH, ">$store_file.new" ) ) {
+ print OAUTH "$_\n" foreach @store;
+ close OAUTH;
+ rename "$store_file.new", $store_file
+ or ¬ice("Failed to rename $store_file.new: $!");
+ } else {
+ ¬ice("Failed to write $store_file.new: $!");
+ }
+ } else {
+ ¬ice("No persistant storage set for OAuth. "
+ . "Please /set twirssi_oauth_store to a writable filename." );
+ }
+
+ return &verify_twitter_object( $server, $win, $user, $service, $twit );
+}
+
+sub verify_twitter_object {
+ my ( $server, $win, $user, $service, $twit ) = @_;
+
+ if ( my $timeout = Irssi::settings_get_int("twitter_timeout")
+ and $twit->can('ua') )
+ {
+ $twit->ua->timeout($timeout);
+ ¬ice("Twitter timeout set to $timeout");
+ }
unless ( $twit->verify_credentials() ) {
- ¬ice("Login as $user failed");
+ ¬ice("Login as $user\@$service failed");
+
+ if ( not Irssi::settings_get_bool("twirssi_avoid_ssl") ) {
+ ¬ice(
+ "It's possible you're missing one of the modules required for "
+ . "SSL logins. Try setting twirssi_avoid_ssl to on. See "
+ . "http://cpansearch.perl.org/src/GAAS/libwww-perl-5.831/README.SSL "
+ . "for the detailed requirements." );
+ }
+
$twit = undef;
if ( keys %twits ) {
&cmd_switch( ( keys %twits )[0], $server, $win );
return;
}
- if ($twit) {
- my $rate_limit = $twit->rate_limit_status();
- if ( $rate_limit and $rate_limit->{remaining_hits} < 1 ) {
- ¬ice("Rate limit exceeded, try again later");
- $twit = undef;
- return;
+ my $rate_limit = $twit->rate_limit_status();
+ if ( $rate_limit and $rate_limit->{remaining_hits} < 1 ) {
+ ¬ice(
+ "Rate limit exceeded, try again after $rate_limit->{reset_time}");
+ $twit = undef;
+ return;
+ }
+
+ print "saving object for $user\@$service" if &debug;
+ $twits{"$user\@$service"} = $twit;
+ Irssi::timeout_remove($poll) if $poll;
+ $poll = Irssi::timeout_add( &get_poll_time * 1000, \&get_updates, "" );
+ ¬ice("Logged in as $user\@$service, 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 );
+ }
+ %nicks = %friends;
+ $nicks{$user} = 0;
+ return 1;
+}
+
+sub cmd_add_follow {
+ my ( $data, $server, $win ) = @_;
+
+ unless ($data) {
+ ¬ice("Usage: /twitter_add_follow_extra <username>");
+ return;
+ }
+
+ $data =~ s/^\s+|\s+$//;
+ $data =~ s/^\@//;
+ $data = lc $data;
+
+ if ( exists $id_map{__fixreplies}{"$user\@$defservice"}{$data} ) {
+ ¬ice("Already following all replies by \@$data");
+ return;
+ }
+
+ $id_map{__fixreplies}{"$user\@$defservice"}{$data} = 1;
+ ¬ice("Will now follow all replies by \@$data");
+}
+
+sub cmd_del_follow {
+ my ( $data, $server, $win ) = @_;
+
+ unless ($data) {
+ ¬ice("Usage: /twitter_del_follow_extra <username>");
+ return;
+ }
+
+ $data =~ s/^\s+|\s+$//;
+ $data =~ s/^\@//;
+ $data = lc $data;
+
+ unless ( exists $id_map{__fixreplies}{"$user\@$defservice"}{$data} ) {
+ ¬ice("Wasn't following all replies by \@$data");
+ return;
+ }
+
+ delete $id_map{__fixreplies}{"$user\@$defservice"}{$data};
+ ¬ice("Will no longer follow all replies by \@$data");
+}
+
+sub cmd_list_follow {
+ my ( $data, $server, $win ) = @_;
+
+ my $found = 0;
+ foreach my $suser ( sort keys %{ $id_map{__fixreplies} } ) {
+ my $frusers;
+ foreach my $fruser ( sort keys %{ $id_map{__fixreplies}{$suser} } ) {
+ $frusers = $frusers ? "$frusers, $fruser" : $fruser;
}
+ if ($frusers) {
+ $found = 1;
+ ¬ice("Following all replies as \@$suser: $frusers");
+ }
+ }
- $twits{$user} = $twit;
- Irssi::timeout_remove($poll) if $poll;
- $poll = Irssi::timeout_add( 300 * 1000, \&get_updates, "" );
- ¬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." );
- }
+ unless ($found) {
+ ¬ice("Not following all replies by anyone");
+ }
+}
+
+sub cmd_add_search {
+ my ( $data, $server, $win ) = @_;
+
+ unless ( $twit and $twit->can('search') ) {
+ ¬ice("ERROR: Your version of Net::Twitter ($Net::Twitter::VERSION) "
+ . "doesn't support searches." );
+ return;
+ }
+
+ $data =~ s/^\s+|\s+$//;
+ $data = lc $data;
+
+ unless ($data) {
+ ¬ice("Usage: /twitter_subscribe <topic>");
+ return;
+ }
+
+ if ( exists $id_map{__searches}{"$user\@$defservice"}{$data} ) {
+ ¬ice("Already had a subscription for '$data'");
+ return;
+ }
+
+ $id_map{__searches}{"$user\@$defservice"}{$data} = 1;
+ ¬ice("Added subscription for '$data'");
+}
+
+sub cmd_del_search {
+ my ( $data, $server, $win ) = @_;
+
+ unless ( $twit and $twit->can('search') ) {
+ ¬ice("ERROR: Your version of Net::Twitter ($Net::Twitter::VERSION) "
+ . "doesn't support searches." );
+ return;
+ }
+ $data =~ s/^\s+|\s+$//;
+ $data = lc $data;
+
+ unless ($data) {
+ ¬ice("Usage: /twitter_unsubscribe <topic>");
+ return;
+ }
+
+ unless ( exists $id_map{__searches}{"$user\@$defservice"}{$data} ) {
+ ¬ice("No subscription found for '$data'");
+ return;
+ }
+
+ delete $id_map{__searches}{"$user\@$defservice"}{$data};
+ ¬ice("Removed subscription for '$data'");
+}
+
+sub cmd_list_search {
+ my ( $data, $server, $win ) = @_;
+
+ my $found = 0;
+ foreach my $suser ( sort keys %{ $id_map{__searches} } ) {
+ my $topics;
+ foreach my $topic ( sort keys %{ $id_map{__searches}{$suser} } ) {
+ $topics = $topics ? "$topics, $topic" : $topic;
}
- %nicks = %friends;
- $nicks{$user} = 0;
- &get_updates;
- } else {
- ¬ice("Login failed");
+ if ($topics) {
+ $found = 1;
+ ¬ice("Search subscriptions for \@$suser: $topics");
+ }
+ }
+
+ unless ($found) {
+ ¬ice("No search subscriptions set up");
}
}
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"
- );
+ ¬ice("$loc isn't writable, can't upgrade."
+ . " Perhaps you need to /set twirssi_location?" );
return;
}
my $md5;
- unless ($data) {
+ unless ( $data or Irssi::settings_get_bool("twirssi_upgrade_beta") ) {
eval { use Digest::MD5; };
if ($@) {
- ¬ice(
-"Failed to load Digest::MD5. Try '/twirssi_upgrade nomd5' to skip MD5 verification"
- );
+ ¬ice("Failed to load Digest::MD5."
+ . " Try '/twirssi_upgrade nomd5' to skip MD5 verification" );
return;
}
}
unless ( open( CUR, $loc ) ) {
- ¬ice(
-"Failed to read $loc. Check that /set twirssi_location is set to the correct location."
+ ¬ice("Failed to read $loc."
+ . " Check that /set twirssi_location is set to the correct location."
);
return;
}
}
}
- my $URL = "http://twirssi.com/twirssi.pl";
+ my $URL =
+ Irssi::settings_get_bool("twirssi_upgrade_beta")
+ ? "http://github.com/zigdon/twirssi/raw/master/twirssi.pl"
+ : "http://twirssi.com/twirssi.pl";
¬ice("Downloading twirssi from $URL");
LWP::Simple::getstore( $URL, "$loc.upgrade" );
- unless ($data) {
+ unless ( -s "$loc.upgrade" ) {
+ ¬ice("Failed to save $loc.upgrade."
+ . " Check that /set twirssi_location is set to the correct location."
+ );
+ return;
+ }
+
+ 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."
+ ¬ice("Failed to read $loc.upgrade."
+ . " Check that /set twirssi_location is set to the correct location."
);
return;
}
}
sub load_friends {
- my $fh = shift;
- my $page = 1;
+ my $fh = shift;
+ my $cursor = -1;
+ my $page = 1;
my %new_friends;
eval {
- while (1)
+ while ( $page < 11 and $cursor ne "0" )
{
print $fh "type:debug Loading friends page $page...\n"
if ( $fh and &debug );
- my $friends = $twit->friends( { page => $page } );
- last unless $friends;
+ my $friends;
+ if ( ref $twit =~ /^Net::Twitter/ ) {
+ $friends = $twit->friends( { cursor => $cursor } );
+ last unless $friends;
+ $cursor = $friends->{next_cursor};
+ $friends = $friends->{users};
+ } else {
+ $friends = $twit->friends( { page => $page } );
+ last unless $friends;
+ }
$new_friends{ $_->{screen_name} } = time foreach @$friends;
$page++;
- last if @$friends == 0 or $page == 10;
}
};
if ($@) {
- print $fh "type:debug Error during friends list update. Aborted.\n";
+ print $fh "type:debug Error during friends list update. Aborted.\n"
+ if $fh;
return;
}
return unless &logged_in($twit);
my ( $fh, $filename ) = File::Temp::tempfile();
- my $pid = fork();
+ binmode( $fh, ":" . &get_charset );
+ $child_pid = fork();
- if ($pid) { # parent
- Irssi::timeout_add_once( 5000, 'monitor_child', [ $filename, 0 ] );
- Irssi::pidwait_add($pid);
- } elsif ( defined $pid ) { # child
+ if ($child_pid) { # parent
+ Irssi::timeout_add_once( 5000, 'monitor_child',
+ [ "$filename.done", 0 ] );
+ Irssi::pidwait_add($child_pid);
+ } elsif ( defined $child_pid ) { # child
close STDIN;
close STDOUT;
close STDERR;
my $new_poll = time;
my $error = 0;
- $error += &do_updates( $fh, $user, $twit );
+ my %context_cache;
foreach ( keys %twits ) {
- next if $_ eq $user;
- $error += &do_updates( $fh, $_, $twits{$_} );
- }
+ $error++ unless &do_updates( $fh, $_, $twits{$_}, \%context_cache );
+
+ if ( $id_map{__fixreplies}{$_} ) {
+ my @frusers = sort keys %{ $id_map{__fixreplies}{$_} };
- my ( $added, $removed ) = &load_friends($fh);
- if ( $added + $removed ) {
- print $fh "type:debug %R***%n Friends list updated: ",
- join( ", ",
- sprintf( "%d added", $added ),
- sprintf( "%d removed", $removed ) ),
- "\n";
+ $error++
+ unless &get_timeline( $fh, $frusers[ $fix_replies_index{$_} ],
+ $_, $twits{$_}, \%context_cache );
+
+ $fix_replies_index{$_}++;
+ $fix_replies_index{$_} = 0
+ if $fix_replies_index{$_} >= @frusers;
+ print $fh "id:$fix_replies_index{$_} ",
+ "account:$_ type:fix_replies_index\n";
+ }
}
+
print $fh "__friends__\n";
+ if (
+ time - $last_friends_poll >
+ Irssi::settings_get_int('twitter_friends_poll') )
+ {
+ print $fh "__updated ", time, "\n";
+ my ( $added, $removed ) = &load_friends($fh);
+ if ( $added + $removed ) {
+ print $fh "type:debug %R***%n Friends list updated: ",
+ join( ", ",
+ sprintf( "%d added", $added ),
+ sprintf( "%d removed", $removed ) ),
+ "\n";
+ }
+ }
+
foreach ( sort keys %friends ) {
print $fh "$_ $friends{$_}\n";
}
if ($error) {
print $fh "type:debug Update encountered errors. Aborted\n";
- print $fh $last_poll;
+ print $fh "-- $last_poll";
} else {
- print $fh $new_poll;
+ print $fh "-- $new_poll";
}
close $fh;
+ rename $filename, "$filename.done";
exit;
+ } else {
+ &ccrap("Failed to fork for updating: $!");
}
print scalar localtime, " - get_updates ends" if &debug;
}
sub do_updates {
- my ( $fh, $username, $obj ) = @_;
+ my ( $fh, $username, $obj, $cache ) = @_;
+
+ eval {
+ my $rate_limit = $obj->rate_limit_status();
+ if ( $rate_limit and $rate_limit->{remaining_hits} < 1 ) {
+ ¬ice("Rate limit exceeded for $username");
+ return undef;
+ }
+ };
print scalar localtime, " - Polling for updates for $username" if &debug;
my $tweets;
+ my $new_poll_id = 0;
eval {
- $tweets = $obj->friends_timeline(
- { since => HTTP::Date::time2str($last_poll) } );
+ if ( $id_map{__last_id}{$username}{timeline} )
+ {
+ $tweets = $obj->home_timeline( { count => 100 } );
+ } else {
+ $tweets = $obj->home_timeline();
+ }
};
if ($@) {
- print $fh "type:debug Error during friends_timeline call. Aborted.\n";
- return 1;
+ print $fh "type:debug Error during home_timeline call: Aborted.\n";
+ print $fh "type:debug : $_\n" foreach split /\n/, Dumper($@);
+ return undef;
}
unless ( ref $tweets ) {
if ( $obj->can("get_error") ) {
- print $fh "type:debug API Error during friends_timeline call: ",
- JSON::Any->jsonToObj( $obj->get_error() ), " Aborted.\n";
+ my $error = "Unknown error";
+ eval { $error = JSON::Any->jsonToObj( $obj->get_error() ) };
+ unless ($@) { $error = $obj->get_error() }
+ print $fh
+ "type:debug API Error during home_timeline call: Aborted\n";
+ print $fh "type:debug : $_\n" foreach split /\n/, Dumper($error);
+
} else {
print $fh
- "type:debug API Error during friends_timeline call. Aborted.\n";
+ "type:debug API Error during home_timeline call. Aborted.\n";
}
- return 1;
+ return undef;
}
+ my @ignore_tags =
+ Irssi::settings_get_str("twirssi_ignored_tags")
+ ? split /\s*,\s*/, Irssi::settings_get_str("twirssi_ignored_tags")
+ : ();
+ my @strip_tags =
+ Irssi::settings_get_str("twirssi_stripped_tags")
+ ? split /\s*,\s*/, Irssi::settings_get_str("twirssi_stripped_tags")
+ : ();
foreach my $t ( reverse @$tweets ) {
- my $text = decode_entities( $t->{text} );
- $text =~ s/%/%%/g;
- $text =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g;
- $text =~ s/[\n\r]/ /g;
+ my $text = &get_text( $t, $obj );
my $reply = "tweet";
+
+ my $match = 0;
+ foreach my $tag (@ignore_tags) {
+ next unless $text =~ /\b\Q$tag\E\b/i;
+ $match = 1;
+ $text = "(ignored: $tag) $text" if &debug;
+ last;
+ }
+ next if not &debug and $match;
+
+ foreach my $tag (@strip_tags) {
+ $text =~ s/\b\Q$tag\E\b//gi;
+ }
+
if ( Irssi::settings_get_bool("show_reply_context")
and $t->{in_reply_to_screen_name} ne $username
and $t->{in_reply_to_screen_name}
{
$nicks{ $t->{in_reply_to_screen_name} } = time;
my $context;
- eval {
- $context = $obj->show_status( $t->{in_reply_to_status_id} );
- };
+ unless ( $cache->{ $t->{in_reply_to_status_id} } ) {
+ eval {
+ $cache->{ $t->{in_reply_to_status_id} } =
+ $obj->show_status( $t->{in_reply_to_status_id} );
+ };
+
+ }
+ $context = $cache->{ $t->{in_reply_to_status_id} };
if ($context) {
- my $ctext = decode_entities( $context->{text} );
- $ctext =~ s/%/%%/g;
- $ctext =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g;
- $ctext =~ s/[\n\r]/ /g;
- printf $fh "id:%d account:%s nick:%s type:tweet %s\n",
+ my $ctext = &get_text( $context, $obj );
+ printf $fh "id:%s account:%s nick:%s type:tweet %s\n",
$context->{id}, $username,
$context->{user}{screen_name}, $ctext;
$reply = "reply";
- } elsif ($@) {
- print $fh "type:debug request to get context failed: $@";
- } else {
- print $fh
-"type:debug 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 "id:%d account:%s nick:%s type:%s %s\n",
+ printf $fh "id:%s account:%s nick:%s type:%s %s\n",
$t->{id}, $username, $t->{user}{screen_name}, $reply, $text;
+ $new_poll_id = $t->{id} if $new_poll_id < $t->{id};
}
+ printf $fh "id:%s account:%s type:last_id timeline\n",
+ $new_poll_id, $username;
- print scalar localtime, " - Polling for replies" if &debug;
+ print scalar localtime, " - Polling for replies since ",
+ $id_map{__last_id}{$username}{reply}
+ if &debug;
+ $new_poll_id = 0;
eval {
- $tweets = $obj->replies( { since => HTTP::Date::time2str($last_poll) } )
- || [];
+ if ( $id_map{__last_id}{$username}{reply} )
+ {
+ $tweets = $obj->replies(
+ { since_id => $id_map{__last_id}{$username}{reply} } )
+ || [];
+ } else {
+ $tweets = $obj->replies() || [];
+ }
};
if ($@) {
print $fh "type:debug Error during replies call. Aborted.\n";
- return 1;
+ return undef;
}
foreach my $t ( reverse @$tweets ) {
next
if exists $friends{ $t->{user}{screen_name} };
- my $text = decode_entities( $t->{text} );
- $text =~ s/%/%%/g;
- $text =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g;
- $text =~ s/[\n\r]/ /g;
- printf $fh "id:%d account:%s nick:%s type:tweet %s\n",
+ my $text = &get_text( $t, $obj );
+ printf $fh "id:%s account:%s nick:%s type:tweet %s\n",
$t->{id}, $username, $t->{user}{screen_name}, $text;
+ $new_poll_id = $t->{id} if $new_poll_id < $t->{id};
}
+ printf $fh "id:%s account:%s type:last_id reply\n", $new_poll_id, $username;
print scalar localtime, " - Polling for DMs" if &debug;
+ $new_poll_id = 0;
eval {
- $tweets =
- $obj->direct_messages( { since => HTTP::Date::time2str($last_poll) } )
- || [];
+ if ( $id_map{__last_id}{$username}{dm} )
+ {
+ $tweets = $obj->direct_messages(
+ { since_id => $id_map{__last_id}{$username}{dm} } )
+ || [];
+ } else {
+ $tweets = $obj->direct_messages() || [];
+ }
};
if ($@) {
print $fh "type:debug Error during direct_messages call. Aborted.\n";
- return 1;
+ return undef;
}
foreach my $t ( reverse @$tweets ) {
my $text = decode_entities( $t->{text} );
- $text =~ s/%/%%/g;
- $text =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g;
$text =~ s/[\n\r]/ /g;
- printf $fh "id:%d account:%s nick:%s type:dm %s\n",
+ printf $fh "id:%s account:%s nick:%s type:dm %s\n",
$t->{id}, $username, $t->{sender_screen_name}, $text;
+ $new_poll_id = $t->{id} if $new_poll_id < $t->{id};
+ }
+ printf $fh "id:%s account:%s type:last_id dm\n", $new_poll_id, $username;
+
+ print scalar localtime, " - Polling for subscriptions" if &debug;
+ if ( $obj->can('search') and $id_map{__searches}{$username} ) {
+ my $search;
+ foreach my $topic ( sort keys %{ $id_map{__searches}{$username} } ) {
+ print $fh "type:debug searching for $topic since ",
+ "$id_map{__searches}{$username}{$topic}\n";
+ eval {
+ $search = $obj->search(
+ {
+ q => $topic,
+ since_id => $id_map{__searches}{$username}{$topic}
+ }
+ );
+ };
+
+ if ($@) {
+ print $fh
+ "type:debug Error during search($topic) call. Aborted.\n";
+ return undef;
+ }
+
+ unless ( $search->{max_id} ) {
+ print $fh "type:debug Invalid search results when searching",
+ " for $topic. Aborted.\n";
+ return undef;
+ }
+
+ $id_map{__searches}{$username}{$topic} = $search->{max_id};
+ $topic =~ s/ /%20/g;
+ printf $fh "id:%s account:%s type:searchid topic:%s\n",
+ $search->{max_id}, $username, $topic;
+
+ foreach my $t ( reverse @{ $search->{results} } ) {
+ my $text = &get_text( $t, $obj );
+ printf $fh "id:%s account:%s nick:%s type:search topic:%s %s\n",
+ $t->{id}, $username, $t->{from_user}, $topic, $text;
+ $new_poll_id = $t->{id}
+ if not $new_poll_id
+ or $t->{id} < $new_poll_id;
+ }
+ }
}
+
print scalar localtime, " - Done" if &debug;
- return 0;
+ return 1;
+}
+
+sub get_timeline {
+ my ( $fh, $target, $username, $obj, $cache ) = @_;
+ my $tweets;
+ my $last_id = $id_map{__last_id}{$username}{$target};
+
+ print $fh "type:debug get_timeline("
+ . "$fix_replies_index{$username}=$target > $last_id) started."
+ . " username = $username\n";
+ eval {
+ $tweets = $obj->user_timeline(
+ {
+ id => $target,
+ ( $last_id ? ( since_id => $last_id ) : () ),
+ }
+ );
+ };
+
+ if ($@) {
+ print $fh
+ "type:debug Error during user_timeline($target) call: Aborted.\n";
+ print $fh "type:debug : $_\n" foreach split /\n/, Dumper($@);
+ return undef;
+ }
+
+ unless ($tweets) {
+ print $fh
+ "type:debug user_timeline($target) call returned undef! Aborted\n";
+ return 1;
+ }
+
+ foreach my $t ( reverse @$tweets ) {
+ my $text = &get_text( $t, $obj );
+ 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}
+ and not exists $friends{ $t->{in_reply_to_screen_name} } )
+ {
+ $nicks{ $t->{in_reply_to_screen_name} } = time;
+ my $context;
+ unless ( $cache->{ $t->{in_reply_to_status_id} } ) {
+ eval {
+ $cache->{ $t->{in_reply_to_status_id} } =
+ $obj->show_status( $t->{in_reply_to_status_id} );
+ };
+
+ }
+ $context = $cache->{ $t->{in_reply_to_status_id} };
+
+ if ($context) {
+ my $ctext = &get_text( $context, $obj );
+ printf $fh "id:%s account:%s nick:%s type:tweet %s\n",
+ $context->{id}, $username,
+ $context->{user}{screen_name}, $ctext;
+ $reply = "reply";
+ }
+ }
+ printf $fh "id:%s account:%s nick:%s type:%s %s\n",
+ $t->{id}, $username, $t->{user}{screen_name}, $reply, $text;
+ $last_id = $t->{id} if $last_id < $t->{id};
+ }
+ printf $fh "id:%s account:%s type:last_id_fixreplies %s\n",
+ $last_id, $username, $target;
+
+ return 1;
}
sub monitor_child {
print scalar localtime, " - checking child log at $filename ($attempt)"
if &debug;
- my $new_last_poll;
+ my ($new_last_poll);
+
+ # reap any random leftover processes - work around a bug in irssi on gentoo
+ waitpid( -1, WNOHANG );
+
+ # first time we run we don't want to print out *everything*, so we just
+ # pretend
+
if ( open FILE, $filename ) {
+ binmode FILE, ":" . &get_charset;
my @lines;
+ my %new_cache;
while (<FILE>) {
- chomp;
last if /^__friends__/;
+ unless (/\n$/) { # skip partial lines
+ # print "Skipping partial line: $_" if &debug;
+ next;
+ }
+ chomp;
+ my $hilight = 0;
my %meta;
- foreach my $key (qw/id account nick type/) {
- if (s/^$key:(\S+)\s*//) {
+
+ foreach my $key (qw/id account nick type topic/) {
+ if (s/^$key:((?:\S|\\ )+)\s*//) {
$meta{$key} = $1;
+ $meta{$key} =~ s/%20/ /g;
+ }
+ }
+
+ if ( $meta{type} and $meta{type} eq 'fix_replies_index' ) {
+ $fix_replies_index{ $meta{account} } = $meta{id};
+ print "fix_replies_index for $meta{account} set to $meta{id}"
+ if &debug;
+ next;
+ }
+
+ if ( not $meta{type} or $meta{type} !~ /searchid|last_id/ ) {
+ 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} } ) {
+ next;
}
}
- next if exists $meta{id} and exists $tweet_cache{ $meta{id} };
- $tweet_cache{ $meta{id} } = time;
my $account = "";
- if ( $meta{account} ne $user ) {
- $account = "$meta{account}: ";
+ $meta{account} =~ s/\@(\w+)$//;
+ $meta{service} = $1;
+ if (
+ lc $meta{service} eq
+ lc Irssi::settings_get_str("twirssi_default_service") )
+ {
+ $account = "$meta{account}: "
+ if lc "$meta{account}\@$meta{service}" ne lc
+ "$user\@$defservice";
+ } else {
+ $account = "$meta{account}\@$meta{service}: ";
}
my $marker = "";
- if ( $meta{type} ne 'dm'
- and Irssi::settings_get_bool("twirssi_track_replies")
- and $meta{nick}
- and $meta{id} )
- {
+ if ( $meta{type} ne 'dm' and $meta{nick} and $meta{id} ) {
$marker = ( $id_map{__indexes}{ $meta{nick} } + 1 ) % 100;
- $id_map{ lc $meta{nick} }[$marker] = $meta{id};
- $id_map{__indexes}{ $meta{nick} } = $marker;
- $marker = ":$marker";
+ $id_map{ lc $meta{nick} }[$marker] = $meta{id};
+ $id_map{__indexes}{ $meta{nick} } = $marker;
+ $id_map{__tweets}{ lc $meta{nick} }[$marker] = $_;
+ $marker = ":$marker";
}
- if ( $meta{type} eq 'tweet' ) {
- push @lines, "[$account%B\@$meta{nick}%n$marker] $_\n",;
- } elsif ( $meta{type} eq 'reply' ) {
- push @lines, "[$account\\--> %B\@$meta{nick}%n$marker] $_\n",;
+ my $hilight_color =
+ $irssi_to_mirc_colors{ Irssi::settings_get_str("hilight_color") };
+ my $nick = "\@$meta{account}";
+ if ( $_ =~ /\Q$nick\E(?:\W|$)/i
+ and Irssi::settings_get_bool("twirssi_hilights") )
+ {
+ $meta{nick} = "\cC$hilight_color$meta{nick}\cO";
+ $hilight = MSGLEVEL_HILIGHT;
+ }
+
+ if ( $meta{type} =~ /tweet|reply/ ) {
+ push @lines,
+ [
+ ( MSGLEVEL_PUBLIC | $hilight ),
+ $meta{type}, $account, $meta{nick}, $marker, $_
+ ];
+ } elsif ( $meta{type} eq 'search' ) {
+ push @lines,
+ [
+ ( MSGLEVEL_PUBLIC | $hilight ),
+ $meta{type}, $account, $meta{topic},
+ $meta{nick}, $marker, $_
+ ];
+ if (
+ exists $id_map{__searches}{ $meta{account} }{ $meta{topic} }
+ and $meta{id} >
+ $id_map{__searches}{ $meta{account} }{ $meta{topic} } )
+ {
+ $id_map{__searches}{ $meta{account} }{ $meta{topic} } =
+ $meta{id};
+ }
} elsif ( $meta{type} eq 'dm' ) {
- push @lines, "[$account%B\@$meta{nick}%n (%WDM%n)] $_\n",;
+ push @lines,
+ [
+ ( MSGLEVEL_MSGS | $hilight ),
+ $meta{type}, $account, $meta{nick}, $_
+ ];
+ } elsif ( $meta{type} eq 'searchid' ) {
+ print "Search '$meta{topic}' returned id $meta{id}" if &debug;
+ if (
+ not
+ exists $id_map{__searches}{ $meta{account} }{ $meta{topic} }
+ or $meta{id} >=
+ $id_map{__searches}{ $meta{account} }{ $meta{topic} } )
+ {
+ $id_map{__searches}{ $meta{account} }{ $meta{topic} } =
+ $meta{id};
+ } elsif (&debug) {
+ print "Search '$meta{topic}' returned invalid id $meta{id}";
+ }
+ } elsif ( $meta{type} eq 'last_id' ) {
+ $id_map{__last_id}{"$meta{account}\@$meta{service}"}{$_} =
+ $meta{id}
+ if $id_map{__last_id}{"$meta{account}\@$meta{service}"}{$_} <
+ $meta{id};
+ } elsif ( $meta{type} eq 'last_id_fixreplies' ) {
+ $id_map{__last_id}{"$meta{account}\@$meta{service}"}{$_} =
+ $meta{id}
+ if $id_map{__last_id}{"$meta{account}\@$meta{service}"}{$_} <
+ $meta{id};
} elsif ( $meta{type} eq 'error' ) {
- push @lines, "ERROR: $_\n";
+ push @lines, [ MSGLEVEL_MSGS, $_ ];
} elsif ( $meta{type} eq 'debug' ) {
print "$_" if &debug,;
} else {
%friends = ();
while (<FILE>) {
- if (/^\d+$/) {
- $new_last_poll = $_;
- last;
+ if (/^__updated (\d+)$/) {
+ $last_friends_poll = $1;
+ print "Friend list updated" if &debug;
+ next;
+ }
+
+ if (/^-- (\d+)$/) {
+ $new_last_poll = $1;
+ if ( $new_last_poll >= $last_poll ) {
+ last;
+ } else {
+ print "Impossible! ",
+ "new_last_poll=$new_last_poll < last_poll=$last_poll!"
+ if &debug;
+ undef $new_last_poll;
+ next;
+ }
}
my ( $f, $t ) = split ' ', $_;
$nicks{$f} = $friends{$f} = $t;
}
if ($new_last_poll) {
- print "new last_poll = $new_last_poll" if &debug;
- foreach my $line (@lines) {
- chomp $line;
- $window->print( $line, MSGLEVEL_PUBLIC );
- foreach ( $line =~ /\@([-\w]+)/ ) {
- $nicks{$1} = time;
+ print "new last_poll = $new_last_poll" if &debug;
+ print "new last_poll_id = ", Dumper( $id_map{__last_id} ) if &debug;
+ if ($first_call) {
+ print "First call, not printing updates" if &debug;
+ } else {
+ foreach my $line (@lines) {
+ $window->printformat(
+ $line->[0],
+ "twirssi_" . $line->[1],
+ @$line[ 2 .. $#$line - 1 ],
+ &hilight( $line->[-1] )
+ );
}
}
or warn "Failed to remove $filename: $!"
unless &debug;
+ # commit the pending cache lines to the actual cache, now that
+ # we've printed our output
+ %tweet_cache = ( %tweet_cache, %new_cache );
+
# keep enough cached tweets, to make sure we don't show duplicates.
foreach ( keys %tweet_cache ) {
- next if $tweet_cache{$_} >= $last_poll;
+ next if $tweet_cache{$_} >= $last_poll - 3600;
delete $tweet_cache{$_};
}
$last_poll = $new_last_poll;
+ # make sure the pid is removed from the waitpid list
+ Irssi::pidwait_remove($child_pid);
+
+ # and that we don't leave any zombies behind, somehow
+ waitpid( -1, WNOHANG );
+
# save id_map hash
if ( keys %id_map
and my $file =
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;
+ $first_call = 0;
return;
}
}
close FILE;
- if ( $attempt < 12 ) {
+ if ( $attempt < 24 ) {
Irssi::timeout_add_once( 5000, 'monitor_child',
[ $filename, $attempt + 1 ] );
} else {
- ¬ice("Giving up on polling $filename");
+ print "Giving up on polling $filename" if &debug;
+ Irssi::pidwait_remove($child_pid);
+ waitpid( -1, WNOHANG );
unlink $filename unless &debug;
+
+ return unless Irssi::settings_get_bool("twirssi_notify_timeouts");
+
+ my $since;
+ my @time = localtime($last_poll);
+ if ( time - $last_poll < 24 * 60 * 60 ) {
+ $since = sprintf( "%d:%02d", @time[ 2, 1 ] );
+ } else {
+ $since = scalar localtime($last_poll);
+ }
+
+ if ( not $failwhale and time - $last_poll > 60 * 60 ) {
+ &ccrap(
+ q{ v v v},
+ q{ | | v | v},
+ q{ | .-, | | |},
+ q{ .--./ / | _.---.| },
+ q{ '-. (__..-" \\},
+ q{ \\ a |},
+ q{ ',.__. ,__.-'/},
+ q{ '--/_.'----'`}
+ );
+ $failwhale = 1;
+ }
+
+ if ( time - $last_poll < 600 ) {
+ &ccrap("Haven't been able to get updated tweets since $since");
+ }
}
}
}
sub notice {
- $window->print( "%R***%n @_", MSGLEVEL_PUBLIC );
+ foreach my $msg (@_) {
+ $window->print( "%R***%n $msg", MSGLEVEL_PUBLIC );
+ }
+}
+
+sub ccrap {
+ foreach my $msg (@_) {
+ $window->print( "%R***%n $msg", MSGLEVEL_CLIENTCRAP );
+ }
}
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;
}
}
sub too_long {
- my $data = shift;
+ my $data = shift;
+ my $noalert = shift;
if ( length $data > 140 ) {
- ¬ice(
- "Tweet too long (" . length($data) . " characters) - aborted" );
+ ¬ice( "Tweet too long (" . length($data) . " characters) - aborted" )
+ unless $noalert;
return 1;
}
sub valid_username {
my $username = shift;
+ $username = &normalize_username($username);
+
unless ( exists $twits{$username} ) {
¬ice("Unknown username $username");
- return 0;
+ return undef;
}
- return 1;
+ return $username;
}
sub logged_in {
my ( $complist, $window, $word, $linestart, $want_space ) = @_;
if (
- $linestart =~ /^\/twitter_reply(?:_as)?\s*$/
+ $linestart =~ /^\/(?:retweet|twitter_reply)(?:_as)?\s*$/
or ( Irssi::settings_get_bool("twirssi_use_reply_aliases")
and $linestart =~ /^\/reply(?:_as)?\s*$/ )
)
{ # /twitter_reply gets a nick:num
- @$complist = grep /^\Q$word/i, sort keys %{ $id_map{__indexes} };
+ $word =~ s/^@//;
+ @$complist = map { "$_:$id_map{__indexes}{$_}" }
+ sort { $nicks{$b} <=> $nicks{$a} }
+ grep /^\Q$word/i,
+ keys %{ $id_map{__indexes} };
+ }
+
+ if ( $linestart =~
+/^\/(twitter_unfriend|twitter_add_follow_extra|twitter_del_follow_extra)\s*$/
+ )
+ { # /twitter_unfriend gets a nick
+ $word =~ s/^@//;
+ push @$complist, grep /^\Q$word/i,
+ sort { $nicks{$b} <=> $nicks{$a} } keys %nicks;
}
# /tweet, /tweet_as, /dm, /dm_as - complete @nicks (and nicks as the first
# if the window where we got our text was the twitter window, and the user
# wants to be lazy, tweet away!
- if ( ($awin->get_active_name() eq $window->{name})
- and Irssi::settings_get_bool("tweet_window_input") ) {
- &cmd_tweet($line, $server, $win);
+ if ( ( $awin->get_active_name() eq $window->{name} )
+ and Irssi::settings_get_bool("tweet_window_input") )
+ {
+ &cmd_tweet( $line, $server, $win );
+ }
+}
+
+sub get_poll_time {
+ my $poll = Irssi::settings_get_int("twitter_poll_interval");
+ return $poll if $poll >= 60;
+ return 60;
+}
+
+sub get_charset {
+ my $charset = Irssi::settings_get_str("twirssi_charset");
+ return "utf8" if $charset =~ /^\s*$/;
+ return $charset;
+}
+
+sub hilight {
+ my $text = shift;
+
+ if ( Irssi::settings_get_str("twirssi_nick_color") ) {
+ my $c = Irssi::settings_get_str("twirssi_nick_color");
+ $c = $irssi_to_mirc_colors{$c};
+ $text =~ s/(^|\W)\@(\w+)/$1\cC$c\@$2\cO/g if $c;
+ }
+ if ( Irssi::settings_get_str("twirssi_topic_color") ) {
+ my $c = Irssi::settings_get_str("twirssi_topic_color");
+ $c = $irssi_to_mirc_colors{$c};
+ $text =~ s/(^|\W)(\#|\!)([-\w]+)/$1\cC$c$2$3\cO/g if $c;
+ }
+ $text =~ s/[\n\r]/ /g;
+
+ return $text;
+}
+
+sub shorten {
+ my $data = shift;
+
+ my $provider = Irssi::settings_get_str("short_url_provider");
+ if (
+ (
+ Irssi::settings_get_bool("twirssi_always_shorten")
+ or &too_long( $data, 1 )
+ )
+ and $provider
+ )
+ {
+ my @args;
+ if ( $provider eq 'Bitly' ) {
+ @args[ 1, 2 ] = split ',',
+ Irssi::settings_get_str("short_url_args"), 2;
+ unless ( @args == 3 ) {
+ &ccrap(
+ "WWW::Shorten::Bitly requires a username and API key.",
+ "Set short_url_args to username,API_key or change your",
+ "short_url_provider."
+ );
+ return decode &get_charset, $data;
+ }
+ }
+
+ foreach my $url ( $data =~ /(https?:\/\/\S+[\w\/])/g ) {
+ eval {
+ $args[0] = $url;
+ my $short = makeashorterlink(@args);
+ if ($short) {
+ $data =~ s/\Q$url/$short/g;
+ } else {
+ ¬ice("Failed to shorten $url!");
+ }
+ };
+ }
+ }
+
+ return decode &get_charset, $data;
+}
+
+sub normalize_username {
+ my $user = shift;
+
+ my ( $username, $service ) = split /\@/, $user, 2;
+ if ($service) {
+ $service = ucfirst lc $service;
+ } else {
+ $service =
+ ucfirst lc Irssi::settings_get_str("twirssi_default_service");
+ unless ( exists $twits{"$username\@$service"} ) {
+ $service = undef;
+ foreach my $t ( sort keys %twits ) {
+ next unless $t =~ /^\Q$username\E\@(Twitter|Identica)/;
+ $service = $1;
+ last;
+ }
+
+ unless ($service) {
+ ¬ice("Can't find a logged in user '$user'");
+ }
+ }
}
+
+ return "$username\@$service";
+}
+
+sub get_text {
+ my $tweet = shift;
+ my $object = shift;
+ my $text = decode_entities( $tweet->{text} );
+ if ( $tweet->{truncated} ) {
+ if ( exists $tweet->{retweeted_status} ) {
+ $text = "RT \@$tweet->{retweeted_status}{user}{screen_name}: "
+ . "$tweet->{retweeted_status}{text}";
+ } elsif ( $object->isa('Net::Twitter') ) {
+ $text .= " -- http://twitter.com/$tweet->{user}{screen_name}"
+ . "/status/$tweet->{id}";
+ }
+ }
+
+ $text =~ s/[\n\r]/ /g;
+
+ return $text;
}
Irssi::signal_add( "send text", "event_send_text" );
-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::theme_register(
+ [
+ 'twirssi_tweet', '[$0%B@$1%n$2] $3',
+ 'twirssi_search', '[$0%r$1%n:%B@$2%n$3] $4',
+ 'twirssi_reply', '[$0\--> %B@$1%n$2] $3',
+ 'twirssi_dm', '[$0%r@$1%n (%WDM%n)] $2',
+ 'twirssi_error', 'ERROR: $0',
+ ]
+);
+
+Irssi::settings_add_int( "twirssi", "twitter_poll_interval", 300 );
+Irssi::settings_add_str( "twirssi", "twirssi_charset", "utf8" );
+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", "short_url_args", undef );
+Irssi::settings_add_str( "twirssi", "twitter_usernames", undef );
+Irssi::settings_add_str( "twirssi", "twitter_passwords", undef );
+Irssi::settings_add_str( "twirssi", "twirssi_default_service", "Twitter" );
+Irssi::settings_add_str( "twirssi", "twirssi_nick_color", "%B" );
+Irssi::settings_add_str( "twirssi", "twirssi_topic_color", "%r" );
+Irssi::settings_add_str( "twirssi", "twirssi_ignored_tags", "" );
+Irssi::settings_add_str( "twirssi", "twirssi_stripped_tags", "" );
+Irssi::settings_add_str( "twirssi", "twirssi_retweet_format",
+ 'RT $n: "$t" ${-- $c$}' );
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::get_irssi_dir . "/scripts/twirssi.pl" );
Irssi::settings_add_str( "twirssi", "twirssi_replies_store",
- ".irssi/scripts/twirssi.json" );
+ Irssi::get_irssi_dir . "/scripts/twirssi.json" );
+Irssi::settings_add_str( "twirssi", "twirssi_oauth_store",
+ Irssi::get_irssi_dir . "/scripts/twirssi.oauth" );
+
+Irssi::settings_add_int( "twirssi", "twitter_friends_poll", 600 );
+Irssi::settings_add_int( "twirssi", "twitter_timeout", 30 );
+
+Irssi::settings_add_bool( "twirssi", "twirssi_upgrade_beta", 0 );
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 );
-Irssi::settings_add_bool( "twirssi", "twirssi_track_replies", 1 );
+Irssi::settings_add_bool( "twirssi", "twirssi_replies_autonick", 1 );
Irssi::settings_add_bool( "twirssi", "twirssi_use_reply_aliases", 0 );
+Irssi::settings_add_bool( "twirssi", "twirssi_notify_timeouts", 1 );
+Irssi::settings_add_bool( "twirssi", "twirssi_hilights", 1 );
+Irssi::settings_add_bool( "twirssi", "twirssi_always_shorten", 0 );
Irssi::settings_add_bool( "twirssi", "tweet_window_input", 0 );
+Irssi::settings_add_bool( "twirssi", "twirssi_avoid_ssl", 0 );
+Irssi::settings_add_bool( "twirssi", "twirssi_use_oauth", 1 );
+
+$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 );
+ $window->set_name( Irssi::settings_get_str('twitter_window') );
+}
if ($window) {
- Irssi::command_bind( "dm", "cmd_direct" );
- Irssi::command_bind( "dm_as", "cmd_direct_as" );
- Irssi::command_bind( "tweet", "cmd_tweet" );
- Irssi::command_bind( "tweet_as", "cmd_tweet_as" );
- Irssi::command_bind( "twitter_reply", "cmd_reply" );
- Irssi::command_bind( "twitter_reply_as", "cmd_reply_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( "dm", "cmd_direct" );
+ Irssi::command_bind( "dm_as", "cmd_direct_as" );
+ Irssi::command_bind( "tweet", "cmd_tweet" );
+ Irssi::command_bind( "tweet_as", "cmd_tweet_as" );
+ Irssi::command_bind( "retweet", "cmd_retweet" );
+ Irssi::command_bind( "retweet_as", "cmd_retweet_as" );
+ Irssi::command_bind( "twitter_reply", "cmd_reply" );
+ Irssi::command_bind( "twitter_reply_as", "cmd_reply_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( "twitter_subscribe", "cmd_add_search" );
+ Irssi::command_bind( "twitter_unsubscribe", "cmd_del_search" );
+ Irssi::command_bind( "twitter_list_subscriptions", "cmd_list_search" );
+ Irssi::command_bind( "twirssi_upgrade", "cmd_upgrade" );
+ Irssi::command_bind( "twirssi_oauth", "cmd_oauth" );
+ Irssi::command_bind( "twitter_updates", "get_updates" );
+ Irssi::command_bind( "twitter_add_follow_extra", "cmd_add_follow" );
+ Irssi::command_bind( "twitter_del_follow_extra", "cmd_del_follow" );
+ Irssi::command_bind( "twitter_list_follow_extra", "cmd_list_follow" );
+ Irssi::command_bind( "bitlbee_away", "update_away" );
if ( Irssi::settings_get_bool("twirssi_use_reply_aliases") ) {
Irssi::command_bind( "reply", "cmd_reply" );
Irssi::command_bind( "reply_as", "cmd_reply_as" );
"twirssi_dump",
sub {
print "twits: ", join ", ",
- map { "u: $_->{username}" } values %twits;
+ map { "u: $_->{username}\@" . ref($_) } values %twits;
+ print "selected: $user\@$defservice";
print "friends: ", join ", ", sort keys %friends;
print "nicks: ", join ", ", sort keys %nicks;
- print "id_map: ", Dumper \%{ $id_map{__indexes} };
+ print "searches: ", Dumper \%{ $id_map{__searches} };
print "last poll: $last_poll";
+ if ( open DUMP, ">/tmp/twirssi.cache.txt" ) {
+ print DUMP Dumper \%tweet_cache;
+ close DUMP;
+ print "cache written out to /tmp/twirssi.cache.txt";
+ }
}
);
Irssi::command_bind(
"twirssi_version",
sub {
- ¬ice("Twirssi v$VERSION (r$REV); "
- . "Net::Twitter v$Net::Twitter::VERSION. "
+ ¬ice(
+ "Twirssi v$VERSION; "
+ . (
+ $Net::Twitter::VERSION
+ ? "Net::Twitter v$Net::Twitter::VERSION. "
+ : ""
+ )
+ . (
+ $Net::Identica::VERSION
+ ? "Net::Identica v$Net::Identica::VERSION. "
+ : ""
+ )
. "JSON in use: "
. JSON::Any::handler()
- . ". See details at http://twirssi.com/" );
+ . ". See details at http://twirssi.com/"
+ );
}
);
Irssi::command_bind(
- "twitter_friend",
+ "twitter_follow",
&gen_cmd(
- "/twitter_friend <username>",
+ "/twitter_follow <username>",
"create_friend",
sub { ¬ice("Following $_[0]"); $nicks{ $_[0] } = time; }
)
);
Irssi::command_bind(
- "twitter_unfriend",
+ "twitter_unfollow",
&gen_cmd(
"/twitter_unfriend <username>",
"destroy_friend",
sub { ¬ice("Stopped following $_[0]"); delete $nicks{ $_[0] }; }
)
);
- Irssi::command_bind( "twitter_updates", "get_updates" );
+ Irssi::command_bind(
+ "twitter_device_updates",
+ &gen_cmd(
+ "/twitter_device_updates none|im|sms",
+ "update_delivery_device",
+ sub { ¬ice("Device updated to $_[0]"); }
+ )
+ );
+ Irssi::command_bind(
+ "twitter_block",
+ &gen_cmd(
+ "/twitter_block <username>",
+ "create_block",
+ sub { ¬ice("Blocked $_[0]"); }
+ )
+ );
+ Irssi::command_bind(
+ "twitter_unblock",
+ &gen_cmd(
+ "/twitter_unblock <username>",
+ "destroy_block",
+ sub { ¬ice("Unblock $_[0]"); }
+ )
+ );
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://twirssi.com/ for full docs");
¬ice(
- " %Y||%C `%N Log in with /twitter_login, send updates with /tweet");
+ " %Y<%C(%B^%C)%N TWIRSSI v%R$VERSION%N",
+ " %C(_(\\%N http://twirssi.com/ for full docs",
+ " %Y||%C `%N Log in with /twitter_login, send updates with /tweet"
+ );
my $file = Irssi::settings_get_str("twirssi_replies_store");
if ( $file and -r $file ) {
my $num = keys %{ $id_map{__indexes} };
¬ice( sprintf "Loaded old replies from %d contact%s.",
$num, ( $num == 1 ? "" : "s" ) );
+ &cmd_list_search;
+ &cmd_list_follow;
};
} else {
¬ice("Failed to load old replies from $file: $!");
}
if ( my $provider = Irssi::settings_get_str("short_url_provider") ) {
+ ¬ice("Loading WWW::Shorten::$provider...");
eval "use WWW::Shorten::$provider;";
if ($@) {
¬ice(
-"Failed to load WWW::Shorten::$provider - either clear short_url_provider or install the CPAN module"
+ "Failed to load WWW::Shorten::$provider - either clear",
+ "short_url_provider or install the CPAN module"
);
}
}
- if ( my $autouser = Irssi::settings_get_str("twitter_usernames")
- and my $autopass = Irssi::settings_get_str("twitter_passwords") )
- {
+ if ( my $autouser = Irssi::settings_get_str("twitter_usernames") ) {
&cmd_login();
+ &get_updates;
}
} else {
. " or change the value of twitter_window. Then, reload twirssi." );
}
+# vim: set sts=4 expandtab:
projects / twirssi-net-twitter-lite.git / blobdiff