use File::Temp;
use LWP::Simple;
use Data::Dumper;
+use Encode;
+use POSIX qw/:sys_wait_h/;
$Data::Dumper::Indent = 1;
use vars qw($VERSION %IRSSI);
-$VERSION = "2.2.1beta";
-my ($REV) = '$Rev: 597 $' =~ /(\d+)/;
-%IRSSI = (
+$VERSION = "2.4.0beta";
+%IRSSI = (
authors => 'Dan Boger',
contact => 'zigdon@gmail.com',
name => 'twirssi',
. 'Can optionally set your bitlbee /away message to same',
license => 'GNU GPL v2',
url => 'http://twirssi.com',
- changed => '$Date: 2009-04-05 19:22:22 -0700 (Sun, 05 Apr 2009) $',
+ changed => '$Date: 2009-08-07 01:24:53 -0700 (Fri, 07 Aug 2009) $',
);
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 %tweet_cache;
my %id_map;
-my $failwhale = 0;
+my $failwhale = 0;
+my $first_call = 1;
+my $child_pid;
+my %fix_replies_index;
+
my %irssi_to_mirc_colors = (
'%k' => '01',
'%r' => '05',
if ( $twits{$username}
->new_direct_message( { user => $target, text => $text } ) )
{
- ¬ice("DM sent to $target");
+ ¬ice("DM sent to $target: $text");
$nicks{$target} = time;
} else {
my $error;
$data =~ s/^\s+|\s+$//;
my ( $username, $id, $data ) = split ' ', $data, 3;
- unless ( $username ) {
+ unless ($username) {
¬ice("Usage: /retweet_as <username> <nick[:num]> [comment]");
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;
+ $text =~ s/\$n/\@$nick/g;
if ($data) {
$text =~ s/\${|\$}//g;
$text =~ s/\$c/$data/;
}
$text =~ s/\$t/$id_map{__tweets}{ lc $nick }[$id]/;
+ my $modified = $data;
$data = &shorten($text);
- return if &too_long($data);
+ return if $modified and &too_long($data);
my $success = 1;
eval {
- unless (
- $twits{$username}->update(
+ if ($modified)
+ {
+ $success = $twits{$username}->update(
{
- status => $data,
- in_reply_to_status_id => $id_map{ lc $nick }[$id]
+ status => $data,
+
+ # in_reply_to_status_id => $id_map{ lc $nick }[$id]
}
- )
- )
- {
- ¬ice("Update failed");
- $success = 0;
+ );
+ } 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;
return unless $data = &valid_username($data);
¬ice("Logging out $data...");
- $twits{$data}->end_session();
+ eval {
+ $twits{$data}->end_session();
+ };
delete $twits{$data};
undef $twit;
if ( keys %twits ) {
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;
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;
}
}
$defservice = $service = ucfirst lc $service;
- eval "use Net::$service";
+ print "Loading Net::$service" if &debug;
+ eval "use Net::$service 3.05";
if ($@) {
¬ice(
"Failed to load Net::$service when trying to log in as $user: $@");
return;
}
- $twit = "Net::$service"->new(
- username => $user,
- password => $pass,
- source => "twirssi"
- );
+ if ( Irssi::settings_get_bool("twirssi_use_oauth") ) {
+ print "Attempting OAuth for $user\@$service" if &debug;
+ eval {
+ $twit = "Net::$service"->new(
+ traits => [ 'API::REST', 'OAuth' ],
+ consumer_key => 'BZVAvBma4GxdiRwXIvbnw',
+ consumer_secret => '0T5kahwLyb34vciGZsgkA9lsjtGCQ05vxVE2APXM',
+ source => "twirssi",
+ ssl => Irssi::settings_get_bool("twirssi_avoid_ssl") ? 0 : 1,
+ );
+ };
+
+ 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 ) {
+ eval {
+ my $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.");
+ ¬ice("Please authorize at the following url, then enter the pin ");
+ ¬ice("supplied with /twirssi_oauth $user\@$service <pin>");
+ ¬ice($url);
+
+ $oauth{pending}{"$user\@$service"} = $twit;
+ return;
+ }
+ }
+ } else {
+ $twit = "Net::$service"->new(
+ username => $user,
+ password => $pass,
+ source => "twirssi",
+ ssl => Irssi::settings_get_bool("twirssi_avoid_ssl") ? 0 : 1,
+ );
+ }
+
+ unless ($twit) {
+ ¬ice("Failed to create Net::$service 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\@$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 after $rate_limit->{reset_time}"
- );
- $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;
+ }
- $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 );
- 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." );
- }
+ 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;
}
- %nicks = %friends;
- $nicks{$user} = 0;
- return 1;
- } else {
- ¬ice("Login failed");
+ if ($frusers) {
+ $found = 1;
+ ¬ice("Following all replies as \@$suser: $frusers");
+ }
+ }
+
+ unless ($found) {
+ ¬ice("Not following all replies by anyone");
}
}
return;
}
- if ( exists $id_map{__searches}{$user}{$data} ) {
+ if ( exists $id_map{__searches}{"$user\@$defservice"}{$data} ) {
¬ice("Already had a subscription for '$data'");
return;
}
- $id_map{__searches}{$user}{$data} = 1;
+ $id_map{__searches}{"$user\@$defservice"}{$data} = 1;
¬ice("Added subscription for '$data'");
}
return;
}
- unless ( exists $id_map{__searches}{$user}{$data} ) {
+ unless ( exists $id_map{__searches}{"$user\@$defservice"}{$data} ) {
¬ice("No subscription found for '$data'");
return;
}
- delete $id_map{__searches}{$user}{$data};
+ delete $id_map{__searches}{"$user\@$defservice"}{$data};
¬ice("Removed subscription for '$data'");
}
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?"
- );
+ ¬ice("$loc isn't writable, can't upgrade."
+ . " Perhaps you need to /set twirssi_location?" );
return;
}
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;
}
¬ice("Downloading twirssi from $URL");
LWP::Simple::getstore( $URL, "$loc.upgrade" );
+ 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;
}
};
my ( $fh, $filename ) = File::Temp::tempfile();
binmode( $fh, ":utf8" );
- my $pid = fork();
+ $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;
+ my %context_cache;
foreach ( keys %twits ) {
- $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 ) = @_;
- my $rate_limit = $obj->rate_limit_status();
- if ( $rate_limit and $rate_limit->{remaining_hits} < 1 ) {
- ¬ice("Rate limit exceeded for $username");
- return 1;
- }
+ 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;
- eval { $tweets = $obj->friends_timeline(); };
+ my $new_poll_id = 0;
+ eval {
+ 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") ) {
- my $error;
+ my $error = "Unknown error";
eval { $error = JSON::Any->jsonToObj( $obj->get_error() ) };
- if ($@) { $error = $obj->get_error() }
- print $fh "type:debug API Error during friends_timeline call: ",
- "$error Aborted.\n";
+ 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;
}
foreach my $t ( reverse @$tweets ) {
- my $text = decode_entities( $t->{text} );
- $text = &hilight($text);
+ 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
{
$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 = &hilight($ctext);
- if ( $context->{truncated} and ref($obj) ne 'Net::Identica' ) {
- $ctext .=
- " -- http://twitter.com/$context->{user}{screen_name}"
- . "/status/$context->{id}";
- }
- 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}\n"
- if &debug;
}
}
next
if $t->{user}{screen_name} eq $username
and not Irssi::settings_get_bool("show_own_tweets");
- if ( $t->{truncated} and ref($obj) ne 'Net::Identica' ) {
- $text .= " -- http://twitter.com/$t->{user}{screen_name}"
- . "/status/$t->{id}";
- }
- 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 = &hilight($text);
- if ( $t->{truncated} ) {
- $text .= " -- http://twitter.com/$t->{user}{screen_name}"
- . "/status/$t->{id}";
- }
- 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 = &hilight($text);
- printf $fh "id:%d account:%s nick:%s type:dm %s\n",
+ $text =~ s/[\n\r]/ /g;
+ 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} ) {
if ($@) {
print $fh
"type:debug Error during search($topic) call. Aborted.\n";
- return 1;
+ return undef;
}
unless ( $search->{max_id} ) {
- print $fh
-"type:debug Invalid search results when searching for $topic.",
- " Aborted.\n";
- return 1;
+ print $fh "type:debug Invalid search results when searching",
+ " for $topic. Aborted.\n";
+ return undef;
}
$id_map{__searches}{$username}{$topic} = $search->{max_id};
- printf $fh "id:%d account:%s type:searchid topic:%s\n",
+ printf $fh "id:%s account:%s type:searchid topic:%s\n",
$search->{max_id}, $username, $topic;
foreach my $t ( reverse @{ $search->{results} } ) {
- my $text = decode_entities( $t->{text} );
- $text = &hilight($text);
- printf $fh "id:%d account:%s nick:%s type:search topic:%s %s\n",
+ 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
- my $suppress = 0;
- $suppress = 1 unless keys %tweet_cache;
if ( open FILE, $filename ) {
+ binmode FILE, ":utf8";
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 topic/) {
if (s/^$key:(\S+)\s*//) {
$meta{$key} = $1;
}
}
- if ( not $meta{type} or $meta{type} ne 'searchid' ) {
+ 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;
}
}
my $account = "";
- if ( lc $meta{account} ne lc "$user\@$defservice" ) {
- $meta{account} =~ s/\@(\w+)$//;
- my $service = $1;
- if (
- lc $service eq
- lc Irssi::settings_get_str("twirssi_default_service") )
- {
- $account = "$meta{account}: ";
- } else {
- $account = "$meta{account}\@$service: ";
- }
+ $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 = "";
my $hilight_color =
$irssi_to_mirc_colors{ Irssi::settings_get_str("hilight_color") };
- my $nick =
- '@' . substr( $meta{account}, 0, index( $meta{account}, "@" ) );
+ my $nick = "\@$meta{account}";
if ( $_ =~ /\Q$nick\E(?:\W|$)/i
and Irssi::settings_get_bool("twirssi_hilights") )
{
} 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} }
- and $meta{id} >=
+ or $meta{id} >=
$id_map{__searches}{ $meta{account} }{ $meta{topic} } )
{
$id_map{__searches}{ $meta{account} }{ $meta{topic} } =
} 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, [ MSGLEVEL_MSGS, $_ ];
} elsif ( $meta{type} eq 'debug' ) {
%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;
- if ($suppress) {
+ 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 ]
+ @$line[ 2 .. $#$line - 1 ],
+ &hilight( $line->[-1] )
);
}
}
}
$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
+ wait();
+
# save id_map hash
if ( keys %id_map
and my $file =
&ccrap("Failed to write replies to $file: $!");
}
}
- $failwhale = 0;
+ $failwhale = 0;
+ $first_call = 0;
return;
}
}
[ $filename, $attempt + 1 ] );
} else {
print "Giving up on polling $filename" if &debug;
+ Irssi::pidwait_remove($child_pid);
+ wait();
unlink $filename unless &debug;
return unless Irssi::settings_get_bool("twirssi_notify_timeouts");
}
$failwhale = 1;
}
- &ccrap("Haven't been able to get updated tweets since $since");
+
+ if ( time - $last_poll < 600 ) {
+ &ccrap("Haven't been able to get updated tweets since $since");
+ }
}
}
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
# arg to dm)
if ( $linestart =~ /^\/(?:tweet|dm)/ ) {
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;
+ $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\cO/g if $c;
+ $text =~ s/(^|\W)(\#|\!)([-\w]+)/$1\cC$c$2$3\cO/g if $c;
}
$text =~ s/[\n\r]/ /g;
"Set short_url_args to username,API_key or change your",
"short_url_provider."
);
- return $data;
+ return decode "utf8", $data;
}
}
}
}
- return $data;
+ return decode "utf8", $data;
}
sub normalize_username {
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::theme_register(
Irssi::settings_add_str( "twirssi", "twirssi_retweet_format",
'RT $n: "$t" ${-- $c$}' );
Irssi::settings_add_str( "twirssi", "twirssi_location",
- ".irssi/scripts/twirssi.pl" );
+ "$ENV{HOME}/.irssi/scripts/twirssi.pl" );
Irssi::settings_add_str( "twirssi", "twirssi_replies_store",
- ".irssi/scripts/twirssi.json" );
+ "$ENV{HOME}/.irssi/scripts/twirssi.json" );
+Irssi::settings_add_str( "twirssi", "twirssi_oauth_store",
+ "$ENV{HOME}/.irssi/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", "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') );
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" );
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("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(" %Y<%C(%B^%C)%N TWIRSSI v%R$VERSION%N");
¬ice(" %C(_(\\%N http://twirssi.com/ for full docs");
¬ice(
" %Y||%C `%N Log in with /twitter_login, send updates with /tweet");
¬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 $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;
}
projects / twirssi-net-twitter-lite.git / blobdiff